[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  49cd47eaababc8c57871b929080fc1357e2ad7b8 (commit)
       via  cd15cb4d21fce81c94bc16f991c4bb1c73e71bfe (commit)
       via  ed504a20843fce750ac8d1b55d5bb142421ad3df (commit)
      from  41aede863b76202347c2d5e2c2666428084f9203 (commit)


- Log -----------------------------------------------------------------
commit 49cd47eaababc8c57871b929080fc1357e2ad7b8
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)

commit cd15cb4d21fce81c94bc16f991c4bb1c73e71bfe
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)

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

    Configure: fix small spelling error
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5533)

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

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

diff --git a/Configure b/Configure
index d78066b..6f70e18 100755
--- a/Configure
+++ b/Configure
@@ -3008,7 +3008,7 @@ sub compiler_predefined {
 
     return () if $^O eq 'VMS';
 
-    die 'compiler_predefines called without a default compiler'
+    die 'compiler_predefined called without a default compiler'
         unless $default_compiler;
 
     if (! $predefined{$default_compiler}) {
diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in
index 16aa82e..dc36a74 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 0f2e8f0..2ea54e3 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