[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4c861b381667b8e496483bf89f72674ad7e5fc25 (commit)
       via  b700bc59669939a9285255293e1bb70a5a35f736 (commit)
      from  d070b4ae78a1280c5cb6b88df75bcbfbcef6a8f1 (commit)


- Log -----------------------------------------------------------------
commit 4c861b381667b8e496483bf89f72674ad7e5fc25
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 27 21:02:31 2018 +0100

    crypto/ec/asm/x25519-x86_64.pl: close STDOUT, not $STDOUT
    
    Fixes #5471
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5472)

commit b700bc59669939a9285255293e1bb70a5a35f736
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Feb 27 21:01:59 2018 +0100

    configdata.pm: ensure $prefix is defined
    
    Fixes #5471
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5472)

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

Summary of changes:
 Configure                      | 1 +
 crypto/ec/asm/x25519-x86_64.pl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 3c40a0e..d78066b 100755
--- a/Configure
+++ b/Configure
@@ -2444,6 +2444,7 @@ _____
             my $prefix = '';
             $prefix = $config{cross_compile_prefix}
                 if grep { $var eq $_ } @user_crossable;
+            $prefix //= '';
             print '    ',$var,' ' x (16 - length $var),'= ',
                 (ref $config{$makevars{$var}} eq 'ARRAY'
                  ? join(' ', @{$config{$makevars{$var}}})
diff --git a/crypto/ec/asm/x25519-x86_64.pl b/crypto/ec/asm/x25519-x86_64.pl
index 68a7771..9a56939 100755
--- a/crypto/ec/asm/x25519-x86_64.pl
+++ b/crypto/ec/asm/x25519-x86_64.pl
@@ -815,4 +815,4 @@ ___
 
 $code =~ s/\`([^\`]*)\`/eval $1/gem;
 print $code;
-close $STDOUT;
+close STDOUT;