diff options
author | Rich Salz <rsalz@akamai.com> | 2014-07-14 00:48:21 -0400 |
---|---|---|
committer | Rich Salz <rsalz@akamai.com> | 2014-07-16 15:12:58 -0400 |
commit | 203a12ee9db7cf63fb830a6434b538e8eb742985 (patch) | |
tree | 20c8af94e072d99e1ad46dc9fe894508d41c5dfa | |
parent | 0c9621e19819c8c9bc1439333b9484ab9fb6a81a (diff) | |
download | openssl-new-203a12ee9db7cf63fb830a6434b538e8eb742985.tar.gz |
finished speed.c
-rw-r--r-- | apps/speed.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/apps/speed.c b/apps/speed.c index f13fb54e36..6201d17934 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -1018,6 +1018,7 @@ int speed_main(int argc, char **argv) } } + /* Remaining arguments are algorithms. */ argc = opt_num_rest(); for (argv = opt_rest(); *argv; argv++) { if (strcmp(*argv, "prime") == 0) { @@ -1090,27 +1091,30 @@ int speed_main(int argc, char **argv) } #endif #ifndef OPENSSL_NO_ECDSA - if (found(*argv, ecdsa_choices, &i)) { - ecdsa_doit[i] = 2; - continue; - } if (strcmp(*argv, "ecdsa") == 0) { for (i = 0; i < EC_NUM; i++) ecdsa_doit[i] = 1; continue; } -#endif -#ifndef OPENSSL_NO_ECDH - if (found(*argv, ecdh_choices, &i)) { - ecdh_doit[i] = 2; + if (found(*argv, ecdsa_choices, &i)) { + ecdsa_doit[i] = 2; continue; } +#endif +#ifndef OPENSSL_NO_ECDH if (strcmp(*argv,"ecdh") == 0) { for (i = 0; i < EC_NUM; i++) ecdh_doit[i] = 1; continue; } + if (found(*argv, ecdh_choices, &i)) { + ecdh_doit[i] = 2; + continue; + } #endif + BIO_printf(bio_err, "%s: Unknown algorithm %s\n", + prog, *argv); + goto end; } #ifndef NO_FORK |