From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 26 Jun 2009 23:14:39 +0000 (+0000)
Subject: Fix from 0.9.8-stable.
X-Git-Tag: OpenSSL-fips-2_0-rc1~1623
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a5f78bf3ba24e1486a6885b302580bb9d59c83e5;p=oweals%2Fopenssl.git

Fix from 0.9.8-stable.
---

diff --git a/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c
index 70bacf850e..e238d10e5c 100644
--- a/crypto/rsa/rsa_oaep.c
+++ b/crypto/rsa/rsa_oaep.c
@@ -52,13 +52,6 @@ int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
 		return 0;
 		}
 
-	dbmask = OPENSSL_malloc(emlen - SHA_DIGEST_LENGTH);
-	if (dbmask == NULL)
-		{
-		RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP, ERR_R_MALLOC_FAILURE);
-		return 0;
-		}
-
 	to[0] = 0;
 	seed = to + 1;
 	db = to + SHA_DIGEST_LENGTH + 1;
@@ -76,6 +69,13 @@ int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
 	   20);
 #endif
 
+	dbmask = OPENSSL_malloc(emlen - SHA_DIGEST_LENGTH);
+	if (dbmask == NULL)
+		{
+		RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP, ERR_R_MALLOC_FAILURE);
+		return 0;
+		}
+
 	if (MGF1(dbmask, emlen - SHA_DIGEST_LENGTH, seed, SHA_DIGEST_LENGTH) < 0)
 		return 0;
 	for (i = 0; i < emlen - SHA_DIGEST_LENGTH; i++)