summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/engine/eng_all.c
diff options
context:
space:
mode:
authormarkus <>2002-09-05 22:12:12 +0000
committermarkus <>2002-09-05 22:12:12 +0000
commite08fb7998d733407336e83a299f140b0c1d2fcd3 (patch)
tree64de5de3b0be4adfc5050b6f785b6975c564b730 /src/lib/libcrypto/engine/eng_all.c
parentb200d1ec45aafc7c92b197a4b605e34834d74f1d (diff)
downloadopenbsd-e08fb7998d733407336e83a299f140b0c1d2fcd3.tar.gz
openbsd-e08fb7998d733407336e83a299f140b0c1d2fcd3.tar.bz2
openbsd-e08fb7998d733407336e83a299f140b0c1d2fcd3.zip
merge with 0.9.7-beta1
Diffstat (limited to 'src/lib/libcrypto/engine/eng_all.c')
-rw-r--r--src/lib/libcrypto/engine/eng_all.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c
index a35b3db9e8..bc50465422 100644
--- a/src/lib/libcrypto/engine/eng_all.c
+++ b/src/lib/libcrypto/engine/eng_all.c
@@ -96,6 +96,9 @@ void ENGINE_load_builtin_engines(void)
96#ifndef OPENSSL_NO_HW_SUREWARE 96#ifndef OPENSSL_NO_HW_SUREWARE
97 ENGINE_load_sureware(); 97 ENGINE_load_sureware();
98#endif 98#endif
99#ifndef OPENSSL_NO_HW_4758_CCA
100 ENGINE_load_4758cca();
101#endif
99#ifdef OPENSSL_OPENBSD_DEV_CRYPTO 102#ifdef OPENSSL_OPENBSD_DEV_CRYPTO
100 ENGINE_load_openbsd_dev_crypto(); 103 ENGINE_load_openbsd_dev_crypto();
101#endif 104#endif
@@ -114,5 +117,3 @@ void ENGINE_setup_openbsd(void) {
114 openbsd_default_loaded=1; 117 openbsd_default_loaded=1;
115} 118}
116#endif 119#endif
117
118