deps: update to openssl-1.0.1m by jasnell · Pull Request #9451 · nodejs/node-v0.x-archive

jasnell · 2015-03-21T01:26:00Z

The commits are split out the same way as in @shigeki's io.js commit (nodejs/node#1206). The end result is identical to the previous PR.

Extract the 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 .

It is no longer used.

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

reapply b910613

misterdjules · 2015-03-23T02:01:49Z

@jasnell @indutny Out of curiosity, what problem does jasnell/node@7817fbd solve? I don't see any assembly file changed in this PR, and unless I'm missing something the perl script is not run when OpenSSL is built in node's tree. Also, building node with vcbuild ia32 nosign on Windows does not give me any build error.

misterdjules · 2015-03-23T02:55:41Z

@jasnell Ran test/external/ssl-options and all tests pass. Except for my question in the previous comment, LGTM.

Thank you all @jasnell, @shigeki and @indutny.

indutny · 2015-03-23T03:05:48Z

@misterdjules auto-generated assembly contains this on a newer OpenSSL. Basically, it'll fail to build with .486.

misterdjules · 2015-03-23T16:23:55Z

@indutny By "newer OpenSSL", do you mean other versions than 1.0.1m? Also, like I said in my previous comment node builds without any problem for me on Windows for ia32 with .486, hence my questions.

misterdjules · 2015-03-23T18:19:26Z

@indutny Ok, just realized that it's another old floating patch, and that it'll have an impact if any asm file needs to be (re)generated on Windows, which has not been the case for this upgrade. Sorry for the confusion.

misterdjules · 2015-03-23T18:19:49Z

LGTM.

Extract the tarball into deps/openssl/openssl PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

change all openssl/include/openssl/*.h to include resolved symbolic links and openssl/crypto/opensslconf.h to refer config/opensslconf.h PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

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. PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and perhaps others) are requiring .686 . PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

It is no longer used. PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm.orig was accidentally committed before. PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

reapply b910613 PR: nodejs#9451 PR-URL: nodejs#9451 Reviewed-By: Julien Gilli <julien.gilli@joyent.com>

misterdjules · 2015-03-23T18:35:24Z

@joyent/node-coreteam Landing and doing a release asap.

misterdjules · 2015-03-23T19:16:16Z

No regression on UNIX nor on Windows.

misterdjules · 2015-03-23T19:18:05Z

Landed in c6e8a2c, 10717f6, 2b21c45, 63377ec, 15cdeb7, 1fc3fdf and 4b69c72.