diff options
| author | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2017-05-09 10:36:54 +0900 |
|---|---|---|
| committer | Anna Henningsen <anna@addaleax.net> | 2017-05-15 14:07:33 +0200 |
| commit | f4390650e3675964eda9b37f809fdbdcf24c946d (patch) | |
| tree | b351d03ef6f5cf8a89fed880d794d04062fcdd0b /deps/openssl/openssl | |
| parent | 88d2e699d8287218cc6cd4cc80e13e1055e07fce (diff) | |
| download | android-node-v8-f4390650e3675964eda9b37f809fdbdcf24c946d.tar.gz android-node-v8-f4390650e3675964eda9b37f809fdbdcf24c946d.tar.bz2 android-node-v8-f4390650e3675964eda9b37f809fdbdcf24c946d.zip | |
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 <rsalz@openssl.org>
(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 <jasnell@gmail.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'deps/openssl/openssl')
| -rwxr-xr-x | deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl | 5 |
1 files 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 b7ae40b4db..79cd2d4f65 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; } } } |