[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  8f3683cda197cd3df1005dc058a2d57be0b6cc5a (commit)
      from  91a05d65908c2ee21920d0effbda58b8536c2768 (commit)


- Log -----------------------------------------------------------------
commit 8f3683cda197cd3df1005dc058a2d57be0b6cc5a
Author: Tomas Mraz <tomas at openssl.org>
Date:   Thu May 13 10:50:14 2021 +0200

    Remove the .new suffix inside the fips.checksum.new
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15263)

-----------------------------------------------------------------------

Summary of changes:
 Configurations/unix-Makefile.tmpl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 9dcc0b0342..3f78d6d5de 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1264,7 +1264,7 @@ tags TAGS: FORCE
 	-ctags -R .
 	-etags `find . -name '*.[ch]' -o -name '*.pm'`
 
-fips-checksums: generate_fips_sources
+providers/fips.checksum.new: generate_fips_sources
 	@which unifdef > /dev/null || \
 	( echo >&2 "ERROR: unifdef not in your \$$PATH, FIPS checksums not calculated"; \
 	  false )
@@ -1274,7 +1274,9 @@ fips-checksums: generate_fips_sources
 	         | xargs ./util/fips-checksums.sh ) \
 	         > providers/fips-sources.checksums.new \
 	&& sha256sum providers/fips-sources.checksums.new \
-	     > providers/fips.checksum.new
+	     | sed -e 's|\.new||' > providers/fips.checksum.new
+
+fips-checksums: providers/fips.checksum.new
 
 $(SRCDIR)/providers/fips.checksum: providers/fips.checksum.new
 	cp -p providers/fips.module.sources.new $(SRCDIR)/providers/fips.module.sources