diff options
author | markus <> | 2002-09-05 22:12:12 +0000 |
---|---|---|
committer | markus <> | 2002-09-05 22:12:12 +0000 |
commit | e08fb7998d733407336e83a299f140b0c1d2fcd3 (patch) | |
tree | 64de5de3b0be4adfc5050b6f785b6975c564b730 /src/lib/libcrypto/engine | |
parent | b200d1ec45aafc7c92b197a4b605e34834d74f1d (diff) | |
download | openbsd-e08fb7998d733407336e83a299f140b0c1d2fcd3.tar.gz openbsd-e08fb7998d733407336e83a299f140b0c1d2fcd3.tar.bz2 openbsd-e08fb7998d733407336e83a299f140b0c1d2fcd3.zip |
merge with 0.9.7-beta1
Diffstat (limited to 'src/lib/libcrypto/engine')
-rw-r--r-- | src/lib/libcrypto/engine/Makefile.ssl | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_all.c | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/engine.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/libcrypto/engine/Makefile.ssl b/src/lib/libcrypto/engine/Makefile.ssl index 8ee3b7d2dd..5172028f93 100644 --- a/src/lib/libcrypto/engine/Makefile.ssl +++ b/src/lib/libcrypto/engine/Makefile.ssl | |||
@@ -74,7 +74,7 @@ tags: | |||
74 | 74 | ||
75 | errors: | 75 | errors: |
76 | $(PERL) $(TOP)/util/mkerr.pl -conf hw.ec \ | 76 | $(PERL) $(TOP)/util/mkerr.pl -conf hw.ec \ |
77 | -nostatic -staticloader -write hw_*.c | 77 | -nostatic -staticloader -write hw_*.c; \ |
78 | 78 | ||
79 | tests: | 79 | tests: |
80 | 80 | ||
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 | |||
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h index 97f5de9e12..fd17ff616d 100644 --- a/src/lib/libcrypto/engine/engine.h +++ b/src/lib/libcrypto/engine/engine.h | |||
@@ -312,7 +312,7 @@ void ENGINE_load_builtin_engines(void); | |||
312 | #ifdef __OpenBSD__ | 312 | #ifdef __OpenBSD__ |
313 | void ENGINE_load_cryptodev(void); | 313 | void ENGINE_load_cryptodev(void); |
314 | #endif | 314 | #endif |
315 | 315 | ||
316 | /* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation | 316 | /* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation |
317 | * "registry" handling. */ | 317 | * "registry" handling. */ |
318 | unsigned int ENGINE_get_table_flags(void); | 318 | unsigned int ENGINE_get_table_flags(void); |