summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-04-23 18:59:10 +0200
committerRichard Levitte <levitte@openssl.org>2020-04-25 04:05:27 +0200
commit6a960a94ccba41420c11ebd3eb82208b4681ee05 (patch)
tree9749c6c3b816f76d4c1aaa9c5e636998694668d9 /Configure
parent8d6fc5f4d29522a9ca67c122496aef518497f191 (diff)
downloadopenssl-new-6a960a94ccba41420c11ebd3eb82208b4681ee05.tar.gz
Configure: Allow quoted values in VERSION
Fixes #11618 Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/11624)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure8
1 files changed, 7 insertions, 1 deletions
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" },