-
-
Notifications
You must be signed in to change notification settings - Fork 9.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
this change moves stack of compression methods, now global variable
in libssl into crypto context. This change is rquired by atexit PR.
- Loading branch information
Showing
11 changed files
with
175 additions
and
95 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
/* | ||
* Copyright 2025 The OpenSSL Project Authors. All Rights Reserved. | ||
* | ||
* Licensed under the Apache License 2.0 (the "License"). You may not use | ||
* this file except in compliance with the License. You can obtain a copy | ||
* in the file LICENSE in the source distribution or at | ||
* https://www.openssl.org/source/license.html | ||
*/ | ||
|
||
#include <openssl/crypto.h> | ||
#include <openssl/comp.h> | ||
#include <openssl/obj_mac.h> | ||
|
||
#include "internal/cryptlib.h" | ||
|
||
#define OSSL_COMP_NULL_IDX 0 | ||
#define OSSL_COMP_ZLIB_IDX 1 | ||
#define OSSL_COMP_NUM_IDX 2 | ||
|
||
static int sk_comp_cmp(const OSSL_COMP *const *a, const OSSL_COMP *const *b) | ||
{ | ||
return ((*a)->id - (*b)->id); | ||
} | ||
|
||
STACK_OF(OSSL_COMP) *ossl_load_builtin_compressions(void) | ||
{ | ||
STACK_OF(OSSL_COMP) *comp_methods = NULL; | ||
#ifndef OPENSSL_NO_COMP | ||
OSSL_COMP *comp = NULL; | ||
COMP_METHOD *method = COMP_zlib(); | ||
|
||
comp_methods = sk_OSSL_COMP_new(sk_comp_cmp); | ||
|
||
if (COMP_get_type(method) != NID_undef && comp_methods != NULL) { | ||
comp = OPENSSL_malloc(sizeof(*comp)); | ||
if (comp != NULL) { | ||
comp->method = method; | ||
comp->id = OSSL_COMP_ZLIB_IDX; | ||
comp->name = COMP_get_name(method); | ||
if (!sk_OSSL_COMP_push(comp_methods, comp)) | ||
OPENSSL_free(comp); | ||
sk_OSSL_COMP_sort(comp_methods); | ||
} | ||
} | ||
#endif | ||
return comp_methods; | ||
} | ||
|
||
|
||
OSSL_COMP *ossl_find_compression(OSSL_LIB_CTX *ctx, int cmeth_id) | ||
{ | ||
OSSL_LIB_CTX *ossl_ctx; | ||
STACK_OF(OSSL_COMP) *comp_methods; | ||
OSSL_COMP *rv = NULL; | ||
|
||
ossl_ctx = (ctx == NULL) ? OSSL_LIB_CTX_get0_global_default() : ctx; | ||
comp_methods = ossl_lib_ctx_get_data(ossl_ctx, OSSL_LIB_CTX_COMP_METHODS); | ||
if (comp_methods != NULL) { | ||
OSSL_COMP srch_key; | ||
int i; | ||
|
||
srch_key.id = cmeth_id; | ||
i = sk_OSSL_COMP_find(comp_methods, &srch_key); | ||
if (i >= 0) | ||
rv = sk_OSSL_COMP_value(comp_methods, i); | ||
} | ||
|
||
return (rv); | ||
} | ||
|
||
STACK_OF(OSSL_COMP) *ossl_comp_get_compression_methods(OSSL_LIB_CTX *ctx) | ||
{ | ||
ctx = (ctx == NULL) ? OSSL_LIB_CTX_get0_global_default() : ctx; | ||
return ossl_lib_ctx_get_data(ctx, OSSL_LIB_CTX_COMP_METHODS); | ||
} | ||
|
||
static void cmeth_free(OSSL_COMP *cm) | ||
{ | ||
OPENSSL_free(cm); | ||
} | ||
|
||
void ossl_free_compression_methods_int(STACK_OF(OSSL_COMP) *methods) | ||
{ | ||
sk_OSSL_COMP_pop_free(methods, cmeth_free); | ||
OPENSSL_free(methods); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/* | ||
* Copyright 2024 The OpenSSL Project Authors. All Rights Reserved. | ||
* | ||
* Licensed under the Apache License 2.0 (the "License"). You may not use | ||
* this file except in compliance with the License. You can obtain a copy | ||
* in the file LICENSE in the source distribution or at | ||
* https://www.openssl.org/source/license.html | ||
*/ | ||
|
||
{- | ||
use OpenSSL::stackhash qw(generate_stack_macros generate_const_stack_macros); | ||
-} | ||
|
||
#ifndef OPENSSL_STACK_OF_COMP_METHODS_H | ||
|
||
{- | ||
generate_stack_macros("OSSL_COMP"); | ||
-} | ||
|
||
#endif | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.