From: Tomas Mraz <tomas@openssl.org>
Date: Tue, 25 May 2021 16:15:21 +0000 (+0200)
Subject: generate_fips_sources: properly include providers/common/der/*.in
X-Git-Tag: openssl-3.0.0-beta1~344
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9fc7a053fce0c6d1d0f39e919f16e35405171b10;p=thirdparty%2Fopenssl.git

generate_fips_sources: properly include providers/common/der/*.in

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15481)
---

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 78db83a3770..7855018e3d4 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1220,12 +1220,6 @@ providers/fips.module.sources.new: \
 	     | sed -e 's/^.*: *//' -e 's/  */ /g' \
 	     | fgrep -f sources-tmp/sources | tr ' ' '\n' \
 	     | sed -E -e '/^include/s:$$:.in:' -e 's:^ *([.][.]/)*$(SRCDIR)::' -e 's:^/::' ; \
-	  for x in providers/common/include/prov/*.h; do \
-	    echo providers/common/der/`basename "$$x"`.in; \
-	  done ; \
-	  for x in providers/common/der/*.c; do \
-	    echo "$$x".in; \
-	  done ; \
 	  for x in `cat sources-tmp/sources`; do \
 	    if [ -f "$(SRCDIR)$$x" ]; then echo $$x | sed 's:^/::' ; fi ; \
 	  done ; \
@@ -1235,7 +1229,8 @@ providers/fips.module.sources.new: \
 		   crypto/ec/asm/*.pl \
 		   crypto/modes/asm/*.pl \
 		   crypto/sha/asm/*.pl \
-		   crypto/x86_64cpuid.pl; do \
+		   crypto/x86_64cpuid.pl \
+	           providers/common/der/*.in; do \
 	    echo "$$x"; \
 	  done \
 	) | sed -e 's:/[^/]*/[^/]*/[.][.]/[.][.]/:/:g' -e 's:/[^/]*/[.][.]/:/:g' \