Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nodejs/node-v0.x-archive
base: 7e9d2f8de819
Choose a base ref
...
head repository: nodejs/node-v0.x-archive
compare: e80bcf579732
Choose a head ref
  • 10 commits
  • 1,176 files changed
  • 4 contributors

Commits on Mar 24, 2015

  1. deps: upgrade to openssl-1.0.1m 

    Extract the tarball into deps/openssl/openssl

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

Conflicts:
	deps/openssl/openssl/apps/s_client.c
    @jasnell
    jasnell authored and Julien Gilli committed Mar 24, 2015
    Copy the full SHA
    3b511a8 View commit details
    Browse the repository at this point in the history

  2. deps: 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

PR: #9451
PR-URL: #9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    Shigeki Ohtsu authored and Julien Gilli committed Mar 24, 2015
    Copy the full SHA
    1aa5103 View commit details
    Browse the repository at this point in the history

  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.

PR: #9451
PR-URL: #9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    Shigeki Ohtsu authored and Julien Gilli committed Mar 24, 2015
    Copy the full SHA
    8874445 View commit details
    Browse the repository at this point in the history

  4. deps: fix openssl assembly error on ia32 win32 

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

PR: #9451
PR-URL: #9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    @indutny
    indutny authored and Julien Gilli committed Mar 24, 2015
    Copy the full SHA
    9fb6cf1 View commit details
    Browse the repository at this point in the history

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

    It is no longer used.

PR: #9451
PR-URL: #9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    Shigeki Ohtsu authored and Julien Gilli committed Mar 24, 2015
    Copy the full SHA
    8d10b8d View commit details
    Browse the repository at this point in the history

  6. deps: remove unused backup file in openssl asm 

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

PR: #9451
PR-URL: #9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    Shigeki Ohtsu authored and Julien Gilli committed Mar 24, 2015
    Copy the full SHA
    b5a37e5 View commit details
    Browse the repository at this point in the history

  7. openssl: fix keypress requirement in apps on win32 

    reapply b910613

PR: #9451
PR-URL: #9451
Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    Shigeki Ohtsu authored and Julien Gilli committed Mar 24, 2015
    Copy the full SHA
    a43219b View commit details
    Browse the repository at this point in the history

  8. 2015.03.23, Version 0.12.1 (Stable) 

    * openssl: upgrade to 1.0.1m (Addressing multiple CVES)
    Julien Gilli committed Mar 24, 2015
    Copy the full SHA
    0034086 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'v0.12.1-release' into v0.12 

    Conflicts:
	ChangeLog
    Julien Gilli committed Mar 24, 2015
    Copy the full SHA
    59d3f68 View commit details
    Browse the repository at this point in the history

  10. Now working on 0.12.2

    Julien Gilli committed Mar 24, 2015
    Copy the full SHA
    e80bcf5 View commit details
    Browse the repository at this point in the history