[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6a6462f0f1fd83211d7de17691d1063e23cf10fb (commit)
      from  2acd8ec7a953fe0c14fa2338b375955691372e89 (commit)


- Log -----------------------------------------------------------------
commit 6a6462f0f1fd83211d7de17691d1063e23cf10fb
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 8 02:31:51 2016 +0100

    Fix engine/asm/e_padlock-x86.pl for newer semantics
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

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

Summary of changes:
 engines/asm/e_padlock-x86.pl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/engines/asm/e_padlock-x86.pl b/engines/asm/e_padlock-x86.pl
index 4148468..1a22dc8 100644
--- a/engines/asm/e_padlock-x86.pl
+++ b/engines/asm/e_padlock-x86.pl
@@ -35,6 +35,9 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
 push(@INC,"${dir}","${dir}../../crypto/perlasm");
 require "x86asm.pl";
 
+$output=pop;
+open STDOUT,">$output";
+
 &asm_init($ARGV[0],$0);
 
 %PADLOCK_PREFETCH=(ecb=>128, cbc=>64);	# prefetch errata
@@ -604,3 +607,5 @@ my ($mode,$opcode) = @_;
 &data_word(0);
 
 &asm_finish();
+
+close STDOUT;