From: Emilia Kasper <emilia@openssl.org>
Date: Wed, 17 Dec 2014 11:25:28 +0000 (+0100)
Subject: Add a comment noting the padding oracle.
X-Git-Tag: OpenSSL_1_0_1k~35
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=036df29387e994d665259065e5c11c0e5b41f826;p=oweals%2Fopenssl.git

Add a comment noting the padding oracle.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 03af843039af758fc9bbb4ae6c09ec2bc715f2c5)
---

diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index e3e1147969..2e863ac542 100644
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -533,6 +533,11 @@ int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
 			return(0);
 			}
 		OPENSSL_assert(b <= sizeof ctx->final);
+
+		/*
+		 * The following assumes that the ciphertext has been authenticated.
+		 * Otherwise it provides a padding oracle.
+		 */
 		n=ctx->final[b-1];
 		if (n == 0 || n > (int)b)
 			{