Make sure we don't try to loop over an empty EXHEADER. In the

Makefiles where this was fixed by commenting away code, change it to
check for an empty EXHEADER instead, so we have less hassle in a
future where EXHEADER changes.

PR: 900

diff --git a/fips/aes/Makefile b/fips/aes/Makefile
index b085d43122b149c85ec0f858146736ed1b7ca9f6..b7bd5ca2435385ced37f19c4ad06c33f4de2ca41 100644 (file)
--- a/fips/aes/Makefile
+++ b/fips/aes/Makefile
@@ -56,11 +56,13 @@ links:
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
 
 install:
-       @for i in $(EXHEADER) ; \
-       do  \
-       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-       done;
+       @if test -n "$(EXHEADER)"; then \
+         for i in $(EXHEADER) ; \
+         do  \
+           (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+           chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+         done; \
+       fi
 
 tags:
        ctags $(SRC)

diff --git a/fips/des/Makefile b/fips/des/Makefile
index 7d38bc7ed5900a105a637ffbe6b1e8825a0595db..ce64e67b369f5dd748afc6247b7c72f73eb42d17 100644 (file)
--- a/fips/des/Makefile
+++ b/fips/des/Makefile
@@ -56,11 +56,13 @@ links:
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
 
 install:
-       @for i in $(EXHEADER) ; \
-       do  \
-       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-       done;
+       @if test -n "$(EXHEADER)"; then \
+         for i in $(EXHEADER) ; \
+         do  \
+           (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+           chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+         done; \
+       fi
 
 tags:
        ctags $(SRC)

diff --git a/fips/dh/Makefile b/fips/dh/Makefile
index 925810fd74a82e61fade0ebe0c7681e312b6d5cc..c44c551a19ff1d42bbb6579f5ed7db0f4696f19a 100644 (file)
--- a/fips/dh/Makefile
+++ b/fips/dh/Makefile
@@ -54,12 +54,13 @@ links:
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
 
 install:
-# some shells don't like empty lists
-#      @for i in $(EXHEADER) ; \
-#      do  \
-#      (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-#      chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-#      done;
+       @if test -n "$(EXHEADER)"; then \
+         for i in $(EXHEADER) ; \
+         do  \
+           (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+           chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+         done; \
+       fi
 
 tags:
        ctags $(SRC)

diff --git a/fips/dsa/Makefile b/fips/dsa/Makefile
index 96cd964ef24cae0709c50f0efb2dad4aa1c9d335..76aa7dd1dc6b926585a4f26a3af44aa3e2c6aa5e 100644 (file)
--- a/fips/dsa/Makefile
+++ b/fips/dsa/Makefile
@@ -54,12 +54,13 @@ links:
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
 
 install:
-# some shells don't like empty lists
-#      @for i in $(EXHEADER) ; \
-#      do  \
-#      (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-#      chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-#      done;
+       @if test -n "$(EXHEADER)"; then \
+         for i in $(EXHEADER) ; \
+         do  \
+           (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+           chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+         done; \
+       fi
 
 tags:
        ctags $(SRC)

diff --git a/fips/rsa/Makefile b/fips/rsa/Makefile
index 91c2d49c27f969da2b38c844e29b1442b823c460..5aa1e2bae78a93351bfecaca11af6d6d586f9fd0 100644 (file)
--- a/fips/rsa/Makefile
+++ b/fips/rsa/Makefile
@@ -54,12 +54,13 @@ links:
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
 
 install:
-# some shells don't like empty lists
-#      @for i in $(EXHEADER) ; \
-#      do  \
-#      (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-#      chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-#      done;
+       @if test -n "$(EXHEADER)"; then \
+         for i in $(EXHEADER) ; \
+         do  \
+           (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+           chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+         done; \
+       fi
 
 tags:
        ctags $(SRC)

diff --git a/fips/sha1/Makefile b/fips/sha1/Makefile
index f98c084b49351519355fb249a2aa77d846a995f2..4a35a6fc3a47b001014bf07458fc170187ae5637 100644 (file)
--- a/fips/sha1/Makefile
+++ b/fips/sha1/Makefile
@@ -64,11 +64,13 @@ links:
        @$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)
 
 install:
-       @for i in $(EXHEADER) ; \
-       do  \
-       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
-       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-       done;
+       @if test -n "$(EXHEADER)"; then \
+         for i in $(EXHEADER) ; \
+         do  \
+           (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+           chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+         done; \
+       fi
 
 tags:
        ctags $(SRC)