GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — deps: update openssl to openssl1.1.1f by hassaanp · Pull Request #32583 · nodejs/node

Conversation

@hassaanp

@hassaanp hassaanp commented Mar 31, 2020

Copy link
Copy Markdown
Contributor
Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines
    Closes update openssl 1.1.1f (across all release lines) #32537

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

bricss reacted with thumbs up emoji bricss reacted with heart emoji bricss reacted with rocket emoji bricss reacted with eyes emoji
All reactions
  • 👍 1 reaction
  • ❤️ 1 reaction
  • 🚀 1 reaction
  • 👀 1 reaction
hassaanp added 2 commits March 31, 2020 18:04
@hassaanp
deps: upgrade openssl sources to 1.1.1f
9490db4
This updates all sources in deps/openssl/openssl by:
    $ cd deps/openssl/
    $ rm -rf openssl
    $ tar zxf ~/tmp/openssl-1.1.1f.tar.gz
    $ mv openssl-1.1.0h openssl
    $ git add --all openssl
    $ git commit openssl
@hassaanp
deps: update archs files for OpenSSL-1.1.1f
8abc886
 After an OpenSSL source update, all the config files need to be regenerated and
 comitted by:
    $ cd deps/openssl/config
    $ make
    $ git add deps/openssl/config/archs
    $ git add deps/openssl/openssl/include/crypto/bn_conf.h
    $ git add deps/openssl/openssl/include/crypto/dso_conf.h
    $ git add deps/openssl/openssl/include/openssl/opensslconf.h
    $ git commit
@nodejs-github-bot nodejs-github-bot added the openssl Issues and PRs related to the OpenSSL dependency. label Mar 31, 2020
@hassaanp hassaanp changed the title Deps/update openssl to openssl1.1.1f deps: update openssl to openssl1.1.1f Mar 31, 2020
@hassaanp hassaanp mentioned this pull request Mar 31, 2020
update openssl 1.1.1f (across all release lines) #32537
Closed
@nodejs-github-bot

nodejs-github-bot commented Mar 31, 2020

Copy link
Copy Markdown
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/30280/

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

sam-github
sam-github approved these changes Mar 31, 2020
View reviewed changes
@jasnell jasnell mentioned this pull request Mar 31, 2020
quic: part 1... quic-modified openssl #32377
Closed
2 tasks done
@sam-github

sam-github commented Mar 31, 2020

Copy link
Copy Markdown
Contributor

to: @nodejs/crypto cc: @nodejs/releasers

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

jasnell
jasnell approved these changes Mar 31, 2020
View reviewed changes
tniessen
tniessen approved these changes Apr 1, 2020
View reviewed changes

@tniessen tniessen left a comment

Copy link
Copy Markdown
Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RSLGTM. Not sure if anyone actually cross-checks this against OpenSSL releases?

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
@sam-github

sam-github commented Apr 1, 2020

Copy link
Copy Markdown
Contributor

Not sure if anyone actually cross-checks this against OpenSSL releases?

I did.

I'd like to fast-track this, it needs backporting to go out into next-week's releases, and as a routine update of a dep, I can't see what review is still necessary.

Can some folks thumbs-up the fast-tracking?

addaleax, tniessen, jasnell, and gireeshpunathil reacted with thumbs up emoji
All reactions
  • 👍 4 reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@sam-github sam-github added fast-track PRs proposed for a shorter-than-standard waiting period before landing. lts-watch-v10.x labels Apr 1, 2020
@sam-github sam-github mentioned this pull request Apr 1, 2020
[v10.x] Openssl 1.1.1f #32601
Closed
4 tasks
@sam-github sam-github added backport-open-v10.x and removed backport-requested-v10.x labels Apr 1, 2020
@sam-github

sam-github commented Apr 1, 2020

Copy link
Copy Markdown
Contributor

This cherry-picks clean onto 12.x, but needed a backport to 10.x: #32601

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@tniessen

tniessen commented Apr 1, 2020

Copy link
Copy Markdown
Member

@sam-github Fast-tracking approved by @addaleax and myself.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

sam-github pushed a commit that referenced this pull request Apr 1, 2020
@hassaanp @sam-github
deps: upgrade openssl sources to 1.1.1f
5318fe5
This updates all sources in deps/openssl/openssl by:
    $ cd deps/openssl/
    $ rm -rf openssl
    $ tar zxf ~/tmp/openssl-1.1.1f.tar.gz
    $ mv openssl-1.1.0h openssl
    $ git add --all openssl
    $ git commit openssl

PR-URL: #32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
sam-github pushed a commit that referenced this pull request Apr 1, 2020
@hassaanp @sam-github
deps: update archs files for OpenSSL-1.1.1f
881c932
 After an OpenSSL source update, all the config files need to be
 regenerated and comitted by:
    $ cd deps/openssl/config
    $ make
    $ git add deps/openssl/config/archs
    $ git add deps/openssl/openssl/include/crypto/bn_conf.h
    $ git add deps/openssl/openssl/include/crypto/dso_conf.h
    $ git add deps/openssl/openssl/include/openssl/opensslconf.h
    $ git commit

PR-URL: #32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
@sam-github

sam-github commented Apr 1, 2020

Copy link
Copy Markdown
Contributor

Landed in 9d82c55..881c932

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@sam-github sam-github closed this Apr 1, 2020
@sam-github
sam-github deleted the deps/update-openssl-to-openssl1.1.1f branch April 1, 2020 21:15
sam-github
sam-github reviewed Apr 1, 2020
View reviewed changes
Comment thread deps/openssl/config/archs/BSD-x86/asm/crypto/bf/bf-586.s
pushl %esi
pushl %edi
# Load the 2 words
# Load the 2 words

@sam-github sam-github Apr 1, 2020

Copy link
Copy Markdown
Contributor

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mscdex I figured out why we are seeing this in the PR. It's because OpenSSL has trailing whitespace in its source, its emitted by the config process, but git node land strips it during landing. So, we always see the whitespace during PR diff, but it never hits the master, so then we see it again during the next PR. I'm not sure if that's a problem. I could PR some whitespace fixes up to openssl so that perhaps 1.1.1g wouldn't do this.

? Do you want to try reset the local master branch to upstream/master? Yes                      
⠇ Bringing upstream/master up to date...From github.com:nodejs/node                             
 * branch                    master     -> FETCH_HEAD                                           
✔  upstream/master is now up-to-date                                                            
✔  Downloaded patch to /home/sam/w/core/node/.ncu/32583/patch                                   
--------------------------------------------------------------------------------                
Applying: deps: upgrade openssl sources to 1.1.1f                                               
.git/rebase-apply/patch:542: trailing whitespace.                                               
            if(host == NULL || is_dNS_name(host))                                               
.git/rebase-apply/patch:551: trailing whitespace.                                               
 * Host dNS Name verifier: used for checking that the hostname is in dNS format                 
.git/rebase-apply/patch:935: trailing whitespace.                                               
         *                                                                                      
.git/rebase-apply/patch:944: trailing whitespace.                                               
         *                                                                                                                                                                                     
.git/rebase-apply/patch:1518: trailing whitespace.                                                                                                                                             
the given value.                                                                                
warning: squelched 10 whitespace errors                                                         
warning: 13 lines applied after fixing whitespace errors.                                       
Applying: deps: update archs files for OpenSSL-1.1.1f                                           
.git/rebase-apply/patch:326: trailing whitespace.                                               
        # Load the 2 words                                                                     
.git/rebase-apply/patch:335: trailing whitespace.                                               
        # Round 0                                                                              
.git/rebase-apply/patch:344: trailing whitespace.                                              
        # Round 1                                                                               
.git/rebase-apply/patch:353: trailing whitespace.                                              
        # Round 2                                                                              
.git/rebase-apply/patch:362: trailing whitespace.                                               
        # Round 3                                                                              
warning: squelched 2579 whitespace errors                                                       
warning: 2564 lines applied after fixing whitespace errors.                                                                                                                                    
   ✔  Patches applied                                                                                                                                                                          
There are 2 commits in the PR                                                                                                                                                                  
Please run the following commands to complete landing 

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

lingsamuel reacted with thumbs up emoji
All reactions
  • 👍 1 reaction
sam-github pushed a commit to sam-github/node that referenced this pull request Apr 1, 2020
@hassaanp @sam-github
deps: upgrade openssl sources to 1.1.1f
81571f1
This updates all sources in deps/openssl/openssl by:
    $ cd deps/openssl/
    $ rm -rf openssl
    $ tar zxf ~/tmp/openssl-1.1.1f.tar.gz
    $ mv openssl-1.1.0h openssl
    $ git add --all openssl
    $ git commit openssl

PR-URL: nodejs#32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
sam-github pushed a commit to sam-github/node that referenced this pull request Apr 1, 2020
@hassaanp @sam-github
deps: update archs files for OpenSSL-1.1.1f
86b1058
 After an OpenSSL source update, all the config files need to be
 regenerated and comitted by:
    $ cd deps/openssl/config
    $ make
    $ git add deps/openssl/config/archs
    $ git add deps/openssl/openssl/include/crypto/bn_conf.h
    $ git add deps/openssl/openssl/include/crypto/dso_conf.h
    $ git add deps/openssl/openssl/include/openssl/opensslconf.h
    $ git commit

PR-URL: nodejs#32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
BethGriggs pushed a commit that referenced this pull request Apr 7, 2020
@hassaanp @BethGriggs
deps: upgrade openssl sources to 1.1.1f
b702fb2
This updates all sources in deps/openssl/openssl by:
    $ cd deps/openssl/
    $ rm -rf openssl
    $ tar zxf ~/tmp/openssl-1.1.1f.tar.gz
    $ mv openssl-1.1.0h openssl
    $ git add --all openssl
    $ git commit openssl

PR-URL: #32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
BethGriggs pushed a commit that referenced this pull request Apr 7, 2020
@hassaanp @BethGriggs
deps: update archs files for OpenSSL-1.1.1f
9acf435
 After an OpenSSL source update, all the config files need to be
 regenerated and comitted by:
    $ cd deps/openssl/config
    $ make
    $ git add deps/openssl/config/archs
    $ git add deps/openssl/openssl/include/crypto/bn_conf.h
    $ git add deps/openssl/openssl/include/crypto/dso_conf.h
    $ git add deps/openssl/openssl/include/openssl/opensslconf.h
    $ git commit

PR-URL: #32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
@sam-github sam-github mentioned this pull request Apr 9, 2020
A concern about v12.16.2 update openssl to 1.1.1e #32746
Closed
targos pushed a commit that referenced this pull request Apr 12, 2020
@hassaanp @targos
deps: upgrade openssl sources to 1.1.1f
3417cc5
This updates all sources in deps/openssl/openssl by:
    $ cd deps/openssl/
    $ rm -rf openssl
    $ tar zxf ~/tmp/openssl-1.1.1f.tar.gz
    $ mv openssl-1.1.0h openssl
    $ git add --all openssl
    $ git commit openssl

PR-URL: #32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
targos pushed a commit that referenced this pull request Apr 12, 2020
@hassaanp @targos
deps: update archs files for OpenSSL-1.1.1f
8586838
 After an OpenSSL source update, all the config files need to be
 regenerated and comitted by:
    $ cd deps/openssl/config
    $ make
    $ git add deps/openssl/config/archs
    $ git add deps/openssl/openssl/include/crypto/bn_conf.h
    $ git add deps/openssl/openssl/include/crypto/dso_conf.h
    $ git add deps/openssl/openssl/include/openssl/opensslconf.h
    $ git commit

PR-URL: #32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
@targos targos mentioned this pull request Apr 13, 2020
v13.13.0 release proposal #32813
Merged
sam-github pushed a commit to sam-github/node that referenced this pull request Apr 21, 2020
@hassaanp @sam-github
deps: upgrade openssl sources to 1.1.1f
8ab3e0c
This updates all sources in deps/openssl/openssl by:
    $ cd deps/openssl/
    $ rm -rf openssl
    $ tar zxf ~/tmp/openssl-1.1.1f.tar.gz
    $ mv openssl-1.1.0h openssl
    $ git add --all openssl
    $ git commit openssl

PR-URL: nodejs#32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
@targos

targos commented Apr 22, 2020

Copy link
Copy Markdown
Member

@sam-github now that #32983 is open, should we skip this PR in v12.x ?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@sam-github sam-github mentioned this pull request Apr 22, 2020
[v12.x] openssl1.1.1g #32983
Closed
4 tasks
@sam-github

sam-github commented Apr 22, 2020

Copy link
Copy Markdown
Contributor

I updated the description of #32983, that PR contains both

  • backport-of: deps: update openssl to openssl1.1.1f #32583
  • backport-of: deps: update openssl to openssl1.1.1g #32971

I don't know if you work by PR, or by commit. And maybe its not helpful that I opened #32983, if cherrypicking #32583 first, then #32971 on top of it works for you, then you don't need a backport, and can close #32983

I opened the "backport" PR so that I can do a CI, and to ensure it gets noticed. Maybe I should not?

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@targos

targos commented Apr 22, 2020

Copy link
Copy Markdown
Member

if #32971 lands cleanly on top of this, then yeah, we can close #32983.

I opened the "backport" PR so that I can do a CI, and to ensure it gets noticed. Maybe I should not?

No problem. It served it's goal (I noticed it, which made me ask about this one 😄)

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

targos pushed a commit that referenced this pull request Apr 22, 2020
@hassaanp @targos
deps: upgrade openssl sources to 1.1.1f
c9cc381
This updates all sources in deps/openssl/openssl by:
    $ cd deps/openssl/
    $ rm -rf openssl
    $ tar zxf ~/tmp/openssl-1.1.1f.tar.gz
    $ mv openssl-1.1.0h openssl
    $ git add --all openssl
    $ git commit openssl

PR-URL: #32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
targos pushed a commit that referenced this pull request Apr 22, 2020
@hassaanp @targos
deps: update archs files for OpenSSL-1.1.1f
80c89d4
 After an OpenSSL source update, all the config files need to be
 regenerated and comitted by:
    $ cd deps/openssl/config
    $ make
    $ git add deps/openssl/config/archs
    $ git add deps/openssl/openssl/include/crypto/bn_conf.h
    $ git add deps/openssl/openssl/include/crypto/dso_conf.h
    $ git add deps/openssl/openssl/include/openssl/opensslconf.h
    $ git commit

PR-URL: #32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
@targos targos mentioned this pull request Apr 22, 2020
v12.16.3 release proposal #33009
Merged
targos added a commit that referenced this pull request Apr 24, 2020
@targos
2020-04-28, Version 12.16.3 'Erbium' (LTS)
2591fb4
Notable changes:

Dependencies:
  * Updated OpenSSL to 1.1.1f.
    #32583
  * Updated c-ares to 1.16.0.
    #32246
  * Updated experimental uvwasi to 0.0.6.
    #32309
ESM (experimental):
  * Additional warnings are no longer printed for modules that use
    conditional exports or package name self resolution.
    #31845

PR-URL: #33009
targos added a commit that referenced this pull request Apr 27, 2020
@targos
2020-04-28, Version 12.16.3 'Erbium' (LTS)
ada6794
Notable changes:

Dependencies:
  * Updated OpenSSL to 1.1.1f.
    #32583
  * Updated c-ares to 1.16.0.
    #32246
  * Updated experimental uvwasi to 0.0.6.
    #32309
ESM (experimental):
  * Additional warnings are no longer printed for modules that use
    conditional exports or package name self resolution.
    #31845

PR-URL: #33009
richardlau pushed a commit to sam-github/node that referenced this pull request Jul 1, 2020
@hassaanp @richardlau
deps: upgrade openssl sources to 1.1.1f
663bbf3
This updates all sources in deps/openssl/openssl by:
    $ cd deps/openssl/
    $ rm -rf openssl
    $ tar zxf ~/tmp/openssl-1.1.1f.tar.gz
    $ mv openssl-1.1.0h openssl
    $ git add --all openssl
    $ git commit openssl

PR-URL: nodejs#32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
richardlau pushed a commit that referenced this pull request Jul 1, 2020
@hassaanp @richardlau
deps: upgrade openssl sources to 1.1.1f
ef9413b
This updates all sources in deps/openssl/openssl by:
    $ cd deps/openssl/
    $ rm -rf openssl
    $ tar zxf ~/tmp/openssl-1.1.1f.tar.gz
    $ mv openssl-1.1.0h openssl
    $ git add --all openssl
    $ git commit openssl

Backport-PR-URL: #32982
PR-URL: #32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
@richardlau richardlau added backported-to-v10.x and removed backport-open-v10.x labels Jul 1, 2020
@richardlau richardlau mentioned this pull request Jul 2, 2020
v10.22.0 proposal #34170
Merged
2 of 4 tasks
@MylesBorins MylesBorins removed the lts-watch-v12.x label Nov 16, 2020
abhishekumar-tyagi pushed a commit to abhishekumar-tyagi/node that referenced this pull request May 5, 2024
@hassaanp @sam-github
deps: upgrade openssl sources to 1.1.1f
7666aac
This updates all sources in deps/openssl/openssl by:
    $ cd deps/openssl/
    $ rm -rf openssl
    $ tar zxf ~/tmp/openssl-1.1.1f.tar.gz
    $ mv openssl-1.1.0h openssl
    $ git add --all openssl
    $ git commit openssl

PR-URL: nodejs/node#32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
abhishekumar-tyagi pushed a commit to abhishekumar-tyagi/node that referenced this pull request May 5, 2024
@hassaanp @sam-github
deps: update archs files for OpenSSL-1.1.1f
1f9cf11
 After an OpenSSL source update, all the config files need to be
 regenerated and comitted by:
    $ cd deps/openssl/config
    $ make
    $ git add deps/openssl/config/archs
    $ git add deps/openssl/openssl/include/crypto/bn_conf.h
    $ git add deps/openssl/openssl/include/crypto/dso_conf.h
    $ git add deps/openssl/openssl/include/openssl/opensslconf.h
    $ git commit

PR-URL: nodejs/node#32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jasnell jasnell jasnell approved these changes
@tniessen tniessen tniessen approved these changes
+1 more reviewer
@sam-github sam-github sam-github approved these changes
Reviewers whose approvals may not affect merge requirements

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

fast-track PRs proposed for a shorter-than-standard waiting period before landing. openssl Issues and PRs related to the OpenSSL dependency.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

update openssl 1.1.1f (across all release lines)

Uh oh!

There was an error while loading. Please reload this page.

8 participants

@hassaanp @nodejs-github-bot @sam-github @tniessen @targos @jasnell @MylesBorins @richardlau
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.