[openssl-commits] [tools] master update

[Richard Levitte]

The branch master has been updated
       via  9b9a6e181f1e52b5b9eaef975c31885324db4ece (commit)
      from  ab0c22d2655c626cbc93835d9f3042be28efa64c (commit)


- Log -----------------------------------------------------------------
commit 9b9a6e181f1e52b5b9eaef975c31885324db4ece
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 27 15:18:00 2018 +0200

    release-tools: More precise extraction of version number, avoiding fips version

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

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

diff --git a/release-tools/release-check.pl b/release-tools/release-check.pl
index cac5918..42fbbfc 100644
--- a/release-tools/release-check.pl
+++ b/release-tools/release-check.pl
@@ -112,7 +112,7 @@ sub openssl_check_version_h {
             check_str( "opensslv.h: HEX version", $hexversion, $1, \$ok );
             $hex_done = 1;
         } elsif (
-/OPENSSL_VERSION_TEXT\s+\"OpenSSL (\S*)\s+(\([[:alpha:]]+\)\s+)?(.*)\"/
+/OPENSSL_VERSION_TEXT\s+\"OpenSSL ([^-\s]+(?:-[^-\s]*)?)\s+(\([[:alpha:]]+\)\s+)?(.*)\"/
           )
         {
             check_str( "opensslv.h: version", $version, $1, \$ok );