summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/rsa/rsa_oaep.c7
-rw-r--r--src/lib/libssl/src/crypto/rsa/rsa_oaep.c7
2 files changed, 2 insertions, 12 deletions
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 @@
1/* $OpenBSD: rsa_oaep.c,v 1.17 2014/07/09 08:20:08 miod Exp $ */ 1/* $OpenBSD: rsa_oaep.c,v 1.18 2014/07/09 17:08:40 miod Exp $ */
2/* Written by Ulf Moeller. This software is distributed on an "AS IS" 2/* Written by Ulf Moeller. This software is distributed on an "AS IS"
3 basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. */ 3 basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. */
4 4
@@ -63,11 +63,6 @@ RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
63 memcpy(db + emlen - flen - SHA_DIGEST_LENGTH, from, (unsigned int)flen); 63 memcpy(db + emlen - flen - SHA_DIGEST_LENGTH, from, (unsigned int)flen);
64 if (RAND_bytes(seed, SHA_DIGEST_LENGTH) <= 0) 64 if (RAND_bytes(seed, SHA_DIGEST_LENGTH) <= 0)
65 return 0; 65 return 0;
66#ifdef PKCS_TESTVECT
67 memcpy(seed,
68 "\xaa\xfd\x12\xf6\x59\xca\xe6\x34\x89\xb4\x79\xe5\x07\x6d\xde\xc2\xf0\x6c\xb5\x8f",
69 20);
70#endif
71 66
72 dbmask = malloc(emlen - SHA_DIGEST_LENGTH); 67 dbmask = malloc(emlen - SHA_DIGEST_LENGTH);
73 if (dbmask == NULL) { 68 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 @@
1/* $OpenBSD: rsa_oaep.c,v 1.17 2014/07/09 08:20:08 miod Exp $ */ 1/* $OpenBSD: rsa_oaep.c,v 1.18 2014/07/09 17:08:40 miod Exp $ */
2/* Written by Ulf Moeller. This software is distributed on an "AS IS" 2/* Written by Ulf Moeller. This software is distributed on an "AS IS"
3 basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. */ 3 basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. */
4 4
@@ -63,11 +63,6 @@ RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
63 memcpy(db + emlen - flen - SHA_DIGEST_LENGTH, from, (unsigned int)flen); 63 memcpy(db + emlen - flen - SHA_DIGEST_LENGTH, from, (unsigned int)flen);
64 if (RAND_bytes(seed, SHA_DIGEST_LENGTH) <= 0) 64 if (RAND_bytes(seed, SHA_DIGEST_LENGTH) <= 0)
65 return 0; 65 return 0;
66#ifdef PKCS_TESTVECT
67 memcpy(seed,
68 "\xaa\xfd\x12\xf6\x59\xca\xe6\x34\x89\xb4\x79\xe5\x07\x6d\xde\xc2\xf0\x6c\xb5\x8f",
69 20);
70#endif
71 66
72 dbmask = malloc(emlen - SHA_DIGEST_LENGTH); 67 dbmask = malloc(emlen - SHA_DIGEST_LENGTH);
73 if (dbmask == NULL) { 68 if (dbmask == NULL) {