The branch master has been updated
via d54658dd5fd7d7de0f967055b8933f1a5eb2c88e (commit)
from 9b9a6e181f1e52b5b9eaef975c31885324db4ece (commit)
- Log -----------------------------------------------------------------
commit d54658dd5fd7d7de0f967055b8933f1a5eb2c88e
Author: Richard Levitte <levi...@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 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/release-tools/release-check.pl b/release-tools/release-check.pl
index 42fbbfc..2eac1e3 100644
--- 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 );
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
