summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/engine/eng_all.c
diff options
context:
space:
mode:
authordoug <>2015-07-19 22:34:27 +0000
committerdoug <>2015-07-19 22:34:27 +0000
commit4f92bf3803a057f24c8fda4c2ce12e559c845602 (patch)
tree5d81c4075008ce8aa7366b738750cfc75eda9286 /src/lib/libcrypto/engine/eng_all.c
parente1b84c43076222a250e436e71045972c584515ce (diff)
downloadopenbsd-4f92bf3803a057f24c8fda4c2ce12e559c845602.tar.gz
openbsd-4f92bf3803a057f24c8fda4c2ce12e559c845602.tar.bz2
openbsd-4f92bf3803a057f24c8fda4c2ce12e559c845602.zip
Remove OpenSSL engine RSAX.
OpenSSL stopped building it last year and removed it this year. Based on OpenSSL commit c436e05bdc7f49985a750df64122c960240b3ae1. Also cranked major version in libcrypto, libssl and libtls. "fine with me" bcook@ miod@
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/engine/eng_all.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c
index b428300e76..7640cf7fcd 100644
--- a/src/lib/libcrypto/engine/eng_all.c
+++ b/src/lib/libcrypto/engine/eng_all.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: eng_all.c,v 1.28 2015/06/19 06:05:11 bcook Exp $ */ 1/* $OpenBSD: eng_all.c,v 1.29 2015/07/19 22:34:27 doug Exp $ */
2/* Written by Richard Levitte <richard@levitte.org> for the OpenSSL 2/* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -67,9 +67,6 @@ ENGINE_load_builtin_engines(void)
67 /* Some ENGINEs need this */ 67 /* Some ENGINEs need this */
68 OPENSSL_cpuid_setup(); 68 OPENSSL_cpuid_setup();
69 69
70#ifndef OPENSSL_NO_RSAX
71 ENGINE_load_rsax();
72#endif
73#ifndef OPENSSL_NO_STATIC_ENGINE 70#ifndef OPENSSL_NO_STATIC_ENGINE
74#ifndef OPENSSL_NO_HW 71#ifndef OPENSSL_NO_HW
75#ifndef OPENSSL_NO_HW_PADLOCK 72#ifndef OPENSSL_NO_HW_PADLOCK