Skip to content
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.

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

Upgrade to openssl101m #1206

Closed
wants to merge 7 commits into from
Closed

Conversation

shigeki
Copy link
Contributor

@shigeki shigeki commented Mar 19, 2015

Here is the PR to update openssl-1.0.1m based on the commits on #1186.

I've made 2 new commits below from #1186
d80e3b6 deps: upgrade to openssl-1.0.1m( just extract tarball)
a3be06e deps: replace all headers in openssl

The following 5 commits are cherry-picked from the branch that has already been reviewed in #1186
edc96eb deps: separate sha256/sha512-x86_64.pl for openssl
ac89f8a deps: fix openssl assembly error on ia32 win32
9985ff6 deps: remove vpaesni-x86_64.asm in x64-win32-masm
a263eb1 deps: remove unused backup file in openssl asm
a3e0da2 openssl: fix keypress requirement in apps on win32

There is no updates of deps/openssl/openssl/crypto/sha/asm/sha512-x86_64.pl since #1186 and generating asm files has no diff.

CI of https://jenkins-iojs.nodesource.com/job/iojs+any-pr+multi/345/ is fine with known failures on Win, armv6 and armv8.

Please review this.

Shigeki Ohtsu and others added 7 commits March 19, 2015 23:04
All sources are just extracted from tarball into deps/openssl/openssl.
change all openssl/include/openssl/*.h to include resolved symbolic
links and openssl/crypto/opensslconf.h to refer config/opensslconf.h
sha256-x86_64.pl does not exist in the origin openssl distribution. It
was copied from sha512-x86_64.pl and both sha256/sha512 scripts were
modified so as to generates only one asm file specified as its key
hash length.
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and
perhaps others) are requiring .686 .
deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm.orig was accidentally
committed before.
@Fishrock123
Copy link
Contributor

cc @iojs/crypto @chrisdickinson

@shigeki
Copy link
Contributor Author

shigeki commented Mar 19, 2015

There is no vulnerabilities of high severity on 1.0.1m except FREAK that was already fixed. So it need not to be so much in hurry to be released.

@shigeki shigeki added tls Issues and PRs related to the tls subsystem. crypto Issues and PRs related to the crypto subsystem. labels Mar 19, 2015
@chrisdickinson
Copy link
Contributor

OK, going to merge this and start the release.

shigeki pushed a commit that referenced this pull request Mar 19, 2015
All sources are just extracted from tarball into deps/openssl/openssl.

change all openssl/include/openssl/*.h to include resolved symbolic
links and openssl/crypto/opensslconf.h to refer config/opensslconf.h

sha256-x86_64.pl does not exist in the origin openssl distribution. It
was copied from sha512-x86_64.pl and both sha256/sha512 scripts were
modified so as to generates only one asm file specified as its key
hash length.

`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid`
(and perhaps others) are requiring .686.

removed vpaesni-x86_64.asm in x64-win32-masm - it is no longer used.

Fixes: #1186
PR-URL: #1206
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
@chrisdickinson
Copy link
Contributor

Merged in a84ea66. Thanks!

@yosuke-furukawa
Copy link
Member

Great work.

jasnell added a commit to jasnell/node-joyent that referenced this pull request Mar 20, 2015
There are several updates pulled from:
  nodejs/node#1206

1. Expand the distribution tarball into deps/openssl/openssl

2. replace all headers in openssl

change all openssl/include/openssl/*.h to include resolved symbolic
links and openssl/crypto/opensslconf.h to refer config/opensslconf.h

3. deps: separate sha256/sha512-x86_64.pl for openssl

sha256-x86_64.pl does not exist in the origin openssl distribution. It
was copied from sha512-x86_64.pl and both sha256/sha512 scripts were
modified so as to generates only one asm file specified as its key
hash length.

4. fix openssl assembly error on ia32 win32

`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and
perhaps others) are requiring .686 .

5. remove vpaesni-x86_64.asm in x64-win32-masm

It is no longer used.

6. remove unused backup file in openssl asm

deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm.orig was accidentally
committed before.

7. fix keypress requirement in apps on win32

reapply b910613
jasnell added a commit to jasnell/node-joyent that referenced this pull request Mar 20, 2015
There are several updates pulled from:
  nodejs/node#1206

1. Expand the distribution tarball into deps/openssl/openssl

2. replace all headers in openssl

change all openssl/include/openssl/*.h to include resolved symbolic
links and openssl/crypto/opensslconf.h to refer config/opensslconf.h

3. deps: separate sha256/sha512-x86_64.pl for openssl

sha256-x86_64.pl does not exist in the origin openssl distribution. It
was copied from sha512-x86_64.pl and both sha256/sha512 scripts were
modified so as to generates only one asm file specified as its key
hash length.

4. fix openssl assembly error on ia32 win32

`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and
perhaps others) are requiring .686 .

5. remove vpaesni-x86_64.asm in x64-win32-masm

It is no longer used.

6. remove unused backup file in openssl asm

deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm.orig was accidentally
committed before.

7. fix keypress requirement in apps on win32

reapply b910613
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
crypto Issues and PRs related to the crypto subsystem. tls Issues and PRs related to the tls subsystem.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants