[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  c47aea8af1e28e46e1ad5e2e7468b49fec3f4f29 (commit)
      from  c0b4ff16755c5ced1bde62dd34f9df0ab8967f12 (commit)


- Log -----------------------------------------------------------------
commit c47aea8af1e28e46e1ad5e2e7468b49fec3f4f29
Author: Andy Polyakov <appro at openssl.org>
Date:   Thu May 4 15:54:29 2017 +0200

    perlasm/x86_64-xlate.pl: work around problem with hex constants in masm.
    
    Perl, multiple versions, for some reason occasionally takes issue with
    letter b[?] in ox([0-9a-f]+) regex. As result some constants, such as
    0xb1 came out wrong when generating code for MASM. Fixes GH#3241.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3385)

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

Summary of changes:
 crypto/perlasm/x86_64-xlate.pl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl
index b612c21..645be91 100755
--- a/crypto/perlasm/x86_64-xlate.pl
+++ b/crypto/perlasm/x86_64-xlate.pl
@@ -212,8 +212,9 @@ my %globals;
 	    }
 	    sprintf "\$%s",$self->{value};
 	} else {
-	    $self->{value} =~ s/0x([0-9a-f]+)/0$1h/ig if ($masm);
-	    sprintf "%s",$self->{value};
+	    my $value = $self->{value};
+	    $value =~ s/0x([0-9a-f]+)/0$1h/ig if ($masm);
+	    sprintf "%s",$value;
 	}
     }
 }