Skip to content

fix wrong hash results on Windows with some CPUs that support Intel SHA Extension #12913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shigeki wants to merge 2 commits into from
Closed

fix wrong hash results on Windows with some CPUs that support Intel SHA Extension #12913

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ff8672
deps: cherry-pick 4ae5993 from upstream OpenSSL
shigeki May 9, 2017
9dfd409
deps: update openssl asm and asm_obsolete files
shigeki May 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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 openssl/openssl#3385)

    (cherry picked from commit c47aea8af1e28e46e1ad5e2e7468b49fec3f4f29)

Refs: openssl/openssl#3241
Refs: openssl/openssl#3385
Fixes: #12691
  • Loading branch information
@shigeki
shigeki committed May 9, 2017
commit 5ff867225f83bfe6bbbe297c4f5a439e25729d97
5 changes: 3 additions & 2 deletions deps/openssl/openssl/crypto/perlasm/x86_64-xlate.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
Expand Down