diff options
| author | Matt Caswell <matt@openssl.org> | 2018-01-17 10:33:18 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-01-22 10:24:57 +0000 |
| commit | da1a1b5ac417c4e38f7717082d69cb5f0ceda6b9 (patch) | |
| tree | 2963382b31ecdab4b30bf2d9879ff18ed64478dc /apps | |
| parent | 1e05c6d07ff963107286d028f6778d2ccc863a9a (diff) | |
Don't attempt to use X25519 for ECDSA in speed
Fixes #5090
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/5097)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/speed.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/apps/speed.c b/apps/speed.c index f41acfb1d2..df59ca6902 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -1277,6 +1277,7 @@ int speed_main(int argc, char **argv) || !defined(OPENSSL_NO_EC) long rsa_count = 1; #endif + size_t loop; /* What follows are the buffers and key material. */ #ifndef OPENSSL_NO_RC5 @@ -1561,8 +1562,8 @@ int speed_main(int argc, char **argv) #endif #ifndef OPENSSL_NO_EC if (strcmp(*argv, "ecdsa") == 0) { - for (i = 0; i < EC_NUM; i++) - ecdsa_doit[i] = 1; + for (loop = 0; loop < OSSL_NELEM(ecdsa_choices); loop++) + ecdsa_doit[ecdsa_choices[loop].retval] = 1; continue; } if (found(*argv, ecdsa_choices, &i)) { @@ -1570,8 +1571,8 @@ int speed_main(int argc, char **argv) continue; } if (strcmp(*argv, "ecdh") == 0) { - for (i = 0; i < EC_NUM; i++) - ecdh_doit[i] = 1; + for (loop = 0; loop < OSSL_NELEM(ecdh_choices); loop++) + ecdh_doit[ecdh_choices[loop].retval] = 1; continue; } if (found(*argv, ecdh_choices, &i)) { @@ -1643,10 +1644,10 @@ int speed_main(int argc, char **argv) dsa_doit[i] = 1; #endif #ifndef OPENSSL_NO_EC - for (i = 0; i < EC_NUM; i++) - ecdsa_doit[i] = 1; - for (i = 0; i < EC_NUM; i++) - ecdh_doit[i] = 1; + for (loop = 0; loop < OSSL_NELEM(ecdsa_choices); loop++) + ecdsa_doit[ecdsa_choices[loop].retval] = 1; + for (loop = 0; loop < OSSL_NELEM(ecdh_choices); loop++) + ecdh_doit[ecdh_choices[loop].retval] = 1; #endif } for (i = 0; i < ALGOR_NUM; i++) |