diff options
| author |   bcook <bcook@openbsd.org> | 2016-09-09 00:03:22 +0000 |
|---|---|---|
| committer | bcook <bcook@openbsd.org> | 2016-09-09 00:03:22 +0000 |
| commit | fdedacbdd5feda7bed07efd38e34165a7cb938ab (patch) | |
| tree | b36def67e4ab1bfc00974f573e73038282e5f9fb /lib | |
| parent | Remove reference to /dev/sound*. With tweaks from jmc@, thanks. (diff) | |
| download | wireguard-openbsd-fdedacbdd5feda7bed07efd38e34165a7cb938ab.tar.xz wireguard-openbsd-fdedacbdd5feda7bed07efd38e34165a7cb938ab.zip | |
back out calls to EVP_CIPHER_CTX_cleanup() in EVP_Cipher/Encrypt/DecryptFinal
Software that refers to ctx after calling Final breaks with these changes.
revert parts of 1.31 and 1.32
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/evp/evp_enc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/libcrypto/evp/evp_enc.c b/lib/libcrypto/evp/evp_enc.c index f0b2639f601..0dfb7a5dc39 100644 --- a/lib/libcrypto/evp/evp_enc.c +++ b/lib/libcrypto/evp/evp_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_enc.c,v 1.34 2016/09/04 12:35:23 bcook Exp $ */ +/* $OpenBSD: evp_enc.c,v 1.35 2016/09/09 00:03:22 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -273,7 +273,6 @@ EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) ret = EVP_EncryptFinal_ex(ctx, out, outl); else ret = EVP_DecryptFinal_ex(ctx, out, outl); - (void) EVP_CIPHER_CTX_cleanup(ctx); return ret; } @@ -382,7 +381,6 @@ EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) int ret; ret = EVP_EncryptFinal_ex(ctx, out, outl); - (void) EVP_CIPHER_CTX_cleanup(ctx); return ret; } @@ -499,7 +497,6 @@ EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) int ret; ret = EVP_DecryptFinal_ex(ctx, out, outl); - (void) EVP_CIPHER_CTX_cleanup(ctx); return ret; } |