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 | |
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')
-rw-r--r-- | crypto/asn1/t_pkey.c | 4 | ||||
-rw-r--r-- | crypto/asn1/t_req.c | 4 | ||||
-rw-r--r-- | crypto/asn1/t_spki.c | 4 | ||||
-rw-r--r-- | crypto/asn1/x_pubkey.c | 4 | ||||
-rw-r--r-- | crypto/dsa/dsa_lib.c | 2 | ||||
-rw-r--r-- | crypto/dsa/dsatest.c | 1 | ||||
-rw-r--r-- | crypto/ecdh/ecdhtest.c | 3 | ||||
-rw-r--r-- | crypto/ecdsa/ecdsatest.c | 7 | ||||
-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 | ||||
-rw-r--r-- | crypto/evp/evp_pkey.c | 4 | ||||
-rw-r--r-- | crypto/evp/m_dss.c | 3 | ||||
-rw-r--r-- | crypto/evp/m_dss1.c | 2 | ||||
-rw-r--r-- | crypto/evp/m_md2.c | 2 | ||||
-rw-r--r-- | crypto/evp/m_md4.c | 2 | ||||
-rw-r--r-- | crypto/evp/m_md5.c | 2 | ||||
-rw-r--r-- | crypto/evp/m_ripemd.c | 2 | ||||
-rw-r--r-- | crypto/evp/m_sha.c | 2 | ||||
-rw-r--r-- | crypto/evp/m_sha1.c | 2 | ||||
-rw-r--r-- | crypto/evp/p_lib.c | 6 | ||||
-rw-r--r-- | crypto/pem/pem_all.c | 6 | ||||
-rw-r--r-- | crypto/pem/pem_info.c | 4 | ||||
-rw-r--r-- | crypto/pem/pem_seal.c | 1 | ||||
-rw-r--r-- | crypto/x509/x_all.c | 4 |
26 files changed, 73 insertions, 25 deletions
diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c index 7dd4ae3787..939979f77d 100644 --- a/crypto/asn1/t_pkey.c +++ b/crypto/asn1/t_pkey.c @@ -81,8 +81,10 @@ static int print(BIO *fp,const char *str, const BIGNUM *num, unsigned char *buf,int off); +#ifndef OPENSSL_NO_EC static int print_bin(BIO *fp, const char *str, const unsigned char *num, size_t len, int off); +#endif #ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_FP_API int RSA_print_fp(FILE *fp, const RSA *x, int off) @@ -601,6 +603,7 @@ static int print(BIO *bp, const char *number, const BIGNUM *num, unsigned char * return(1); } +#ifndef OPENSSL_NO_EC static int print_bin(BIO *fp, const char *name, const unsigned char *buf, size_t len, int off) { @@ -638,6 +641,7 @@ static int print_bin(BIO *fp, const char *name, const unsigned char *buf, return 1; } +#endif #ifndef OPENSSL_NO_DH #ifndef OPENSSL_NO_FP_API diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c index 204ca105e3..c779a9bb18 100644 --- a/crypto/asn1/t_req.c +++ b/crypto/asn1/t_req.c @@ -63,8 +63,12 @@ #include <openssl/objects.h> #include <openssl/x509.h> #include <openssl/x509v3.h> +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> +#endif +#ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> +#endif #ifndef OPENSSL_NO_FP_API int X509_REQ_print_fp(FILE *fp, X509_REQ *x) diff --git a/crypto/asn1/t_spki.c b/crypto/asn1/t_spki.c index 23ab3b94e0..c2a5797dd8 100644 --- a/crypto/asn1/t_spki.c +++ b/crypto/asn1/t_spki.c @@ -60,8 +60,12 @@ #include "cryptlib.h" #include <openssl/x509.h> #include <openssl/asn1.h> +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> +#endif +#ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> +#endif #include <openssl/bn.h> /* Print out an SPKI */ diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c index 50faa4af20..91c2756116 100644 --- a/crypto/asn1/x_pubkey.c +++ b/crypto/asn1/x_pubkey.c @@ -60,8 +60,12 @@ #include "cryptlib.h" #include <openssl/asn1t.h> #include <openssl/x509.h> +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> +#endif +#ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> +#endif /* Minor tweak to operation: free up EVP_PKEY */ static int pubkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c index 3a78082c01..b9825791ba 100644 --- a/crypto/dsa/dsa_lib.c +++ b/crypto/dsa/dsa_lib.c @@ -66,7 +66,9 @@ #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> #endif +#ifndef OPENSSL_NO_DH #include <openssl/dh.h> +#endif const char *DSA_version="DSA" OPENSSL_VERSION_PTEXT; diff --git a/crypto/dsa/dsatest.c b/crypto/dsa/dsatest.c index 66ff417398..912317bb44 100644 --- a/crypto/dsa/dsatest.c +++ b/crypto/dsa/dsatest.c @@ -74,6 +74,7 @@ #include <openssl/rand.h> #include <openssl/bio.h> #include <openssl/err.h> +#include <openssl/bn.h> #ifdef OPENSSL_NO_DSA int main(int argc, char *argv[]) diff --git a/crypto/ecdh/ecdhtest.c b/crypto/ecdh/ecdhtest.c index c0414b92d3..01baa5f494 100644 --- a/crypto/ecdh/ecdhtest.c +++ b/crypto/ecdh/ecdhtest.c @@ -73,10 +73,10 @@ #include "../e_os.h" +#include <openssl/opensslconf.h> /* for OPENSSL_NO_ECDH */ #include <openssl/crypto.h> #include <openssl/bio.h> #include <openssl/bn.h> -#include <openssl/ec.h> #include <openssl/objects.h> #include <openssl/rand.h> #include <openssl/sha.h> @@ -89,6 +89,7 @@ int main(int argc, char *argv[]) return(0); } #else +#include <openssl/ec.h> #include <openssl/ecdh.h> #ifdef OPENSSL_SYS_WIN16 diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c index a481575417..f7fba3b42d 100644 --- a/crypto/ecdsa/ecdsatest.c +++ b/crypto/ecdsa/ecdsatest.c @@ -69,12 +69,6 @@ * */ -/* Until the key-gen callbacks are modified to use newer prototypes, we allow - * deprecated functions for openssl-internal code */ -#ifdef OPENSSL_NO_DEPRECATED -#undef OPENSSL_NO_DEPRECATED -#endif - #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -92,6 +86,7 @@ int main(int argc, char * argv[]) #include <openssl/crypto.h> #include <openssl/bio.h> #include <openssl/evp.h> +#include <openssl/bn.h> #include <openssl/ecdsa.h> #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> 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 diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c index b71555e712..0147f3e02a 100644 --- a/crypto/evp/evp_pkey.c +++ b/crypto/evp/evp_pkey.c @@ -61,8 +61,12 @@ #include "cryptlib.h" #include <openssl/x509.h> #include <openssl/rand.h> +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> +#endif +#ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> +#endif #include <openssl/bn.h> #ifndef OPENSSL_NO_DSA diff --git a/crypto/evp/m_dss.c b/crypto/evp/m_dss.c index 020f19c44b..a948c77fa4 100644 --- a/crypto/evp/m_dss.c +++ b/crypto/evp/m_dss.c @@ -61,9 +61,12 @@ #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/x509.h> +#ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> +#endif #ifndef OPENSSL_NO_SHA + static int init(EVP_MD_CTX *ctx) { return SHA1_Init(ctx->md_data); } diff --git a/crypto/evp/m_dss1.c b/crypto/evp/m_dss1.c index a20056f04b..c12e13972b 100644 --- a/crypto/evp/m_dss1.c +++ b/crypto/evp/m_dss1.c @@ -64,7 +64,9 @@ #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/x509.h> +#ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> +#endif static int init(EVP_MD_CTX *ctx) { return SHA1_Init(ctx->md_data); } diff --git a/crypto/evp/m_md2.c b/crypto/evp/m_md2.c index 1eae4ed38c..5ce849f161 100644 --- a/crypto/evp/m_md2.c +++ b/crypto/evp/m_md2.c @@ -65,7 +65,9 @@ #include <openssl/objects.h> #include <openssl/x509.h> #include <openssl/md2.h> +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> +#endif static int init(EVP_MD_CTX *ctx) { return MD2_Init(ctx->md_data); } diff --git a/crypto/evp/m_md4.c b/crypto/evp/m_md4.c index 0fb84b6d1e..1e0b7c5b42 100644 --- a/crypto/evp/m_md4.c +++ b/crypto/evp/m_md4.c @@ -65,7 +65,9 @@ #include <openssl/objects.h> #include <openssl/x509.h> #include <openssl/md4.h> +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> +#endif static int init(EVP_MD_CTX *ctx) { return MD4_Init(ctx->md_data); } diff --git a/crypto/evp/m_md5.c b/crypto/evp/m_md5.c index 21288ee636..63c142119e 100644 --- a/crypto/evp/m_md5.c +++ b/crypto/evp/m_md5.c @@ -65,7 +65,9 @@ #include <openssl/objects.h> #include <openssl/x509.h> #include <openssl/md5.h> +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> +#endif static int init(EVP_MD_CTX *ctx) { return MD5_Init(ctx->md_data); } diff --git a/crypto/evp/m_ripemd.c b/crypto/evp/m_ripemd.c index 087ad2d30a..a1d60ee78d 100644 --- a/crypto/evp/m_ripemd.c +++ b/crypto/evp/m_ripemd.c @@ -65,7 +65,9 @@ #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/x509.h> +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> +#endif static int init(EVP_MD_CTX *ctx) { return RIPEMD160_Init(ctx->md_data); } diff --git a/crypto/evp/m_sha.c b/crypto/evp/m_sha.c index e995c122e4..acccc8f92d 100644 --- a/crypto/evp/m_sha.c +++ b/crypto/evp/m_sha.c @@ -64,7 +64,9 @@ #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/x509.h> +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> +#endif static int init(EVP_MD_CTX *ctx) { return SHA_Init(ctx->md_data); } diff --git a/crypto/evp/m_sha1.c b/crypto/evp/m_sha1.c index daf6db6ebe..4679b1c463 100644 --- a/crypto/evp/m_sha1.c +++ b/crypto/evp/m_sha1.c @@ -64,7 +64,9 @@ #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/x509.h> +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> +#endif static int init(EVP_MD_CTX *ctx) { return SHA1_Init(ctx->md_data); } diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index 04b57e8251..22155ecf62 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -64,9 +64,15 @@ #include <openssl/evp.h> #include <openssl/asn1_mac.h> #include <openssl/x509.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 static void EVP_PKEY_free_it(EVP_PKEY *x); diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c index a9ac52de02..66cbc7eb82 100644 --- a/crypto/pem/pem_all.c +++ b/crypto/pem/pem_all.c @@ -117,9 +117,15 @@ #include <openssl/x509.h> #include <openssl/pkcs7.h> #include <openssl/pem.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 #ifndef OPENSSL_NO_RSA static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa); diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c index 489e71a892..1644dfcaac 100644 --- a/crypto/pem/pem_info.c +++ b/crypto/pem/pem_info.c @@ -63,8 +63,12 @@ #include <openssl/evp.h> #include <openssl/x509.h> #include <openssl/pem.h> +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> +#endif +#ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> +#endif #ifndef OPENSSL_NO_FP_API STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb, void *u) diff --git a/crypto/pem/pem_seal.c b/crypto/pem/pem_seal.c index 0458093353..4e554e5481 100644 --- a/crypto/pem/pem_seal.c +++ b/crypto/pem/pem_seal.c @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#include <openssl/opensslconf.h> /* for OPENSSL_NO_RSA */ #ifndef OPENSSL_NO_RSA #include <stdio.h> #include "cryptlib.h" diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c index 84ec5d5098..9039caad60 100644 --- a/crypto/x509/x_all.c +++ b/crypto/x509/x_all.c @@ -64,8 +64,12 @@ #include <openssl/asn1.h> #include <openssl/evp.h> #include <openssl/x509.h> +#ifndef OPENSSL_NO_RSA #include <openssl/rsa.h> +#endif +#ifndef OPENSSL_NO_DSA #include <openssl/dsa.h> +#endif int X509_verify(X509 *a, EVP_PKEY *r) { |