[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  9a236d5a7158d38b933656cacc31dfd4ff4fcc08 (commit)
      from  e13d8f7ba4681f904cba71558168965697b76a17 (commit)


- Log -----------------------------------------------------------------
commit 9a236d5a7158d38b933656cacc31dfd4ff4fcc08
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jun 11 10:33:09 2018 +0200

    VMS: have mkdef.pl parse lettered versions properly
    
    Fixes #6449
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6450)

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

Summary of changes:
 util/mkdef.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/mkdef.pl b/util/mkdef.pl
index eb303e6..823cb66 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -1336,7 +1336,7 @@ EOF
 	} elsif ($VMS) {
             print OUT ")\n";
             (my $libvmaj, my $libvmin, my $libvedit) =
-                $currversion =~ /^(\d+)_(\d+)_(\d+)$/;
+                $currversion =~ /^(\d+)_(\d+)_(\d+)[a-z]{0,2}$/;
             # The reason to multiply the edit number with 100 is to make space
             # for the possibility that we want to encode the patch letters
             print OUT "GSMATCH=LEQUAL,",($libvmaj * 100 + $libvmin),",",($libvedit * 100),"\n";