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

deps: update openssl to openssl1.1.1f #32583

Closed
wants to merge 2 commits into from
Closed

deps: update openssl to openssl1.1.1f #32583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9490db4
deps: upgrade openssl sources to 1.1.1f
hassaanp Mar 31, 2020
8abc886
deps: update archs files for OpenSSL-1.1.1f
hassaanp Mar 31, 2020
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
  •  
  •  
  •  
7 changes: 4 additions & 3 deletions deps/openssl/config/archs/BSD-x86/asm/configdata.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ our %config = (
options => "enable-ssl-trace no-afalgeng no-asan no-buildtest-c++ no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
perl_archname => "x86_64-linux-gnu-thread-multi",
perl_cmd => "/usr/bin/perl",
perl_version => "5.28.1",
perl_version => "5.26.1",
perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "BSD-x86" ],
perlenv => {
"AR" => undef,
Expand Down Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1e",
version_num => "0x1010105fL",
version => "1.1.1f",
version_num => "0x1010106fL",
);

our %target = (
Expand Down Expand Up @@ -15447,3 +15447,4 @@ Verbose output.
=back

=cut

78 changes: 39 additions & 39 deletions deps/openssl/config/archs/BSD-x86/asm/crypto/bf/bf-586.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ L_BF_encrypt_begin:
movl 16(%esp),%ebp
pushl %esi
pushl %edi
# Load the 2 words
# Load the 2 words
Copy link
Contributor

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

movl (%ebx),%edi
movl 4(%ebx),%esi
xorl %eax,%eax
movl (%ebp),%ebx
xorl %ecx,%ecx
xorl %ebx,%edi

# Round 0
# Round 0
movl 4(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -39,7 +39,7 @@ L_BF_encrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 1
# Round 1
movl 8(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -59,7 +59,7 @@ L_BF_encrypt_begin:
xorl %eax,%eax
xorl %ebx,%edi

# Round 2
# Round 2
movl 12(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -79,7 +79,7 @@ L_BF_encrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 3
# Round 3
movl 16(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -99,7 +99,7 @@ L_BF_encrypt_begin:
xorl %eax,%eax
xorl %ebx,%edi

# Round 4
# Round 4
movl 20(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -119,7 +119,7 @@ L_BF_encrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 5
# Round 5
movl 24(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -139,7 +139,7 @@ L_BF_encrypt_begin:
xorl %eax,%eax
xorl %ebx,%edi

# Round 6
# Round 6
movl 28(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -159,7 +159,7 @@ L_BF_encrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 7
# Round 7
movl 32(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -179,7 +179,7 @@ L_BF_encrypt_begin:
xorl %eax,%eax
xorl %ebx,%edi

# Round 8
# Round 8
movl 36(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -199,7 +199,7 @@ L_BF_encrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 9
# Round 9
movl 40(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -219,7 +219,7 @@ L_BF_encrypt_begin:
xorl %eax,%eax
xorl %ebx,%edi

# Round 10
# Round 10
movl 44(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -239,7 +239,7 @@ L_BF_encrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 11
# Round 11
movl 48(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -259,7 +259,7 @@ L_BF_encrypt_begin:
xorl %eax,%eax
xorl %ebx,%edi

# Round 12
# Round 12
movl 52(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -279,7 +279,7 @@ L_BF_encrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 13
# Round 13
movl 56(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -299,7 +299,7 @@ L_BF_encrypt_begin:
xorl %eax,%eax
xorl %ebx,%edi

# Round 14
# Round 14
movl 60(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -319,7 +319,7 @@ L_BF_encrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 15
# Round 15
movl 64(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -336,7 +336,7 @@ L_BF_encrypt_begin:
xorl %eax,%ebx
movl 3144(%ebp,%edx,4),%edx
addl %edx,%ebx
# Load parameter 0 (16) enc=1
# Load parameter 0 (16) enc=1
movl 20(%esp),%eax
xorl %ebx,%edi
movl 68(%ebp),%edx
Expand All @@ -360,15 +360,15 @@ L_BF_decrypt_begin:
movl 16(%esp),%ebp
pushl %esi
pushl %edi
# Load the 2 words
# Load the 2 words
movl (%ebx),%edi
movl 4(%ebx),%esi
xorl %eax,%eax
movl 68(%ebp),%ebx
xorl %ecx,%ecx
xorl %ebx,%edi

# Round 16
# Round 16
movl 64(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -388,7 +388,7 @@ L_BF_decrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 15
# Round 15
movl 60(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -408,7 +408,7 @@ L_BF_decrypt_begin:
xorl %eax,%eax
xorl %ebx,%edi

# Round 14
# Round 14
movl 56(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -428,7 +428,7 @@ L_BF_decrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 13
# Round 13
movl 52(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -448,7 +448,7 @@ L_BF_decrypt_begin:
xorl %eax,%eax
xorl %ebx,%edi

# Round 12
# Round 12
movl 48(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -468,7 +468,7 @@ L_BF_decrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 11
# Round 11
movl 44(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -488,7 +488,7 @@ L_BF_decrypt_begin:
xorl %eax,%eax
xorl %ebx,%edi

# Round 10
# Round 10
movl 40(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -508,7 +508,7 @@ L_BF_decrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 9
# Round 9
movl 36(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -528,7 +528,7 @@ L_BF_decrypt_begin:
xorl %eax,%eax
xorl %ebx,%edi

# Round 8
# Round 8
movl 32(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -548,7 +548,7 @@ L_BF_decrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 7
# Round 7
movl 28(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -568,7 +568,7 @@ L_BF_decrypt_begin:
xorl %eax,%eax
xorl %ebx,%edi

# Round 6
# Round 6
movl 24(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -588,7 +588,7 @@ L_BF_decrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 5
# Round 5
movl 20(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -608,7 +608,7 @@ L_BF_decrypt_begin:
xorl %eax,%eax
xorl %ebx,%edi

# Round 4
# Round 4
movl 16(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -628,7 +628,7 @@ L_BF_decrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 3
# Round 3
movl 12(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -648,7 +648,7 @@ L_BF_decrypt_begin:
xorl %eax,%eax
xorl %ebx,%edi

# Round 2
# Round 2
movl 8(%ebp),%edx
movl %edi,%ebx
xorl %edx,%esi
Expand All @@ -668,7 +668,7 @@ L_BF_decrypt_begin:
xorl %eax,%eax
xorl %ebx,%esi

# Round 1
# Round 1
movl 4(%ebp),%edx
movl %esi,%ebx
xorl %edx,%edi
Expand All @@ -685,7 +685,7 @@ L_BF_decrypt_begin:
xorl %eax,%ebx
movl 3144(%ebp,%edx,4),%edx
addl %edx,%ebx
# Load parameter 0 (1) enc=0
# Load parameter 0 (1) enc=0
movl 20(%esp),%eax
xorl %ebx,%edi
movl (%ebp),%edx
Expand All @@ -708,7 +708,7 @@ L_BF_cbc_encrypt_begin:
pushl %esi
pushl %edi
movl 28(%esp),%ebp
# getting iv ptr from parameter 4
# getting iv ptr from parameter 4
movl 36(%esp),%ebx
movl (%ebx),%esi
movl 4(%ebx),%edi
Expand All @@ -719,9 +719,9 @@ L_BF_cbc_encrypt_begin:
movl %esp,%ebx
movl 36(%esp),%esi
movl 40(%esp),%edi
# getting encrypt flag from parameter 5
# getting encrypt flag from parameter 5
movl 56(%esp),%ecx
# get and push parameter 3
# get and push parameter 3
movl 48(%esp),%eax
pushl %eax
pushl %ebx
Expand Down
Loading