diff options
Diffstat (limited to 'crypto')
95 files changed, 388 insertions, 90 deletions
diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl index 4c0add7a6d..ad6cfc9534 100644 --- a/crypto/Makefile.ssl +++ b/crypto/Makefile.ssl @@ -115,11 +115,11 @@ lint: done; depend: - $(MAKEDEPEND) $(INCLUDE) $(PROGS) $(LIBSRC) + $(MAKEDEPEND) $(INCLUDE) $(DEPFLAG) $(PROGS) $(LIBSRC) @for i in $(SDIRS) ;\ do \ (cd $$i; echo "making depend in crypto/$$i..."; \ - $(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' depend ); \ + $(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' DEPFLAG='${DEPFLAG}' depend ); \ done; clean: diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl index 87f392eeb3..3bfadb1a3b 100644 --- a/crypto/asn1/Makefile.ssl +++ b/crypto/asn1/Makefile.ssl @@ -101,7 +101,7 @@ lint: lint -DLINT $(INCLUDES) $(SRC)>fluff depend: - $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) + $(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC) dclean: $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new diff --git a/crypto/asn1/d2i_dhp.c b/crypto/asn1/d2i_dhp.c index a0f514dc7e..a077211a4c 100644 --- a/crypto/asn1/d2i_dhp.c +++ b/crypto/asn1/d2i_dhp.c @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#ifndef NO_DH #include <stdio.h> #include "cryptlib.h" #include <openssl/bn.h> @@ -97,4 +98,4 @@ err: if (bs != NULL) ASN1_BIT_STRING_free(bs); return(NULL); } - +#endif diff --git a/crypto/asn1/d2i_dsap.c b/crypto/asn1/d2i_dsap.c index 2582b8fd45..51863a8b13 100644 --- a/crypto/asn1/d2i_dsap.c +++ b/crypto/asn1/d2i_dsap.c @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#ifndef NO_DSA #include <stdio.h> #include "cryptlib.h" #include <openssl/bn.h> @@ -90,4 +91,4 @@ err: if (bs != NULL) ASN1_BIT_STRING_free(bs); return(NULL); } - +#endif diff --git a/crypto/asn1/d2i_r_pr.c b/crypto/asn1/d2i_r_pr.c index f6d118937c..18f11b6f5e 100644 --- a/crypto/asn1/d2i_r_pr.c +++ b/crypto/asn1/d2i_r_pr.c @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#ifndef NO_RSA #include <stdio.h> #include "cryptlib.h" #include <openssl/bn.h> @@ -117,4 +118,4 @@ err: if (bs != NULL) ASN1_INTEGER_free(bs); return(NULL); } - +#endif diff --git a/crypto/asn1/d2i_r_pu.c b/crypto/asn1/d2i_r_pu.c index 80deaab71a..04cfe5671e 100644 --- a/crypto/asn1/d2i_r_pu.c +++ b/crypto/asn1/d2i_r_pu.c @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#ifndef NO_RSA #include <stdio.h> #include "cryptlib.h" #include <openssl/bn.h> @@ -89,4 +90,4 @@ err: if (bs != NULL) ASN1_INTEGER_free(bs); return(NULL); } - +#endif diff --git a/crypto/asn1/d2i_s_pr.c b/crypto/asn1/d2i_s_pr.c index cf64a2edad..050e1cc5fb 100644 --- a/crypto/asn1/d2i_s_pr.c +++ b/crypto/asn1/d2i_s_pr.c @@ -58,6 +58,7 @@ /* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */ +#ifndef NO_DSA #include <stdio.h> #include "cryptlib.h" #include <openssl/bn.h> @@ -101,4 +102,4 @@ err: if (bs != NULL) ASN1_INTEGER_free(bs); return(NULL); } - +#endif diff --git a/crypto/asn1/d2i_s_pu.c b/crypto/asn1/d2i_s_pu.c index 4d65cef5a9..2b1bf638c1 100644 --- a/crypto/asn1/d2i_s_pu.c +++ b/crypto/asn1/d2i_s_pu.c @@ -56,8 +56,9 @@ * [including the GNU Public Licence.] */ -/* Origional version from Steven Schoch <schoch@sheba.arc.nasa.gov> */ +/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */ +#ifndef NO_DSA #include <stdio.h> #include "cryptlib.h" #include <openssl/bn.h> @@ -113,4 +114,4 @@ err: if (bs != NULL) ASN1_INTEGER_free(bs); return(NULL); } - +#endif diff --git a/crypto/asn1/i2d_dhp.c b/crypto/asn1/i2d_dhp.c index e82f2a96af..1b2b4b8ebe 100644 --- a/crypto/asn1/i2d_dhp.c +++ b/crypto/asn1/i2d_dhp.c @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#ifndef NO_DH #include <stdio.h> #include "cryptlib.h" #include <openssl/bn.h> @@ -119,3 +120,4 @@ err: *pp=p; return(ret); } +#endif diff --git a/crypto/asn1/i2d_dsap.c b/crypto/asn1/i2d_dsap.c index 9317110464..f36f0da4e2 100644 --- a/crypto/asn1/i2d_dsap.c +++ b/crypto/asn1/i2d_dsap.c @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#ifndef NO_DSA #include <stdio.h> #include "cryptlib.h" #include <openssl/bn.h> @@ -112,4 +113,5 @@ err: *pp=p; return(ret); } +#endif diff --git a/crypto/asn1/i2d_r_pr.c b/crypto/asn1/i2d_r_pr.c index 617c10af46..27e6844a7f 100644 --- a/crypto/asn1/i2d_r_pr.c +++ b/crypto/asn1/i2d_r_pr.c @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#ifndef NO_RSA #include <stdio.h> #include "cryptlib.h" #include <openssl/bn.h> @@ -122,4 +123,5 @@ int i2d_RSAPrivateKey(RSA *a, unsigned char **pp) *pp=p; return(t); } +#endif diff --git a/crypto/asn1/i2d_r_pu.c b/crypto/asn1/i2d_r_pu.c index 03f7348527..6d01bfa8b5 100644 --- a/crypto/asn1/i2d_r_pu.c +++ b/crypto/asn1/i2d_r_pu.c @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#ifndef NO_RSA #include <stdio.h> #include "cryptlib.h" #include <openssl/bn.h> @@ -108,4 +109,4 @@ int i2d_RSAPublicKey(RSA *a, unsigned char **pp) *pp=p; return(t); } - +#endif diff --git a/crypto/asn1/i2d_s_pr.c b/crypto/asn1/i2d_s_pr.c index f3a5e8fe9d..5d3dcdf197 100644 --- a/crypto/asn1/i2d_s_pr.c +++ b/crypto/asn1/i2d_s_pr.c @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#ifndef NO_DSA #include <stdio.h> #include "cryptlib.h" #include <openssl/bn.h> @@ -119,4 +120,4 @@ int i2d_DSAPrivateKey(DSA *a, unsigned char **pp) *pp=p; return(t); } - +#endif diff --git a/crypto/asn1/i2d_s_pu.c b/crypto/asn1/i2d_s_pu.c index 7903ea410d..25b150794a 100644 --- a/crypto/asn1/i2d_s_pu.c +++ b/crypto/asn1/i2d_s_pu.c @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#ifndef NO_DSA #include <stdio.h> #include "cryptlib.h" #include <openssl/bn.h> @@ -124,4 +125,4 @@ int i2d_DSAPublicKey(DSA *a, unsigned char **pp) *pp=p; return(t); } - +#endif diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c index 9133bc6d29..cdc0d8b7c4 100644 --- a/crypto/asn1/n_pkey.c +++ b/crypto/asn1/n_pkey.c @@ -56,6 +56,7 @@ * [including the GNU Public Licence.] */ +#ifndef NO_RSA #include <stdio.h> #include "cryptlib.h" #include <openssl/rsa.h> @@ -78,6 +79,7 @@ static int i2d_NETSCAPE_PKEY(NETSCAPE_PKEY *a, unsigned char **pp); static NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a,unsigned char **pp, long length); static NETSCAPE_PKEY *NETSCAPE_PKEY_new(void); static void NETSCAPE_PKEY_free(NETSCAPE_PKEY *); + int i2d_Netscape_RSA(RSA *a, unsigned char **pp, int (*cb)()) { int i,j,l[6]; @@ -336,4 +338,4 @@ static void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a) } #endif /* NO_RC4 */ - +#endif diff --git a/crypto/bf/Makefile.ssl b/crypto/bf/Makefile.ssl index b1de95010c..225d818eca 100644 --- a/crypto/bf/Makefile.ssl +++ b/crypto/bf/Makefile.ssl @@ -91,7 +91,7 @@ lint: lint -DLINT $(INCLUDES) $(SRC)>fluff depend: - $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC) + $(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC) dclean: $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new diff --git a/crypto/bf/bftest.c b/crypto/bf/bftest.c index 091c8081a9..80182c0a2f 100644 --- a/crypto/bf/bftest.c +++ b/crypto/bf/bftest.c @@ -62,6 +62,14 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> + +#ifdef NO_BF +int main(int argc, char *argv[]) +{ + printf("No BF support\n"); + return(0); +} +#else #include <openssl/blowfish.h> char *bf_key[2]={ @@ -511,3 +519,4 @@ static int test(void) return(err); } +#endif diff --git a/crypto/bf/blowfish.h b/crypto/bf/blowfish.h index 005d0ed7b6..a18dfee1a4 100644 --- a/crypto/bf/blowfish.h +++ b/crypto/bf/blowfish.h @@ -63,6 +63,10 @@ extern "C" { #endif |