diff options
Diffstat (limited to 'security/openssl/patches/patch-bb')
| -rw-r--r-- | security/openssl/patches/patch-bb | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/security/openssl/patches/patch-bb b/security/openssl/patches/patch-bb deleted file mode 100644 index 8263f6bdc1f..00000000000 --- a/security/openssl/patches/patch-bb +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2010/01/22 03:35:10 taca Exp $ - -deal with CVE-2009-4355, revsion 1.15.2.8 from OpenSSL's CVS repository. - ---- crypto/comp/c_zlib.c.orig 2008-12-13 17:00:53.000000000 +0000 -+++ crypto/comp/c_zlib.c -@@ -136,15 +136,6 @@ struct zlib_state - - static int zlib_stateful_ex_idx = -1; - --static void zlib_stateful_free_ex_data(void *obj, void *item, -- CRYPTO_EX_DATA *ad, int ind,long argl, void *argp) -- { -- struct zlib_state *state = (struct zlib_state *)item; -- inflateEnd(&state->istream); -- deflateEnd(&state->ostream); -- OPENSSL_free(state); -- } -- - static int zlib_stateful_init(COMP_CTX *ctx) - { - int err; -@@ -188,6 +179,12 @@ static int zlib_stateful_init(COMP_CTX * - - static void zlib_stateful_finish(COMP_CTX *ctx) - { -+ struct zlib_state *state = -+ (struct zlib_state *)CRYPTO_get_ex_data(&ctx->ex_data, -+ zlib_stateful_ex_idx); -+ inflateEnd(&state->istream); -+ deflateEnd(&state->ostream); -+ OPENSSL_free(state); - CRYPTO_free_ex_data(CRYPTO_EX_INDEX_COMP,ctx,&ctx->ex_data); - } - -@@ -402,7 +399,7 @@ COMP_METHOD *COMP_zlib(void) - if (zlib_stateful_ex_idx == -1) - zlib_stateful_ex_idx = - CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_COMP, -- 0,NULL,NULL,NULL,zlib_stateful_free_ex_data); -+ 0,NULL,NULL,NULL,NULL); - CRYPTO_w_unlock(CRYPTO_LOCK_COMP); - if (zlib_stateful_ex_idx == -1) - goto err; |