From 92583c4c815c50871b317fcb0c5cec7255f24f46 Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Tue, 9 May 2017 10:36:54 +0900 Subject: [PATCH] deps: cherry-pick 4ae5993 from upstream OpenSSL This fixes wrong hash results on Windows with some CPUs that support Intel SHA Extension and resolves the issue of TLS connection errors. After upgrading forthcoming openssl-1.0.2l, this is no nolonger needed. Original commit message: 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 (Merged from https://github.com/openssl/openssl/pull/3385) (cherry picked from commit c47aea8af1e28e46e1ad5e2e7468b49fec3f4f29) Refs: https://github.com/openssl/openssl/issues/3241 Refs: https://github.com/openssl/openssl/pull/3385 Fixes: https://github.com/nodejs/node/issues/12691 PR-URL: https://github.com/nodejs/node/pull/12913 Reviewed-By: James M Snell Reviewed-By: Sam Roberts Reviewed-By: Anna Henningsen --- deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl b/deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl index 625f95cd3c..d19195ea06 100755 --- a/deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl +++ b/deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl @@ -206,8 +206,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; } } }