avoid some NO_<cipher> problems

diff --git a/Configure b/Configure
index 30927aeed7bca6f60b33e9e6dcb4f4f35d5f02c9..26f029f42488d45bad10f8415473ab33f56ab2c4 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -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 351f131fe170d925d03897c6b975a2b3af35bb27..5defddeb320f47404409a422bed059a307704711 100644 (file)
--- 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 0df792e758e6cd15dd0a9778a3732de14158a63c..df067182bc4622acf3981fdca36657e61d8e9177 100644 (file)
--- 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 930dd02a9b3cb616f4a8c3a8f853c6ba273d3868..37aaac15280391c4651f2ed524699428c47ebd1f 100644 (file)
--- 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 70de9b43dddeebae7cd77d120633a2dbafacb6be..57006e687549f62ff48b44dd0fc44423ee977a45 100644 (file)
--- 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 15323bdc513fa34d1c0bcdf34c8550170a3d9830..3c75e13c37560122c3061c01d6d01431904b086f 100644 (file)
--- 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