diff options
author | Nils Larsch <nils@openssl.org> | 2005-07-16 12:37:36 +0000 |
---|---|---|
committer | Nils Larsch <nils@openssl.org> | 2005-07-16 12:37:36 +0000 |
commit | 3eeaab4bed46e3320947d0f609b82007b65b5a46 (patch) | |
tree | 3d5136c2646cb283e543b4db9cb47eb997bd4132 /crypto/engine | |
parent | 57eb1d32508b2debfbab605ebf9ac156c4008272 (diff) |
make
./configure no-deprecated [no-dsa] [no-dh] [no-ec] [no-rsa]
make depend all test
work again
PR: 1159
Diffstat (limited to 'crypto/engine')
-rw-r--r-- | crypto/engine/Makefile | 3 | ||||
-rw-r--r-- | crypto/engine/eng_openssl.c | 6 | ||||
-rw-r--r-- | crypto/engine/eng_padlock.c | 1 | ||||
-rw-r--r-- | crypto/engine/engine.h | 17 |
4 files changed, 9 insertions, 18 deletions
diff --git a/crypto/engine/Makefile b/crypto/engine/Makefile index 7684406eb8..13f211a0ae 100644 --- a/crypto/engine/Makefile +++ b/crypto/engine/Makefile @@ -185,7 +185,8 @@ eng_openssl.o: ../../include/openssl/x509_vfy.h ../cryptlib.h eng_openssl.c eng_padlock.o: ../../include/openssl/aes.h ../../include/openssl/asn1.h eng_padlock.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h eng_padlock.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h -eng_padlock.o: ../../include/openssl/engine.h ../../include/openssl/evp.h +eng_padlock.o: ../../include/openssl/engine.h ../../include/openssl/err.h +eng_padlock.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h eng_padlock.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h eng_padlock.o: ../../include/openssl/opensslconf.h eng_padlock.o: ../../include/openssl/opensslv.h diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c index dd16d3bc6a..5341daaf4e 100644 --- a/crypto/engine/eng_openssl.c +++ b/crypto/engine/eng_openssl.c @@ -70,9 +70,15 @@ #include <openssl/pem.h> #include <openssl/evp.h> #include <openssl/rand.h> +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> +#endif +#ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> +#endif +#ifndef OPENSSL_NO_DH #include <openssl/dh.h> +#endif /* This testing gunk is implemented (and explained) lower down. It also assumes * the application explicitly calls "ENGINE_load_openssl()" because this is no diff --git a/crypto/engine/eng_padlock.c b/crypto/engine/eng_padlock.c index cc9f9dc41e..4e1eae3172 100644 --- a/crypto/engine/eng_padlock.c +++ b/crypto/engine/eng_padlock.c @@ -75,6 +75,7 @@ #include <openssl/aes.h> #endif #include <openssl/rand.h> +#include <openssl/err.h> #ifndef OPENSSL_NO_HW #ifndef OPENSSL_NO_HW_PADLOCK diff --git a/crypto/engine/engine.h b/crypto/engine/engine.h index 4ce8f4ce7b..c94fb28659 100644 --- a/crypto/engine/engine.h +++ b/crypto/engine/engine.h @@ -100,23 +100,6 @@ extern "C" { #endif -/* Fixups for missing algorithms */ -#ifdef OPENSSL_NO_RSA -typedef void RSA_METHOD; -#endif -#ifdef OPENSSL_NO_DSA -typedef void DSA_METHOD; -#endif -#ifdef OPENSSL_NO_DH -typedef void DH_METHOD; -#endif -#ifdef OPENSSL_NO_ECDH -typedef void ECDH_METHOD; -#endif -#ifdef OPENSSL_NO_ECDSA -typedef void ECDSA_METHOD; -#endif - /* These flags are used to control combinations of algorithm (methods) * by bitwise "OR"ing. */ #define ENGINE_METHOD_RSA (unsigned int)0x0001 |