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

diff --git a/release-tools/release-check.pl b/release-tools/release-check.pl
index 42fbbfc5647eddd065b0587bed4e860b6ff7ea3c..2eac1e337a38770051e3b1ce6606b8d5c87a5be7 100644 (file)
--- a/release-tools/release-check.pl
+++ b/release-tools/release-check.pl
@@ -111,8 +111,12 @@ sub openssl_check_version_h {
         if (/OPENSSL_VERSION_NUMBER\s+(0x[0-9a-f]+)L/) {
             check_str( "opensslv.h: HEX version", $hexversion, $1, \$ok );
             $hex_done = 1;
-        } elsif (
-/OPENSSL_VERSION_TEXT\s+\"OpenSSL ([^-\s]+(?:-[^-\s]*)?)\s+(\([[:alpha:]]+\)\s+)?(.*)\"/
+        } elsif (/OPENSSL_VERSION_TEXT\s+\"OpenSSL\s
+                 ([^-\s]+(?!-fips)(?:-[^-\s]*)?)       # version without -fips
+                 \s+
+                 (\([[:alpha:]]+\)\s+)?                # Possible lable
+                 (.*)\"                                # The rest (date)
+                /x
           )
         {
             check_str( "opensslv.h: version", $version, $1, \$ok );