diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-04-07 12:07:42 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-04-07 12:19:46 -0400 |
| commit | 076fc55527a1499391fa6de109c8387895199ee9 (patch) | |
| tree | 8a7d5eba7a2baf36080d6f4925dee48157a2e304 /apps | |
| parent | 2f881d2d9065342454fe352eac9e835cefa0ba90 (diff) | |
Make default_method mostly compile-time
Document thread-safety issues
Have RSA_null return NULL (always fails)
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2244)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/speed.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/apps/speed.c b/apps/speed.c index 50522ae25a..f64bea9c68 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -1444,12 +1444,8 @@ int speed_main(int argc, char **argv) continue; } #ifndef OPENSSL_NO_RSA -# ifndef RSA_NULL - if (strcmp(*argv, "openssl") == 0) { - RSA_set_default_method(RSA_PKCS1_OpenSSL()); + if (strcmp(*argv, "openssl") == 0) continue; - } -# endif if (strcmp(*argv, "rsa") == 0) { rsa_doit[R_RSA_512] = rsa_doit[R_RSA_1024] = rsa_doit[R_RSA_2048] = rsa_doit[R_RSA_3072] = |