summaryrefslogtreecommitdiff
path: root/src/lib/libssl/t1_lib.c
diff options
context:
space:
mode:
authorbeck <>2016-05-30 13:42:54 +0000
committerbeck <>2016-05-30 13:42:54 +0000
commita35f44242c832a478373d4b9e7fc5c9119c07090 (patch)
tree362a819b53348b53df2eb57846da7fd93be3f866 /src/lib/libssl/t1_lib.c
parent06b5312e6a3b5c470b0de3f0d4b272ded331ca5b (diff)
downloadopenbsd-a35f44242c832a478373d4b9e7fc5c9119c07090.tar.gz
openbsd-a35f44242c832a478373d4b9e7fc5c9119c07090.tar.bz2
openbsd-a35f44242c832a478373d4b9e7fc5c9119c07090.zip
deprecate internal use of EVP_[Cipher|Encrypt|Decrypt]_Final.
14 years ago these were changed in OpenSSL to be the same as the _ex functions. We use the _ex functions only internally to ensure it is obvious the ctx must be cleared. ok bcook@
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
-rw-r--r--src/lib/libssl/t1_lib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index 7855313914..7230dec671 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: t1_lib.c,v 1.86 2016/03/10 23:21:46 mmcc Exp $ */ 1/* $OpenBSD: t1_lib.c,v 1.87 2016/05/30 13:42:54 beck Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -2199,7 +2199,7 @@ tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen,
2199 return -1; 2199 return -1;
2200 } 2200 }
2201 EVP_DecryptUpdate(&ctx, sdec, &slen, p, eticklen); 2201 EVP_DecryptUpdate(&ctx, sdec, &slen, p, eticklen);
2202 if (EVP_DecryptFinal(&ctx, sdec + slen, &mlen) <= 0) { 2202 if (EVP_DecryptFinal_ex(&ctx, sdec + slen, &mlen) <= 0) {
2203 free(sdec); 2203 free(sdec);
2204 EVP_CIPHER_CTX_cleanup(&ctx); 2204 EVP_CIPHER_CTX_cleanup(&ctx);
2205 return 2; 2205 return 2;