[openssl] master update

Dr. Paul Dale pauli at openssl.org
Sat May 15 02:11:08 UTC 2021


The branch master has been updated
       via  773f1c3320f546a53906bd377b2c9d385ece3c39 (commit)
      from  af3521656d08b0876f1bcf326502e84c375222b7 (commit)


- Log -----------------------------------------------------------------
commit 773f1c3320f546a53906bd377b2c9d385ece3c39
Author: Tomas Mraz <tomas at openssl.org>
Date:   Thu May 13 19:41:09 2021 +0200

    Add make update-fips-checksums to release.sh script
    
    Fixes #15223
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15271)

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

Summary of changes:
 dev/release.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dev/release.sh b/dev/release.sh
index 7a1ee4d270..14a3d445c6 100755
--- a/dev/release.sh
+++ b/dev/release.sh
@@ -30,7 +30,7 @@ Usage: release.sh [ options ... ]
                 key (default: use the default e-mail address’ key).
 
 --no-upload     Don't upload to upload at dev.openssl.org.
---no-update     Don't perform 'make update'.
+--no-update     Don't perform 'make update' and 'make update-fips-checksums'.
 --verbose       Verbose output.
 --debug         Include debug output.  Implies --no-upload.
 
@@ -319,10 +319,12 @@ echo "== Configuring OpenSSL for update and release.  This may take a bit of tim
 
 ./Configure cc >&42
 
-$VERBOSE "== Checking source file updates"
+$VERBOSE "== Checking source file updates and fips checksums"
 
 make update >&42
 
+make update-fips-checksums >&42
+
 if [ -n "$(git status --porcelain)" ]; then
     $VERBOSE "== Committing updates"
     git add -u
@@ -337,7 +339,7 @@ fi
 if $do_branch; then
     $VERBOSE "== Creating a local update branch: $tmp_update_branch"
     git branch $git_quiet "$tmp_update_branch"
-fi    
+fi
 
 # Write the version information we updated
 set_version
@@ -410,7 +412,7 @@ cat "$HERE/dev/release-aux/$announce_template" \
           -e "s|\\\$sha256hash|$sha256hash|" \
     | perl -p "$HERE/dev/release-aux/fix-title.pl" \
     > "../$announce"
-              
+
 $VERBOSE "== Generating signatures: $tgzfile.asc $announce.asc"
 rm -f "../$tgzfile.asc" "../$announce.asc"
 echo "Signing the release files.  You may need to enter a pass phrase"
@@ -508,7 +510,7 @@ $VERBOSE "== Push what we have to the parent repository"
 git push parent HEAD
 
 # Done ###############################################################
-    
+
 $VERBOSE "== Done"
 
 cd $HERE
@@ -697,7 +699,7 @@ Don't upload the produced files.
 
 =item B<--no-update>
 
-Don't run C<make update>.
+Don't run C<make update> and C<make update-fips-checksums>.
 
 =item B<--verbose>
 


More information about the openssl-commits mailing list