summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto
diff options
context:
space:
mode:
authorreyk <>2014-04-14 10:03:00 +0000
committerreyk <>2014-04-14 10:03:00 +0000
commit0f3015e1c64e2b9ba3774397257f15287f9ff442 (patch)
tree38524d165b2b28707da7b3eb2a1ee872a2560b6b /src/lib/libcrypto
parent93d43446ef3a3bb673548d2cb589dd623ddc672b (diff)
downloadopenbsd-0f3015e1c64e2b9ba3774397257f15287f9ff442.tar.gz
openbsd-0f3015e1c64e2b9ba3774397257f15287f9ff442.tar.bz2
openbsd-0f3015e1c64e2b9ba3774397257f15287f9ff442.zip
Remove the nuron engine. The static engine is not standalone and the
FPGA-based device is long obsolete.
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
3 files changed, 0 insertions, 5 deletions
diff --git a/src/lib/libcrypto/doc/engine.pod b/src/lib/libcrypto/doc/engine.pod
index 4b4d76f3e4..200e687e90 100644
--- a/src/lib/libcrypto/doc/engine.pod
+++ b/src/lib/libcrypto/doc/engine.pod
@@ -25,7 +25,6 @@ engine - ENGINE cryptographic module support
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_gmp(void); 27 void ENGINE_load_gmp(void);
28 void ENGINE_load_nuron(void);
29 #endif 28 #endif
30 void ENGINE_load_cryptodev(void); 29 void ENGINE_load_cryptodev(void);
31 void ENGINE_load_builtin_engines(void); 30 void ENGINE_load_builtin_engines(void);
diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c
index c9210fb514..f3c4cd9a1c 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_NURON
86 ENGINE_load_nuron();
87#endif
88#ifndef OPENSSL_NO_HW_PADLOCK 85#ifndef OPENSSL_NO_HW_PADLOCK
89 ENGINE_load_padlock(); 86 ENGINE_load_padlock();
90#endif 87#endif
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h
index a2b7e83a66..51a18f3ee2 100644
--- a/src/lib/libcrypto/engine/engine.h
+++ b/src/lib/libcrypto/engine/engine.h
@@ -316,7 +316,6 @@ ENGINE *ENGINE_by_id(const char *id);
316void ENGINE_load_openssl(void); 316void ENGINE_load_openssl(void);
317void ENGINE_load_dynamic(void); 317void ENGINE_load_dynamic(void);
318#ifndef OPENSSL_NO_STATIC_ENGINE 318#ifndef OPENSSL_NO_STATIC_ENGINE
319void ENGINE_load_nuron(void);
320void ENGINE_load_padlock(void); 319void ENGINE_load_padlock(void);
321void ENGINE_load_capi(void); 320void ENGINE_load_capi(void);
322#ifndef OPENSSL_NO_GMP 321#ifndef OPENSSL_NO_GMP