From a78955ae4a5a81f10fff6443c03c56c6240709ac Mon Sep 17 00:00:00 2001
From: miod <>
Date: Wed, 9 Jul 2014 17:08:40 +0000
Subject: Unifdef -UPKCS_TESTVECT - we don't want the random data used in OAEP
 padding to get overwritten by a known value, ever.

---
 src/lib/libcrypto/rsa/rsa_oaep.c         | 7 +------
 src/lib/libssl/src/crypto/rsa/rsa_oaep.c | 7 +------
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/rsa/rsa_oaep.c b/src/lib/libcrypto/rsa/rsa_oaep.c
index f8f9935fac..df288fa615 100644
--- a/src/lib/libcrypto/rsa/rsa_oaep.c
+++ b/src/lib/libcrypto/rsa/rsa_oaep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_oaep.c,v 1.17 2014/07/09 08:20:08 miod Exp $ */
+/* $OpenBSD: rsa_oaep.c,v 1.18 2014/07/09 17:08:40 miod Exp $ */
 /* Written by Ulf Moeller. This software is distributed on an "AS IS"
    basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. */
 
@@ -63,11 +63,6 @@ RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
 	memcpy(db + emlen - flen - SHA_DIGEST_LENGTH, from, (unsigned int)flen);
 	if (RAND_bytes(seed, SHA_DIGEST_LENGTH) <= 0)
 		return 0;
-#ifdef PKCS_TESTVECT
-	memcpy(seed,
-	   "\xaa\xfd\x12\xf6\x59\xca\xe6\x34\x89\xb4\x79\xe5\x07\x6d\xde\xc2\xf0\x6c\xb5\x8f",
-	   20);
-#endif
 
 	dbmask = malloc(emlen - SHA_DIGEST_LENGTH);
 	if (dbmask == NULL) {
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_oaep.c b/src/lib/libssl/src/crypto/rsa/rsa_oaep.c
index f8f9935fac..df288fa615 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_oaep.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_oaep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_oaep.c,v 1.17 2014/07/09 08:20:08 miod Exp $ */
+/* $OpenBSD: rsa_oaep.c,v 1.18 2014/07/09 17:08:40 miod Exp $ */
 /* Written by Ulf Moeller. This software is distributed on an "AS IS"
    basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. */
 
@@ -63,11 +63,6 @@ RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
 	memcpy(db + emlen - flen - SHA_DIGEST_LENGTH, from, (unsigned int)flen);
 	if (RAND_bytes(seed, SHA_DIGEST_LENGTH) <= 0)
 		return 0;
-#ifdef PKCS_TESTVECT
-	memcpy(seed,
-	   "\xaa\xfd\x12\xf6\x59\xca\xe6\x34\x89\xb4\x79\xe5\x07\x6d\xde\xc2\xf0\x6c\xb5\x8f",
-	   20);
-#endif
 
 	dbmask = malloc(emlen - SHA_DIGEST_LENGTH);
 	if (dbmask == NULL) {
-- 
cgit v1.2.3-55-g6feb