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 78db83a3770a937218c47923cddb0e669b72b0f1..7855018e3d4fea22d588a038f40444b70b8a7d24 100644 (file)
--- 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' \