summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <sebastian@breakpoint.cc>2020-06-06 14:35:57 +0200
committerDmitry Belyavskiy <beldmit@gmail.com>2020-06-11 17:28:10 +0300
commit42b2797e8abced593084e5cd02d8c6e5ee5ed5c5 (patch)
tree3c8ebee41f4ea4fe80243823ada52b09a33a022b
parentd9c2fd51e2e278bc3f7793a104ff7b4879f6d63a (diff)
APPS: Exclude legacy algorighms from speed
Legacy crypto algorithms are not provided by the default "provider" leading to a warning. Remove legacy algorithms from the set that is tested by default. The algorihms can be tested manually if selected manually and using the legacy provider. Fixes #11650 Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/12074)
-rw-r--r--apps/speed.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/apps/speed.c b/apps/speed.c
index f481b6b8fd..9d53bab3ac 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1995,6 +1995,15 @@ int speed_main(int argc, char **argv)
if (argc == 0 && !doit[D_EVP] && !doit[D_EVP_HMAC] && !doit[D_EVP_CMAC]) {
memset(doit, 1, sizeof(doit));
doit[D_EVP] = doit[D_EVP_HMAC] = doit[D_EVP_CMAC] = 0;
+#if !defined(OPENSSL_NO_MDC2) && !defined(OPENSSL_NO_DEPRECATED_3_0)
+ doit[D_MDC2] = 0;
+#endif
+#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DEPRECATED_3_0)
+ doit[D_MD4] = 0;
+#endif
+#if !defined(OPENSSL_NO_RMD160) && !defined(OPENSSL_NO_DEPRECATED_3_0)
+ doit[D_RMD160] = 0;
+#endif
#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DEPRECATED_3_0)
memset(rsa_doit, 1, sizeof(rsa_doit));
#endif