diff options
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | crypto/rsa/rsa_oaep_test.c | 5 | ||||
| -rw-r--r-- | rsaref/rsaref.c | 3 |
3 files changed, 12 insertions, 0 deletions
@@ -5,6 +5,10 @@ Changes between 0.9.2b and 0.9.3 + *) Make sure the RSA OAEP test is skipped under -DRSAref because + OAEP isn't supported when OpenSSL is built with RSAref. + [Ulf Moeller <ulf@fitug.de>] + *) Move definitions of IS_SET/IS_SEQUENCE inside crypto/asn1/asn1.h so they no longer are missing under -DNOPROTO. [Soren S. Jorvang <soren@t.dk>] diff --git a/crypto/rsa/rsa_oaep_test.c b/crypto/rsa/rsa_oaep_test.c index 5fcc2f7a87..57e10e9a08 100644 --- a/crypto/rsa/rsa_oaep_test.c +++ b/crypto/rsa/rsa_oaep_test.c @@ -195,6 +195,11 @@ int main() int clen = 0; int num; +#ifdef RSAref + printf("No OAEP support with RSAref - skipping test\n"); + return 0; +#endif + plen = sizeof(ptext_ex) - 1; for (v = 0; v < 3; v++) diff --git a/rsaref/rsaref.c b/rsaref/rsaref.c index 5f772972d5..90cda4687b 100644 --- a/rsaref/rsaref.c +++ b/rsaref/rsaref.c @@ -328,6 +328,9 @@ int padding; RSARandomState rnd; unsigned char buf[16]; + if (padding == RSA_PKCS1_OAEP_PADDING) + goto err; + R_RandomInit(&rnd); R_GetRandomBytesNeeded((unsigned int *)&i,&rnd); while (i > 0) |