[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6a960a94ccba41420c11ebd3eb82208b4681ee05 (commit)
      from  8d6fc5f4d29522a9ca67c122496aef518497f191 (commit)


- Log -----------------------------------------------------------------
commit 6a960a94ccba41420c11ebd3eb82208b4681ee05
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Apr 23 18:59:10 2020 +0200

    Configure: Allow quoted values in VERSION
    
    Fixes #11618
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/11624)

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

Summary of changes:
 Configure | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 385dfce191..48ebe4eb83 100755
--- a/Configure
+++ b/Configure
@@ -286,7 +286,13 @@ collect_information(
     qr/\s*(\w+)\s*=\s*(.*?)\s*$/ =>
         sub {
             # Only define it if there is a value at all
-            $version{uc $1} = $2 if $2 ne '';
+            if ($2 ne '') {
+                my $k = $1;
+                my $v = $2;
+                # Some values are quoted.  Trim the quotes
+                $v = $1 if $v =~ /^"(.*)"$/;
+                $version{uc $k} = $v;
+            }
         },
     "OTHERWISE" =>
         sub { die "Something wrong with this line:\n$_\nin $srcdir/VERSION" },