forked from openssl/openssl
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move stack of compression methods from libssl to OSSL_LIB_CTX
The compression methods are now a global variable in libssl. This change moves it into OSSL library context. It is necessary to eliminate atexit call from libssl. Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from openssl#24414)
- Loading branch information
Showing
19 changed files
with
196 additions
and
130 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,59 @@ | ||
/* | ||
* 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 | ||
*/ | ||
|
||
#include <openssl/crypto.h> | ||
#include <openssl/comp.h> | ||
#include <openssl/obj_mac.h> | ||
|
||
#include "internal/cryptlib.h" | ||
#include "internal/comp.h" | ||
|
||
#define SSL_COMP_NULL_IDX 0 | ||
#define SSL_COMP_ZLIB_IDX 1 | ||
#define SSL_COMP_NUM_IDX 2 | ||
|
||
#ifndef OPENSSL_NO_COMP | ||
static int sk_comp_cmp(const SSL_COMP *const *a, const SSL_COMP *const *b) | ||
{ | ||
return ((*a)->id - (*b)->id); | ||
} | ||
#endif | ||
|
||
STACK_OF(SSL_COMP) *ossl_load_builtin_compressions(void) | ||
{ | ||
STACK_OF(SSL_COMP) *comp_methods = NULL; | ||
#ifndef OPENSSL_NO_COMP | ||
SSL_COMP *comp = NULL; | ||
COMP_METHOD *method = COMP_zlib(); | ||
|
||
comp_methods = sk_SSL_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 = SSL_COMP_ZLIB_IDX; | ||
comp->name = COMP_get_name(method); | ||
if (!sk_SSL_COMP_push(comp_methods, comp)) | ||
OPENSSL_free(comp); | ||
} | ||
} | ||
#endif | ||
return comp_methods; | ||
} | ||
|
||
static void cmeth_free(SSL_COMP *cm) | ||
{ | ||
OPENSSL_free(cm); | ||
} | ||
|
||
void ossl_free_compression_methods_int(STACK_OF(SSL_COMP) *methods) | ||
{ | ||
sk_SSL_COMP_pop_free(methods, cmeth_free); | ||
} |
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
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
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.