diff options
| author |   djm <djm@openbsd.org> | 2008-09-06 12:17:47 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2008-09-06 12:17:47 +0000 |
| commit | 4fcf65c5c59fcf6124cf9f1fd81aa546850f974c (patch) | |
| tree | 3c0b4c46d91bcb87c8eef7a1e84711159b17f71b /lib/libssl/src/crypto/comp/comp_lib.c | |
| parent | import of OpenSSL 0.9.8h (diff) | |
| download | wireguard-openbsd-4fcf65c5c59fcf6124cf9f1fd81aa546850f974c.tar.xz wireguard-openbsd-4fcf65c5c59fcf6124cf9f1fd81aa546850f974c.zip | |
resolve conflicts
Diffstat (limited to 'lib/libssl/src/crypto/comp/comp_lib.c')
| -rw-r--r-- | lib/libssl/src/crypto/comp/comp_lib.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/libssl/src/crypto/comp/comp_lib.c b/lib/libssl/src/crypto/comp/comp_lib.c index beb98ce8ccc..b60ae371e8d 100644 --- a/lib/libssl/src/crypto/comp/comp_lib.c +++ b/lib/libssl/src/crypto/comp/comp_lib.c @@ -20,17 +20,11 @@ COMP_CTX *COMP_CTX_new(COMP_METHOD *meth) OPENSSL_free(ret); ret=NULL; } -#if 0 - else - CRYPTO_new_ex_data(rsa_meth,(char *)ret,&ret->ex_data); -#endif return(ret); } void COMP_CTX_free(COMP_CTX *ctx) { - /* CRYPTO_free_ex_data(rsa_meth,(char *)ctx,&ctx->ex_data); */ - if(ctx == NULL) return; |