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.

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

[v10.x] update openssl to 1.1.1c #28212

Closed
wants to merge 3 commits into from
Closed

[v10.x] update openssl to 1.1.1c #28212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae2a109
deps: updated openssl upgrade instructions
sam-github Jun 12, 2019
7ad546a
deps: upgrade openssl sources to 1.1.1c
sam-github Jun 12, 2019
5cda00e
deps: update archs files for OpenSSL-1.1.1c
sam-github Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
40 changes: 3 additions & 37 deletions deps/openssl/config/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,49 +50,15 @@ This updates all sources in deps/openssl/openssl by:
$ git commit openssl
```

### 2. Apply a floating patch

Currently, one floating patch is needed to build S390 asm files:
```
Author: Shigeki Ohtsu <ohtsu@ohtsu.org>
Date: Wed Mar 7 23:52:52 2018 +0900

deps: add s390 asm rules for OpenSSL-1.1.0

This is a floating patch against OpenSSL-1.1.0 to generate asm files
with Makefile rules and it is to be submitted to the upstream.

Fixes: https://github.com/nodejs/node/issues/4270
PR-URL: https://github.com/nodejs/node/pull/19794
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>

deps/openssl/openssl/crypto/poly1305/build.info | 2 ++
```

Find the SHA of the previous commit of this patch:
```sh
$ git log -n1 --oneline -- deps/openssl/openssl/crypto/poly1305/build.info
```

Using the SHA found in the previous step, cherry pick it from the previous
commit (with the openssl version in the commit message set to the relevant
value):
```sh
$ git cherry-pick 45b9f5df6ff1548f01ed646ebee75e3f0873cefd
```


### 3. Execute `make` in `deps/openssl/config` directory
### 2. Execute `make` in `deps/openssl/config` directory

Use `make` to regenerate all platform dependent files in
`deps/openssl/config/archs/`:
```sh
$ cd deps/openssl/config; make
```

### 4. Check diffs
### 3. Check diffs

Check diffs if updates are right. Even if no updates in openssl
sources, `buildinf.h` files will be updated for they have a timestamp
Expand All @@ -109,7 +75,7 @@ created. When source files or build options are updated in Windows,
it needs to change these two Makefiles by hand. If you are not sure,
please ask @shigeki for details.

### 5. Commit and make test
### 4. Commit and make test

Update all architecture dependent files. Do not forget to git add or remove
files if they are changed before commit:
Expand Down
Loading