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

Node.js OpenSSL headers much larger after OpenSSL 3 switch over #42081

Closed
richardlau opened this issue Feb 22, 2022 · 5 comments
Closed

Node.js OpenSSL headers much larger after OpenSSL 3 switch over #42081

richardlau opened this issue Feb 22, 2022 · 5 comments
Assignees
@danbev
Labels
build Issues and PRs related to build files or the CI. openssl Issues and PRs related to the OpenSSL dependency.

Comments

@richardlau
Copy link
Member

Version

v17 and master

Platform

No response

Subsystem

build

What steps will reproduce the bug?

Download and unpack a headers package, e.g. https://nodejs.org/dist/v17.5.0/node-v17.5.0-headers.tar.gz.

How often does it reproduce? Is there a required condition?

N/A

What is the expected behavior?

No response

What do you see instead?

The size of the unpacked headers is 64 Mb whereas earlier versions, e.g. v16.14.0, are around 7 Mb.

Additional information

Noticed while tidying up disk space on one of the CI machines, nodejs/build#2695 (comment)

7.0M    .cache/node-gyp/17.0.0-nightly20211008dbc91de011
7.0M    .cache/node-gyp/17.0.0-nightly20211009879ff775d0
7.0M    .cache/node-gyp/17.0.0-nightly202110108068f40313
67M     .cache/node-gyp/17.0.0-nightly202110110cc37209fa
67M     .cache/node-gyp/17.0.0-nightly20211012a784258444
67M     .cache/node-gyp/17.0.0-nightly20211013f570109094

A cursory glance at the changes 8068f40...0cc3720 would suggest that the large increase in size was the OpenSSL 3 switchover.

An initial look suggests the differences are in include/node/openssl/archs/:

$ du -hs /tmp/node-headers/node-v16.14.0/include/node/openssl/archs/
2.7M    /tmp/node-headers/node-v16.14.0/include/node/openssl/archs/
$ du -hs /tmp/node-headers/node-v17.5.0/include/node/openssl/archs/
61M     /tmp/node-headers/node-v17.5.0/include/node/openssl/archs/
$

and looking at one arch:

$ ls /tmp/node-headers/node-v16.14.0/include/node/openssl/archs/BSD-x86/no-asm/include/openssl/ -al
total 8
drwxr-xr-x. 2 rlau rlau   27 Feb  8 07:46 .
drwxr-xr-x. 3 rlau rlau   36 Feb  8 07:46 ..
-rw-r--r--. 1 rlau rlau 4703 Oct 14 01:50 opensslconf.h
$ ls /tmp/node-headers/node-v17.5.0/include/node/openssl/archs/BSD-x86/no-asm/include/openssl/ -al
total 840
drwxr-xr-x. 2 rlau rlau   4096 Feb 10 00:10 .
drwxr-xr-x. 4 rlau rlau     50 Feb 10 00:10 ..
-rw-r--r--. 1 rlau rlau  60914 Feb  8 23:02 asn1.h
-rw-r--r--. 1 rlau rlau  35937 Feb  8 23:02 asn1t.h
-rw-r--r--. 1 rlau rlau  39689 Feb  8 23:02 bio.h
-rw-r--r--. 1 rlau rlau  40773 Feb  8 23:02 cmp.h
-rw-r--r--. 1 rlau rlau  34081 Feb  8 23:02 cms.h
-rw-r--r--. 1 rlau rlau  10485 Feb  8 23:02 conf.h
-rw-r--r--. 1 rlau rlau   3013 Feb  8 23:02 configuration.h
-rw-r--r--. 1 rlau rlau  14644 Feb  8 23:02 crmf.h
-rw-r--r--. 1 rlau rlau  23819 Feb  8 23:02 crypto.h
-rw-r--r--. 1 rlau rlau  22765 Feb  8 23:02 ct.h
-rw-r--r--. 1 rlau rlau  21089 Feb  8 23:02 err.h
-rw-r--r--. 1 rlau rlau   8968 Feb  8 23:02 ess.h
-rw-r--r--. 1 rlau rlau   1010 Feb  8 23:02 fipskey.h
-rw-r--r--. 1 rlau rlau  14061 Feb  8 23:02 lhash.h
-rw-r--r--. 1 rlau rlau  29352 Feb  8 23:02 ocsp.h
-rw-r--r--. 1 rlau rlau   4703 Oct 14 01:50 opensslconf.h
-rw-r--r--. 1 rlau rlau   3204 Feb  8 23:02 opensslv.h
-rw-r--r--. 1 rlau rlau  19316 Feb  8 23:02 pkcs12.h
-rw-r--r--. 1 rlau rlau  22333 Feb  8 23:02 pkcs7.h
-rw-r--r--. 1 rlau rlau  18439 Feb  8 23:02 safestack.h
-rw-r--r--. 1 rlau rlau  15487 Feb  8 23:02 srp.h
-rw-r--r--. 1 rlau rlau 127071 Feb  8 23:02 ssl.h
-rw-r--r--. 1 rlau rlau  19251 Feb  8 23:02 ui.h
-rw-r--r--. 1 rlau rlau  71533 Feb  8 23:02 x509.h
-rw-r--r--. 1 rlau rlau  52027 Feb  8 23:02 x509_vfy.h
-rw-r--r--. 1 rlau rlau  93966 Feb  8 23:02 x509v3.h
$
@richardlau richardlau added build Issues and PRs related to build files or the CI. openssl Issues and PRs related to the OpenSSL dependency. labels Feb 22, 2022
@richardlau richardlau mentioned this issue Feb 23, 2022
Closed
@mhdawson mhdawson mentioned this issue Mar 16, 2022
Closed
danbev added a commit to danbev/node that referenced this issue Apr 5, 2022
@danbev
deps: add template for generated headers
ca14fa5 
OpenSSL 3.0 has a number of header files that are generated, and
currently these headers are copied into the architecture specific
directories. This is done for each asm type, 'asm', 'asm_avx2', and
'no-asm' which has takes up quite a lot of disk space and also becomes
an issue with the headers.tar file which has increased due to this.

This commit adds copies the headers to a common directory for the
architecture, for example with linux-x86_64 there will be a directory
named deps/openssl/config/archs/linux-x86_64/common/include where the headers
will be copied (into subdirectories 'openssl' and 'crypto'. And in the
original locations a header file with the same name will be generated
which points (includes) the common header file.

Fixes: nodejs#42081
@danbev danbev mentioned this issue Apr 5, 2022
Closed
danbev added a commit to danbev/node that referenced this issue Apr 6, 2022
@danbev
deps: add template for generated headers
fdeb4cb 
OpenSSL 3.0 has a number of header files that are generated, and
currently these headers are copied into the architecture specific
directories. This is done for each asm type, 'asm', 'asm_avx2', and
'no-asm' which has takes up quite a lot of disk space and also becomes
an issue with the headers.tar file which has increased due to this.

This commit adds copies the headers to a common directory for the
architecture, for example with linux-x86_64 there will be a directory
named deps/openssl/config/archs/linux-x86_64/common/include where the
headers will be copied (into subdirectories 'openssl' and 'crypto'.
And in the original locations a header file with the same name will be
generated which points (includes) the common header file.

Fixes: nodejs#42081
@danbev danbev self-assigned this Apr 6, 2022
danbev added a commit to danbev/node that referenced this issue Apr 6, 2022
@danbev
deps: add template for generated headers
3dcde51 
OpenSSL 3.0 has a number of header files that are generated, and
currently these headers are copied into the architecture specific
directories. This is done for each asm type, 'asm', 'asm_avx2', and
'no-asm' which has takes up quite a lot of disk space and also becomes
an issue with the headers.tar file which has increased due to this.

This commit adds copies the headers to a common directory for the
architecture, for example with linux-x86_64 there will be a directory
named deps/openssl/config/archs/linux-x86_64/common/include where the
headers will be copied (into subdirectories 'openssl' and 'crypto'.
And in the original locations a header file with the same name will be
generated which points (includes) the common header file.

Fixes: nodejs#42081
@danbev
Copy link
Contributor

danbev commented Apr 7, 2022 •
edited

OpenSSL 3.x has a number of header files that are generated and are architecture specific. These headers are generated as part of Node.js OpenSSL update process and the generated header files are checked in.

In earlier version there were only two files (or something like that) that got generated but this has increased in OpenSSL 3.x where there are more, for example on Linux there following list is generated in the perl module configdata.pm by the configure step:

  "depends" => {                                                              
        "" => [                                                                 
            "include/crypto/bn_conf.h",                                         
            "include/crypto/dso_conf.h",                                        
            "include/openssl/asn1.h",                                           
            "include/openssl/asn1t.h",                                          
            "include/openssl/bio.h",                                            
            "include/openssl/cmp.h",                                            
            "include/openssl/cms.h",                                            
            "include/openssl/conf.h",                                           
            "include/openssl/configuration.h",                                  
            "include/openssl/crmf.h",                                           
            "include/openssl/crypto.h",                                         
            "include/openssl/ct.h",                                             
            "include/openssl/err.h",                                            
            "include/openssl/ess.h",                                            
            "include/openssl/fipskey.h",                                        
            "include/openssl/lhash.h",                                          
            "include/openssl/ocsp.h",                                           
            "include/openssl/opensslv.h",                                       
            "include/openssl/pkcs12.h",                                         
            "include/openssl/pkcs7.h",                                          
            "include/openssl/safestack.h",                                      
            "include/openssl/srp.h",                                            
            "include/openssl/ssl.h",                                            
            "include/openssl/ui.h",                                             
            "include/openssl/x509.h",                                           
            "include/openssl/x509_vfy.h",                                       
            "include/openssl/x509v3.h",                                         
            "test/provider_internal_test.cnf"                                   
        ],

This list will then be used by the makefile template, Configurations/unix-Makefile.tmpl in the Linux case, and will generate the following variable:

GENERATED_MANDATORY=include/crypto/bn_conf.h include/crypto/dso_conf.h \             
                    include/openssl/asn1.h include/openssl/asn1t.h \                 
                    include/openssl/bio.h include/openssl/cmp.h \                    
                    include/openssl/cms.h include/openssl/conf.h \                   
                    include/openssl/configuration.h include/openssl/crmf.h \     
                    include/openssl/crypto.h include/openssl/ct.h \                  
                    include/openssl/err.h include/openssl/ess.h \                    
                    include/openssl/fipskey.h include/openssl/lhash.h \              
                    include/openssl/ocsp.h include/openssl/opensslv.h \              
                    include/openssl/pkcs12.h include/openssl/pkcs7.h \               
                    include/openssl/safestack.h include/openssl/srp.h \              
                    include/openssl/ssl.h include/openssl/ui.h \                     
                    include/openssl/x509.h include/openssl/x509_vfy.h \              
                    include/openssl/x509v3.h test/provider_internal_test.cnf

And in Node.js the output of these targets are placed in the architecture specific directories below deps/openssl/config/archs

$ ls  -lh archs/linux-x86_64/asm/include/openssl/
total 836K
-rw-rw-r--. 1 danielbevenius danielbevenius  60K Oct 19 10:14 asn1.h
-rw-rw-r--. 1 danielbevenius danielbevenius  36K Oct 19 10:14 asn1t.h
-rw-rw-r--. 1 danielbevenius danielbevenius  39K Apr  3 16:14 bio.h
-rw-rw-r--. 1 danielbevenius danielbevenius  40K Oct 19 10:14 cmp.h
-rw-rw-r--. 1 danielbevenius danielbevenius  34K Oct 19 10:14 cms.h
-rw-rw-r--. 1 danielbevenius danielbevenius  11K Oct 19 10:14 conf.h
-rw-rw-r--. 1 danielbevenius danielbevenius 3.0K Oct 19 10:14 configuration.h
-rw-rw-r--. 1 danielbevenius danielbevenius  15K Oct 19 10:14 crmf.h
-rw-rw-r--. 1 danielbevenius danielbevenius  24K Apr  3 16:14 crypto.h
-rw-rw-r--. 1 danielbevenius danielbevenius  23K Oct 19 10:14 ct.h
-rw-rw-r--. 1 danielbevenius danielbevenius  21K Oct 19 10:14 err.h
-rw-rw-r--. 1 danielbevenius danielbevenius 8.8K Oct 19 10:14 ess.h
-rw-rw-r--. 1 danielbevenius danielbevenius 1010 Oct 19 10:14 fipskey.h
-rw-rw-r--. 1 danielbevenius danielbevenius  14K Oct 19 10:14 lhash.h
-rw-rw-r--. 1 danielbevenius danielbevenius  29K Oct 19 10:14 ocsp.h
-rw-rw-r--. 1 danielbevenius danielbevenius 4.7K Apr 12  2021 opensslconf.h
-rw-rw-r--. 1 danielbevenius danielbevenius 3.2K Apr  3 16:14 opensslv.h
-rw-rw-r--. 1 danielbevenius danielbevenius  19K Oct 19 10:14 pkcs12.h
-rw-rw-r--. 1 danielbevenius danielbevenius  22K Oct 19 10:14 pkcs7.h
-rw-rw-r--. 1 danielbevenius danielbevenius  19K Oct 19 10:14 safestack.h
-rw-rw-r--. 1 danielbevenius danielbevenius  16K Oct 19 10:14 srp.h
-rw-rw-r--. 1 danielbevenius danielbevenius 125K Apr  3 16:14 ssl.h
-rw-rw-r--. 1 danielbevenius danielbevenius  19K Oct 19 10:14 ui.h
-rw-rw-r--. 1 danielbevenius danielbevenius  70K Oct 19 10:14 x509.h
-rw-rw-r--. 1 danielbevenius danielbevenius  92K Oct 19 10:14 x509v3.h
-rw-rw-r--. 1 danielbevenius danielbevenius  51K Oct 19 10:14 x509_vfy.h

There are 24 archs/assembly language in deps/openssl/config/arch and each have asm, asm_avx2, and no-asm directories were these headers are copied. So that I think would account for this increase in size:

(24 * (3 * 840000))/1000000
60

So this is not a case of having included headers by mistake in someway but is intentional.

One option is that it might be possible to instead of copying these file into the three directories, create a directory named archs/linux-x86_64/common, where we place the include files and then have the include files in the sub-directories include these headers.

With the changes in the linked pull request the size if down to

$ du -hs node-v18.0.0/include/node/openssl/archs/
37M	node-v18.0.0/include/node/openssl/archs/

@mhdawson
Copy link
Member

mhdawson commented Apr 7, 2022

When you say 24 archs/compiler types, do we support all of those in Node.js? Without looking it sounds like a lot but maybe it is what we support, just wanted to ask in case we might be able to remove some of them.

@danbev
Copy link
Contributor

danbev commented Apr 8, 2022

When you say 24 archs/compiler types, do we support all of those in Node.js?

Sorry, that was confusing. It should really be assembly language supported I think (I'm not I'm using the correct terminology here). For each architecture we have asm, asm_avx2, and no-asm. I'll update the comment above.

danbev added a commit to danbev/node that referenced this issue Apr 20, 2022
@danbev
deps: add template for generated headers
379e665 
OpenSSL 3.0 has a number of header files that are generated, and
currently these headers are copied into the architecture specific
directories. This is done for each asm type, 'asm', 'asm_avx2', and
'no-asm' which has takes up quite a lot of disk space and also becomes
an issue with the headers.tar file which has increased due to this.

This commit adds copies the headers to a common directory for the
architecture, for example with linux-x86_64 there will be a directory
named deps/openssl/config/archs/linux-x86_64/common/include where the
headers will be copied (into subdirectories 'openssl' and 'crypto'.
And in the original locations a header file with the same name will be
generated which points (includes) the common header file.

Fixes: nodejs#42081
danbev added a commit to danbev/node that referenced this issue Apr 25, 2022
@danbev
deps: add template for generated headers
e90569f 
OpenSSL 3.0 has a number of header files that are generated, and
currently these headers are copied into the architecture specific
directories. This is done for each asm type, 'asm', 'asm_avx2', and
'no-asm' which has takes up quite a lot of disk space and also becomes
an issue with the headers.tar file which has increased due to this.

This commit adds copies the headers to a common directory for the
architecture, for example with linux-x86_64 there will be a directory
named deps/openssl/config/archs/linux-x86_64/common/include where the
headers will be copied (into subdirectories 'openssl' and 'crypto'.
And in the original locations a header file with the same name will be
generated which points (includes) the common header file.

Fixes: nodejs#42081
@danbev danbev closed this as completed in 33bc537 Apr 28, 2022
danbev added a commit that referenced this issue Apr 28, 2022
@danbev
deps: add note about removing asm archs
4f1f14e 
PR-URL: #42616
Fixes: #42081
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
danbev added a commit that referenced this issue Apr 28, 2022
@danbev
deps: remove archs/aix64-gcc
d8365ac 
This arch was renamed to clarify that it used the aix assembler (as) and
not the gnu assembler. It was removed from the Makefile and not being
built but would still be picked up by make targets like the header-tar
target.

PR-URL: #42616
Fixes: #42081
Refs: openssl/openssl@178fa72ed5
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
danbev added a commit that referenced this issue Apr 28, 2022
@danbev
deps: remove aix-gcc architecture
d68c4e9 
PR-URL: #42616
Fixes: #42081
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
danbev added a commit that referenced this issue Apr 28, 2022
@danbev
deps: remove linux-ppc architecture
3f0b2a2 
PR-URL: #42616
Fixes: #42081
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
danbev added a commit that referenced this issue Apr 28, 2022
@danbev
deps: remove linux-ppc64 architecture
4ecfe3f 
PR-URL: #42616
Fixes: #42081
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
targos pushed a commit that referenced this issue May 2, 2022
@danbev @targos
deps: add template for generated headers
7fae2c9 
OpenSSL 3.0 has a number of header files that are generated, and
currently these headers are copied into the architecture specific
directories. This is done for each asm type, 'asm', 'asm_avx2', and
'no-asm' which has takes up quite a lot of disk space and also becomes
an issue with the headers.tar file which has increased due to this.

This commit adds copies the headers to a common directory for the
architecture, for example with linux-x86_64 there will be a directory
named deps/openssl/config/archs/linux-x86_64/common/include where the
headers will be copied (into subdirectories 'openssl' and 'crypto'.
And in the original locations a header file with the same name will be
generated which points (includes) the common header file.

PR-URL: #42616
Fixes: #42081
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
targos pushed a commit that referenced this issue May 2, 2022
@danbev @targos
deps: add note about removing asm archs
e8734a4 
PR-URL: #42616
Fixes: #42081
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
targos pushed a commit that referenced this issue May 2, 2022
@danbev @targos
deps: remove archs/aix64-gcc
6dc1f82 
This arch was renamed to clarify that it used the aix assembler (as) and
not the gnu assembler. It was removed from the Makefile and not being
built but would still be picked up by make targets like the header-tar
target.

PR-URL: #42616
Fixes: #42081
Refs: openssl/openssl@178fa72ed5
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
targos pushed a commit that referenced this issue May 2, 2022
@danbev @targos
deps: remove aix-gcc architecture
8dc71f2 
PR-URL: #42616
Fixes: #42081
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
targos pushed a commit that referenced this issue May 2, 2022
@danbev @targos
deps: remove linux-ppc architecture
4abe987 
PR-URL: #42616
Fixes: #42081
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
targos pushed a commit that referenced this issue May 2, 2022
@danbev @targos
deps: remove linux-ppc64 architecture
2798929 
PR-URL: #42616
Fixes: #42081
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
@yanovich
Copy link

yanovich commented May 6, 2022 •
edited

When you say 24 archs/compiler types, do we support all of those in Node.js?

Sorry, that was confusing. It should really be assembly language supported I think (I'm not I'm using the correct terminology here). For each architecture we have asm, asm_avx2, and no-asm. I'll update the comment above.

Those flavors (asm, asm_avx2, and no-asm) don't seem to have any effect at all:

$ list=`ls deps/openssl/config/archs`;\
 for a in $list; do\
  diff -aur deps/openssl/config/archs/$a/asm/include deps/openssl/config/archs/$a/no-asm/include;\
 done
diff -aur deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/configuration.h deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/aix64-gcc-as/asm/include/openssl/configuration.h	2021-12-24 20:13:00.351100747 +0300
+++ deps/openssl/config/archs/aix64-gcc-as/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.359100757 +0300
@@ -42,6 +42,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/aix-gcc/asm/include/openssl/configuration.h deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/aix-gcc/asm/include/openssl/configuration.h	2021-12-24 20:13:00.339100734 +0300
+++ deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.347100743 +0300
@@ -42,6 +42,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/BSD-x86/asm/include/openssl/configuration.h deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/BSD-x86/asm/include/openssl/configuration.h	2021-12-24 20:13:00.243100625 +0300
+++ deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.259100643 +0300
@@ -39,6 +39,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/configuration.h deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/configuration.h	2021-12-24 20:13:00.271100657 +0300
+++ deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.283100670 +0300
@@ -39,6 +39,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/configuration.h deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/darwin64-arm64-cc/asm/include/openssl/configuration.h	2021-12-24 20:13:00.387100788 +0300
+++ deps/openssl/config/archs/darwin64-arm64-cc/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.395100797 +0300
@@ -42,6 +42,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/configuration.h deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/configuration.h	2021-12-24 20:13:00.399100802 +0300
+++ deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.407100811 +0300
@@ -42,6 +42,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/configuration.h deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/configuration.h	2021-12-24 20:13:00.371100770 +0300
+++ deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.379100779 +0300
@@ -42,6 +42,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/linux32-s390x/asm/include/openssl/configuration.h deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/linux32-s390x/asm/include/openssl/configuration.h	2021-12-24 20:13:00.503100919 +0300
+++ deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.507100924 +0300
@@ -39,6 +39,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/linux64-mips64/asm/include/openssl/configuration.h deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/linux64-mips64/asm/include/openssl/configuration.h	2021-12-24 20:13:00.511100929 +0300
+++ deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.519100937 +0300
@@ -39,6 +39,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff: deps/openssl/config/archs/linux64-riscv64/asm/include: No such file or directory
diff -aur deps/openssl/config/archs/linux64-s390x/asm/include/openssl/configuration.h deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/linux64-s390x/asm/include/openssl/configuration.h	2021-12-24 20:13:00.523100942 +0300
+++ deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.531100951 +0300
@@ -39,6 +39,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/linux-aarch64/asm/include/openssl/configuration.h deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/linux-aarch64/asm/include/openssl/configuration.h	2021-12-24 20:13:00.411100815 +0300
+++ deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.419100824 +0300
@@ -39,6 +39,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/linux-armv4/asm/include/openssl/configuration.h deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/linux-armv4/asm/include/openssl/configuration.h	2021-12-24 20:13:00.423100829 +0300
+++ deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.431100838 +0300
@@ -39,6 +39,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/linux-elf/asm/include/openssl/configuration.h deps/openssl/config/archs/linux-elf/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/linux-elf/asm/include/openssl/configuration.h	2021-12-24 20:13:00.435100842 +0300
+++ deps/openssl/config/archs/linux-elf/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.443100852 +0300
@@ -39,6 +39,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/linux-ppc/asm/include/openssl/configuration.h deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/linux-ppc/asm/include/openssl/configuration.h	2021-12-24 20:13:00.447100856 +0300
+++ deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.451100861 +0300
@@ -39,6 +39,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/linux-ppc64/asm/include/openssl/configuration.h deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/linux-ppc64/asm/include/openssl/configuration.h	2021-12-24 20:13:00.455100865 +0300
+++ deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.463100874 +0300
@@ -39,6 +39,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/configuration.h deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/configuration.h	2021-12-24 20:13:00.467100879 +0300
+++ deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.475100888 +0300
@@ -39,6 +39,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/linux-x86_64/asm/include/openssl/configuration.h deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/linux-x86_64/asm/include/openssl/configuration.h	2021-12-24 20:13:00.491100906 +0300
+++ deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.499100915 +0300
@@ -39,6 +39,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/configuration.h deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/configuration.h	2021-12-24 20:13:00.547100969 +0300
+++ deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.555100978 +0300
@@ -39,6 +39,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/configuration.h deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/configuration.h	2021-12-24 20:13:00.535100956 +0300
+++ deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.539100961 +0300
@@ -39,6 +39,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/VC-WIN32/asm/include/openssl/configuration.h deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/VC-WIN32/asm/include/openssl/configuration.h	2021-12-24 20:13:00.295100684 +0300
+++ deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.307100698 +0300
@@ -42,6 +42,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff -aur deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/configuration.h deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/configuration.h
--- deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/configuration.h	2021-12-24 20:13:00.323100716 +0300
+++ deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/configuration.h	2021-12-24 20:13:00.331100725 +0300
@@ -42,6 +42,9 @@
 # ifndef OPENSSL_NO_ASAN
 #  define OPENSSL_NO_ASAN
 # endif
+# ifndef OPENSSL_NO_ASM
+#  define OPENSSL_NO_ASM
+# endif
 # ifndef OPENSSL_NO_COMP
 #  define OPENSSL_NO_COMP
 # endif
diff: deps/openssl/config/archs/VC-WIN64-ARM/asm/include: No such file or directory
$ list=`ls deps/openssl/config/archs`; for a in $list; do diff -aur deps/openssl/config/archs/$a/asm/include deps/openssl/config/archs/$a/asm_avx2/include; done
diff: deps/openssl/config/archs/linux64-riscv64/asm/include: No such file or directory
diff: deps/openssl/config/archs/linux64-riscv64/asm_avx2/include: No such file or directory
diff: deps/openssl/config/archs/VC-WIN64-ARM/asm/include: No such file or directory
diff: deps/openssl/config/archs/VC-WIN64-ARM/asm_avx2/include: No such file or directory

Can they just be refactored out?

@yanovich
Copy link

yanovich commented May 6, 2022 •
edited

The difference between archs seems to be insignificant as well. Why not plain openssl headers?

The check is:

list=`ls deps/openssl/config/archs`;\
 for a in $list; do\
  diff -aur deps/openssl/config/archs/linux-x86_64/no-asm/include\
    deps/openssl/config/archs/$a/no-asm/include;\
 done

This was referenced Nov 14, 2022
Closed
Closed
@richardlau richardlau mentioned this issue Jan 31, 2023
Open
@stasadev stasadev mentioned this issue May 1, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@danbev danbev

Labels
build Issues and PRs related to build files or the CI. openssl Issues and PRs related to the OpenSSL dependency.
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

deps: add template for generated headers danbev/node
4 participants
@danbev @yanovich @richardlau @mhdawson