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

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  77ba00bc3b7a1348f310ea7ce44890eb2c11899f (commit)
       via  a6356981791c37411096444e44d98bc561350300 (commit)
      from  4044ebfe2481c240cb37cfcb0e6176fe79394db4 (commit)


- Log -----------------------------------------------------------------
commit 77ba00bc3b7a1348f310ea7ce44890eb2c11899f
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 6 21:05:16 2018 +0100

    util/dofile.pl: only quote stuff that actually needs quoting
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5533)
    
    (cherry picked from commit 49cd47eaababc8c57871b929080fc1357e2ad7b8)

commit a6356981791c37411096444e44d98bc561350300
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 6 21:04:11 2018 +0100

    opensslconf.h.in: Use all the "openssl_api_defines"
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5533)
    
    (cherry picked from commit cd15cb4d21fce81c94bc16f991c4bb1c73e71bfe)

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

Summary of changes:
 include/openssl/opensslconf.h.in | 2 +-
 util/dofile.pl                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in
index bec5bd0..e35fdfe 100644
--- a/include/openssl/opensslconf.h.in
+++ b/include/openssl/opensslconf.h.in
@@ -30,7 +30,7 @@ extern "C" {
     }
     foreach (@{$config{openssl_api_defines}}) {
         (my $macro, my $value) = $_ =~ /^(.*?)=(.*?)$/;
-        $OUT .= "#define OPENSSL_MIN_API $value\n";
+        $OUT .= "#define $macro $value\n";
     }
     if (@{$config{openssl_algorithm_defines}}) {
       foreach (@{$config{openssl_algorithm_defines}}) {
diff --git a/util/dofile.pl b/util/dofile.pl
index f561e6f..a8dbfa5 100644
--- a/util/dofile.pl
+++ b/util/dofile.pl
@@ -99,9 +99,9 @@ package main;
 # This adds quotes (") around the given string, and escapes any $, @, \,
 # " and ' by prepending a \ to them.
 sub quotify1 {
-    my $s = shift @_;
+    my $s = my $orig = shift @_;
     $s =~ s/([\$\@\\"'])/\\$1/g;
-    '"'.$s.'"';
+    $s ne $orig || $s =~ /\s/ ? '"'.$s.'"' : $s;
 }
 
 # quotify_l LIST