diff options
author | Jon Spillett <jon.spillett@oracle.com> | 2017-04-12 09:45:54 +1000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2017-04-12 10:05:14 +0100 |
commit | 14281c47aa0dae47bf0e3c233bb500fc32dc51bb (patch) | |
tree | 4f84762db987b20d94a787863c6bc38976bca0dc /test/rsa_test.c | |
parent | 48f1739600f33c92387debce2002acec6e365f1d (diff) |
Updates after code review
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3179)
Diffstat (limited to 'test/rsa_test.c')
-rw-r--r-- | test/rsa_test.c | 48 |
1 files changed, 20 insertions, 28 deletions
diff --git a/test/rsa_test.c b/test/rsa_test.c index af912eb198..d441a1d32f 100644 --- a/test/rsa_test.c +++ b/test/rsa_test.c @@ -223,6 +223,24 @@ static int pad_unknown(void) static const char rnd_seed[] = "string to make the random number generator think it has entropy"; +static int rsa_setkey(RSA** key, unsigned char* ctext, int idx) +{ + int clen = 0; + *key = RSA_new(); + switch (idx) { + case 0: + clen = key1(*key, ctext); + break; + case 1: + clen = key2(*key, ctext); + break; + case 2: + clen = key3(*key, ctext); + break; + } + return clen; +} + static int test_rsa_pkcs1(int idx) { int ret = 0; @@ -236,19 +254,7 @@ static int test_rsa_pkcs1(int idx) int num; plen = sizeof(ptext_ex) - 1; - - key = RSA_new(); - switch (idx) { - case 0: - clen = key1(key, ctext_ex); - break; - case 1: - clen = key2(key, ctext_ex); - break; - case 2: - clen = key3(key, ctext_ex); - break; - } + clen = rsa_setkey(&key, ctext_ex, idx); num = RSA_public_encrypt(plen, ptext_ex, ctext, key, RSA_PKCS1_PADDING); @@ -278,22 +284,8 @@ static int test_rsa_oaep(int idx) int num; int n; - RAND_seed(rnd_seed, sizeof rnd_seed); /* or OAEP may fail */ - plen = sizeof(ptext_ex) - 1; - - key = RSA_new(); - switch (idx) { - case 0: - clen = key1(key, ctext_ex); - break; - case 1: - clen = key2(key, ctext_ex); - break; - case 2: - clen = key3(key, ctext_ex); - break; - } + clen = rsa_setkey(&key, ctext_ex, idx); num = RSA_public_encrypt(plen, ptext_ex, ctext, key, RSA_PKCS1_OAEP_PADDING); |