[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  2285c0f624b2f5fd16b590511dc35f427053f89f (commit)
      from  387e5ac856454e81d82a4b83388994fecbfc229e (commit)


- Log -----------------------------------------------------------------
commit 2285c0f624b2f5fd16b590511dc35f427053f89f
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)
    
    (cherry picked from commit 9a236d5a7158d38b933656cacc31dfd4ff4fcc08)

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

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 669589c..b7cf9b2 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -1288,7 +1288,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";