[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  278de77b881739267d86f96088557af3da966982 (commit)
      from  d3a27c5ee45a29edd9c0d60ad5929f67996f89fd (commit)


- Log -----------------------------------------------------------------
commit 278de77b881739267d86f96088557af3da966982
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Dec 1 08:20:09 2019 +0100

    configdata.pm.in: Don't try to quotify undefined values
    
    Fixes #10503
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/10548)

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

Summary of changes:
 configdata.pm.in | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configdata.pm.in b/configdata.pm.in
index 312122686f..71627b48ef 100644
--- a/configdata.pm.in
+++ b/configdata.pm.in
@@ -245,7 +245,13 @@ _____
         foreach (sort keys %target) {
             next if $_ =~ m|^_| || $_ eq 'template';
             my $quotify = sub {
-                map { (my $x = $_) =~ s|([\\\$\@"])|\\$1|g; "\"$x\""} @_;
+                map {
+                    if (defined $_) {
+                        (my $x = $_) =~ s|([\\\$\@"])|\\$1|g; "\"$x\""
+                    } else {
+                        "undef";
+                    }
+                } @_;
             };
             print '    ', $_, ' => ';
             if (ref($target{$_}) eq "ARRAY") {