Browse files

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/ 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 openssl/openssl#3385)

    (cherry picked from commit c47aea8af1e28e46e1ad5e2e7468b49fec3f4f29)

Refs: openssl/openssl#3241
Refs: openssl/openssl#3385
Fixes: #12691
PR-URL: #12913
Reviewed-By: James M Snell <>
Reviewed-By: Sam Roberts <>
Reviewed-By: Anna Henningsen <>
  • Loading branch information...
shigeki authored and addaleax committed May 9, 2017
1 parent 88d2e69 commit f4390650e3675964eda9b37f809fdbdcf24c946d
Showing with 3 additions and 2 deletions.
  1. +3 −2 deps/openssl/openssl/crypto/perlasm/
@@ -206,8 +206,9 @@
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;

0 comments on commit f439065

Please sign in to comment.