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

Jump to bottom

Openssl 1.1.0j #24523

Closed
wants to merge 4 commits into from
Closed

Openssl 1.1.0j #24523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f317ca7
deps: upgrade openssl sources to 1.1.0j
sam-github Nov 20, 2018
edca71d
deps: add s390 asm rules for OpenSSL-1.1.0
shigeki Mar 7, 2018
c334001
deps: update archs files for OpenSSL-1.1.0
sam-github Nov 20, 2018
db3d8a9
Update openssl 1.1.0 upgrade docs
sam-github Nov 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 11 additions & 15 deletions deps/openssl/config/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Currently, one floating patch is needed to build S390 asm files.

Cherry pick it from the previous commit.
```sh
$ git cherry-pick 094465362758ebf967b33c84d5c96230b46a34b3
$ git cherry-pick 45b9f5df6ff1548f01ed646ebee75e3f0873cefd
```
### 3. Execute `make` in `deps/openssl/config` directory

Expand All @@ -70,16 +70,6 @@ Just type `make` then it generates all platform dependent files into
$ cd deps/openssl/config; make
```

The commit message can be
```
commit 8cb1de45c60f2d520551166610115531db673518
Author: Shigeki Ohtsu <ohtsu@ohtsu.org>
Date: Thu Mar 29 16:46:11 2018 +0900

deps: update archs files for OpenSSL-1.1.0

`cd deps/openssl/config; make` updates all archs dependant files.
```
### 4. Check diffs

Check diffs if updates are right. Even if no updates in openssl
Expand All @@ -96,14 +86,18 @@ used for `nmake` command. The `make` command in the step 2 above uses
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

Update all architecture dependent files. Do not forget to git add or remove
files if they are changed before commit.
files if they are changed before commit:
```sh
$ cd deps/openssl/openssl/config
$ git add archs
$ git commit archs
$ git add deps/openssl/config/archs
$ git add deps/openssl/openssl/crypto/include/internal/bn_conf.h
$ git add deps/openssl/openssl/crypto/include/internal/dso_conf.h
$ git add deps/openssl/openssl/include/openssl/opensslconf.h
$ git add deps/openssl/openssl/.gitignore
$ git commit
```

The commit message can be
Expand All @@ -113,6 +107,8 @@ The commit message can be
Date: Thu Mar 29 16:46:11 2018 +0900

deps: update archs files for OpenSSL-1.1.0

`cd deps/openssl/config; make` updates all archs dependant files.
```

Finally, build Node and run tests.