Fixes to make 'no-ec' work (it should not turn 'objects' into 'objts' for example)

diff --git a/Configure b/Configure
index dc372a20428e18c09203fe714c1d98b3567c6777..335d9b576ed4f7e643374e36798231eb0c51e240 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -879,7 +879,7 @@ while (<IN>)
        if ($sdirs) {
                my $dir;
                foreach $dir (@skip) {
-                       s/$dir//;
+                       s/ $dir / /;
                        }
                }
        $sdirs = 0 unless /\\$/;

diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index b034581970e5233ebdc56bcc351956b90f647e19..7a6d7f2cf6c39f51f92b2f69289adeb637bd6a11 100644 (file)
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -74,7 +74,7 @@ files:
        $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making 'files' in crypto/$$i..."; \
+       (cd $$i && echo "making 'files' in crypto/$$i..." && \
        $(MAKE) PERL='${PERL}' files ); \
        done;
 
@@ -85,7 +85,7 @@ links:
        @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS)
        @$(TOP)/util/point.sh Makefile.ssl Makefile
        @for i in $(SDIRS); do \
-       (cd $$i; echo "making links in crypto/$$i..."; \
+       (cd $$i && echo "making links in crypto/$$i..." && \
        $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PERL='${PERL}' links ); \
        done;
 
@@ -98,14 +98,14 @@ lib:        $(LIBOBJ)
 libs:
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making libs in crypto/$$i..."; \
+       (cd $$i && echo "making libs in crypto/$$i..." && \
        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' lib ); \
        done;
 
 tests:
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making tests in crypto/$$i..."; \
+       (cd $$i && echo "making tests in crypto/$$i..." && \
        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' AR='${AR}' tests ); \
        done;
 
@@ -117,14 +117,14 @@ install:
        done;
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making install in crypto/$$i..."; \
+       (cd $$i && echo "making install in crypto/$$i..." && \
        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}'  INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' install ); \
        done;
 
 lint:
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making lint in crypto/$$i..."; \
+       (cd $$i && echo "making lint in crypto/$$i..." && \
        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' lint ); \
        done;
 
@@ -134,7 +134,7 @@ depend:
        if [ ! -s buildinf.h ]; then rm buildinf.h; fi
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making depend in crypto/$$i..."; \
+       (cd $$i && echo "making depend in crypto/$$i..." && \
        $(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' DEPFLAG='${DEPFLAG}' depend ); \
        done;
 
@@ -142,7 +142,7 @@ clean:
        rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making clean in crypto/$$i..."; \
+       (cd $$i && echo "making clean in crypto/$$i..." && \
        $(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' clean ); \
        done;
 
@@ -151,7 +151,7 @@ dclean:
        mv -f Makefile.new $(MAKEFILE)
        @for i in $(SDIRS) ;\
        do \
-       (cd $$i; echo "making dclean in crypto/$$i..."; \
+       (cd $$i && echo "making dclean in crypto/$$i..." && \
        $(MAKE) PERL='${PERL}' CC='$(CC)' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' dclean ); \
        done;
 

diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index 2ca5bef136b4f074b6d1aa5a5a0c6871fe0e04ad..b088de65f5f30d94f473bc6ed999653b421bc249 100644 (file)
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -59,7 +59,9 @@
 #include <stdio.h>
 #include <openssl/asn1.h>
 #include <openssl/bn.h>
+#ifndef OPENSSL_NO_EC
 #include <openssl/ec.h>
+#endif
 #include <openssl/buffer.h>
 #include <openssl/bio.h>
 #ifndef OPENSSL_NO_RSA
@@ -110,7 +112,9 @@ void ERR_load_crypto_strings(void)
        ERR_load_ASN1_strings();
        ERR_load_CONF_strings();
        ERR_load_CRYPTO_strings();
+#ifndef OPENSSL_NO_EC
        ERR_load_EC_strings();
+#endif
        /* skip ERR_load_SSL_strings() because it is not in this library */
        ERR_load_BIO_strings();
        ERR_load_PKCS7_strings();