diff options
author | Matt Caswell <matt@openssl.org> | 2016-05-26 10:55:11 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-06-06 11:09:06 +0100 |
commit | 5584f65a1027b06fe0cfc4be28d1a232cf180e42 (patch) | |
tree | e1d62f81d9d5a23575e4f4063b47d28e680afcdf /test | |
parent | f943e640efbb5ec30bf57b59468c094083c99eb2 (diff) |
Deprecate the flags that switch off constant time
The flags RSA_FLAG_NO_CONSTTIME, DSA_FLAG_NO_EXP_CONSTTIME and
DH_FLAG_NO_EXP_CONSTTIME which previously provided the ability to switch
off the constant time implementation for RSA, DSA and DH have been made
no-ops and deprecated.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'test')
-rw-r--r-- | test/dhtest.c | 4 | ||||
-rw-r--r-- | test/dsatest.c | 7 | ||||
-rw-r--r-- | test/rsa_test.c | 6 |
3 files changed, 2 insertions, 15 deletions
diff --git a/test/dhtest.c b/test/dhtest.c index c0551d5a3f..1dc395b44e 100644 --- a/test/dhtest.c +++ b/test/dhtest.c @@ -95,10 +95,6 @@ int main(int argc, char *argv[]) goto err; bp = bg = NULL; - /* Set a to run with normal modexp and b to use constant time */ - DH_clear_flags(a, DH_FLAG_NO_EXP_CONSTTIME); - DH_set_flags(b, DH_FLAG_NO_EXP_CONSTTIME); - if (!DH_generate_key(a)) goto err; DH_get0_key(a, &apub_key, &priv_key); diff --git a/test/dsatest.c b/test/dsatest.c index c64a91138c..b99c467e17 100644 --- a/test/dsatest.c +++ b/test/dsatest.c @@ -147,13 +147,6 @@ int main(int argc, char **argv) goto end; } - DSA_set_flags(dsa, DSA_FLAG_NO_EXP_CONSTTIME); - DSA_generate_key(dsa); - DSA_sign(0, str1, 20, sig, &siglen, dsa); - if (DSA_verify(0, str1, 20, sig, siglen, dsa) == 1) - ret = 1; - - DSA_clear_flags(dsa, DSA_FLAG_NO_EXP_CONSTTIME); DSA_generate_key(dsa); DSA_sign(0, str1, 20, sig, &siglen, dsa); if (DSA_verify(0, str1, 20, sig, siglen, dsa) == 1) diff --git a/test/rsa_test.c b/test/rsa_test.c index c8e68db83b..7d06394c6c 100644 --- a/test/rsa_test.c +++ b/test/rsa_test.c @@ -241,9 +241,9 @@ int main(int argc, char *argv[]) plen = sizeof(ptext_ex) - 1; - for (v = 0; v < 6; v++) { + for (v = 0; v < 3; v++) { key = RSA_new(); - switch (v % 3) { + switch (v) { case 0: clen = key1(key, ctext_ex); break; @@ -254,8 +254,6 @@ int main(int argc, char *argv[]) clen = key3(key, ctext_ex); break; } - if (v / 3 >= 1) - RSA_set_flags(key, RSA_FLAG_NO_CONSTTIME); num = RSA_public_encrypt(plen, ptext_ex, ctext, key, RSA_PKCS1_PADDING); |