summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto
diff options
context:
space:
mode:
authorreyk <>2014-04-13 17:29:41 +0000
committerreyk <>2014-04-13 17:29:41 +0000
commit7aeb3e8167cb7d137c87f5f1d5c137a33ccd3925 (patch)
tree8a9e11bbc7bfc49c688ab27cbfa8db9e62586195 /src/lib/libcrypto
parentb9483ecbdb9fb07cf19dd6404a4a1a6a3cd0b27e (diff)
downloadopenbsd-7aeb3e8167cb7d137c87f5f1d5c137a33ccd3925.tar.gz
openbsd-7aeb3e8167cb7d137c87f5f1d5c137a33ccd3925.tar.bz2
openbsd-7aeb3e8167cb7d137c87f5f1d5c137a33ccd3925.zip
Remove the IBM 4758 engine: we don't have this hardware and it is an
old PCI accelerator that was EOL'ed in 2005. ok deraadt@
Diffstat (limited to 'src/lib/libcrypto')
-rw-r--r--src/lib/libcrypto/doc/engine.pod1
-rw-r--r--src/lib/libcrypto/engine/eng_all.c3
-rw-r--r--src/lib/libcrypto/engine/engine.h1
-rw-r--r--src/lib/libcrypto/util/libeay.num1
4 files changed, 0 insertions, 6 deletions
diff --git a/src/lib/libcrypto/doc/engine.pod b/src/lib/libcrypto/doc/engine.pod
index f5ab1c3e50..3f4acce86d 100644
--- a/src/lib/libcrypto/doc/engine.pod
+++ b/src/lib/libcrypto/doc/engine.pod
@@ -24,7 +24,6 @@ engine - ENGINE cryptographic module support
24 void ENGINE_load_openssl(void); 24 void ENGINE_load_openssl(void);
25 void ENGINE_load_dynamic(void); 25 void ENGINE_load_dynamic(void);
26 #ifndef OPENSSL_NO_STATIC_ENGINE 26 #ifndef OPENSSL_NO_STATIC_ENGINE
27 void ENGINE_load_4758cca(void);
28 void ENGINE_load_aep(void); 27 void ENGINE_load_aep(void);
29 void ENGINE_load_atalla(void); 28 void ENGINE_load_atalla(void);
30 void ENGINE_load_chil(void); 29 void ENGINE_load_chil(void);
diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c
index 6093376df4..3f96605902 100644
--- a/src/lib/libcrypto/engine/eng_all.c
+++ b/src/lib/libcrypto/engine/eng_all.c
@@ -82,9 +82,6 @@ void ENGINE_load_builtin_engines(void)
82 ENGINE_load_dynamic(); 82 ENGINE_load_dynamic();
83#ifndef OPENSSL_NO_STATIC_ENGINE 83#ifndef OPENSSL_NO_STATIC_ENGINE
84#ifndef OPENSSL_NO_HW 84#ifndef OPENSSL_NO_HW
85#ifndef OPENSSL_NO_HW_4758_CCA
86 ENGINE_load_4758cca();
87#endif
88#ifndef OPENSSL_NO_HW_AEP 85#ifndef OPENSSL_NO_HW_AEP
89 ENGINE_load_aep(); 86 ENGINE_load_aep();
90#endif 87#endif
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h
index f8be497724..85393f260d 100644
--- a/src/lib/libcrypto/engine/engine.h
+++ b/src/lib/libcrypto/engine/engine.h
@@ -333,7 +333,6 @@ ENGINE *ENGINE_by_id(const char *id);
333void ENGINE_load_openssl(void); 333void ENGINE_load_openssl(void);
334void ENGINE_load_dynamic(void); 334void ENGINE_load_dynamic(void);
335#ifndef OPENSSL_NO_STATIC_ENGINE 335#ifndef OPENSSL_NO_STATIC_ENGINE
336void ENGINE_load_4758cca(void);
337void ENGINE_load_aep(void); 336void ENGINE_load_aep(void);
338void ENGINE_load_atalla(void); 337void ENGINE_load_atalla(void);
339void ENGINE_load_chil(void); 338void ENGINE_load_chil(void);
diff --git a/src/lib/libcrypto/util/libeay.num b/src/lib/libcrypto/util/libeay.num
index aa86b2b8b1..39395014f3 100644
--- a/src/lib/libcrypto/util/libeay.num
+++ b/src/lib/libcrypto/util/libeay.num
@@ -2772,7 +2772,6 @@ OPENSSL_load_builtin_modules 3214 EXIST::FUNCTION:
2772AES_ofb128_encrypt 3215 EXIST::FUNCTION:AES 2772AES_ofb128_encrypt 3215 EXIST::FUNCTION:AES
2773AES_ctr128_encrypt 3216 EXIST::FUNCTION:AES 2773AES_ctr128_encrypt 3216 EXIST::FUNCTION:AES
2774AES_cfb128_encrypt 3217 EXIST::FUNCTION:AES 2774AES_cfb128_encrypt 3217 EXIST::FUNCTION:AES
2775ENGINE_load_4758cca 3218 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
2776_ossl_096_des_random_seed 3219 EXIST::FUNCTION:DES 2775_ossl_096_des_random_seed 3219 EXIST::FUNCTION:DES
2777EVP_aes_256_ofb 3220 EXIST::FUNCTION:AES 2776EVP_aes_256_ofb 3220 EXIST::FUNCTION:AES
2778EVP_aes_192_ofb 3221 EXIST::FUNCTION:AES 2777EVP_aes_192_ofb 3221 EXIST::FUNCTION:AES