diff options
author | Bodo Möller <bodo@openssl.org> | 1999-08-02 21:44:49 +0000 |
---|---|---|
committer | Bodo Möller <bodo@openssl.org> | 1999-08-02 21:44:49 +0000 |
commit | a85154416916e2da4ea428112f419db1562bdb58 (patch) | |
tree | 28c8fe8a89dcece90611c003fb982b54ae8054fd | |
parent | 2b8e4959fb563f79fcad351a7c66d4d142c0fe8d (diff) |
avoid some NO_<cipher> problems
-rwxr-xr-x | Configure | 12 | ||||
-rw-r--r-- | apps/pkcs12.c | 4 | ||||
-rw-r--r-- | apps/progs.h | 4 | ||||
-rw-r--r-- | crypto/Makefile.ssl | 2 | ||||
-rw-r--r-- | crypto/x509v3/Makefile.ssl | 2 | ||||
-rw-r--r-- | test/Makefile.ssl | 2 |
6 files changed, 23 insertions, 3 deletions
@@ -720,6 +720,18 @@ EOF system "perl crypto/objects/obj_dat.pl <crypto/objects/objects.h >crypto/objects/obj_dat.h"; } else { + open (OUT,">crypto/buildinf.h") || die "Can't open buildinf.h"; + printf OUT <<EOF; +#ifndef MK1MF_BUILD + /* auto-generated by Configure for crypto/cversion.c: + * for Unix builds, crypto/Makefile.ssl generates functional definitions; + * Windows builds (and other mk1mf builds) compile cversion.c with + * -DMK1MF_BUILD and use definitions added to this file by util/mk1mf.pl. */ + #error "Windows builds (PLATFORM=$target) use mk1mf.pl-created Makefiles" +#endif +EOF + close(OUT); + (system "make -f Makefile.ssl PERL=\'$perl\' links") == 0 or exit $?; ### (system 'make depend') == 0 or exit $? if $depflags ne ""; # Run "make depend" manually if you want to be able to delete diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 351f131fe1..5defddeb32 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -1,4 +1,6 @@ /* pkcs12.c */ +#if !defined(NO_DES) && !defined(NO_SHA1) + /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL * project 1999. */ @@ -697,3 +699,5 @@ void hex_prin(BIO *out, unsigned char *buf, int len) int i; for (i = 0; i < len; i++) BIO_printf (out, "%02X ", buf[i]); } + +#endif diff --git a/apps/progs.h b/apps/progs.h index 0df792e758..df067182bc 100644 --- a/apps/progs.h +++ b/apps/progs.h @@ -86,11 +86,13 @@ FUNCTION functions[] = { {FUNC_TYPE_GENERAL,"pkcs7",pkcs7_main}, {FUNC_TYPE_GENERAL,"crl2pkcs7",crl2pkcs7_main}, {FUNC_TYPE_GENERAL,"sess_id",sess_id_main}, -#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(O_SSL3)) +#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3)) {FUNC_TYPE_GENERAL,"ciphers",ciphers_main}, #endif {FUNC_TYPE_GENERAL,"nseq",nseq_main}, +#if !defined(NO_DES) && !defined(NO_SHA1) {FUNC_TYPE_GENERAL,"pkcs12",pkcs12_main}, +#endif {FUNC_TYPE_GENERAL,"pkcs8",pkcs8_main}, {FUNC_TYPE_MD,"md2",dgst_main}, {FUNC_TYPE_MD,"md5",dgst_main}, diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl index 930dd02a9b..37aaac1528 100644 --- a/crypto/Makefile.ssl +++ b/crypto/Makefile.ssl @@ -122,7 +122,9 @@ lint: done; depend: + if [ ! -e buildinf.h ]; then touch buildinf.h; fi # fake buildinf.h if it does not exist $(MAKEDEPEND) $(INCLUDE) $(DEPFLAG) $(PROGS) $(LIBSRC) + if [ ! -s buildinf.h ]; then rm buildinf.h; fi @for i in $(SDIRS) ;\ do \ (cd $$i; echo "making depend in crypto/$$i..."; \ diff --git a/crypto/x509v3/Makefile.ssl b/crypto/x509v3/Makefile.ssl index 70de9b43dd..57006e6875 100644 --- a/crypto/x509v3/Makefile.ssl +++ b/crypto/x509v3/Makefile.ssl @@ -71,7 +71,7 @@ lint: lint -DLINT $(INCLUDES) $(SRC)>fluff depend: - $(MAKEDEPEND) $(INCLUDES) $(DEPFLFAG) $(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/test/Makefile.ssl b/test/Makefile.ssl index 15323bdc51..3c75e13c37 100644 --- a/test/Makefile.ssl +++ b/test/Makefile.ssl @@ -219,7 +219,7 @@ lint: lint -DLINT $(INCLUDES) $(SRC)>fluff depend: - $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(SRC) + $(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(SRC) dclean: $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new |