[openssl-commits] [tools] master update

[Matt Caswell]

The branch master has been updated
       via  027c9909fca039095fe8c69ebe9bd3ce0bba59cd (commit)
      from  9d9fdc1727e3ff90d25dbccb4c530312b897536f (commit)


- Log -----------------------------------------------------------------
commit 027c9909fca039095fe8c69ebe9bd3ce0bba59cd
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 13 10:34:40 2018 +0000

    Don't sanity check the FIPS version during a release
    
    This is no longer included in the opensslv.h header file for 1.1.1, so
    we should not sanity check it.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10)

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

Summary of changes:
 release-tools/release-check.pl | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/release-tools/release-check.pl b/release-tools/release-check.pl
index 91ee7c0..cac5918 100644
--- a/release-tools/release-check.pl
+++ b/release-tools/release-check.pl
@@ -112,13 +112,6 @@ sub openssl_check_version_h {
             check_str( "opensslv.h: HEX version", $hexversion, $1, \$ok );
             $hex_done = 1;
         } elsif (
-/OPENSSL_VERSION_TEXT\s+\"OpenSSL (\S*fips\S*)\s+(\([[:alpha:]]+\)\s+)?(.*)\"/
-          )
-        {
-            check_str( "opensslv.h: FIPS version", $version_fips, $1, \$ok );
-            check_str( "opensslv.h: FIPS date",    $date,         $3, \$ok );
-            $fips_done = 1;
-        } elsif (
 /OPENSSL_VERSION_TEXT\s+\"OpenSSL (\S*)\s+(\([[:alpha:]]+\)\s+)?(.*)\"/
           )
         {
@@ -126,7 +119,7 @@ sub openssl_check_version_h {
             check_str( "opensslv.h: date",    $date,    $3, \$ok );
             $version_done = 1;
         }
-        if ( $hex_done && $fips_done && $version_done ) {
+        if ( $hex_done && $version_done ) {
             close IN;
             return $ok;
         }