-
Notifications
You must be signed in to change notification settings - Fork 29.8k
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.
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
deps,build: add OpenSSL building of legacy module #40466
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| { | ||
| 'variables': { | ||
| 'openssl_sources': [ | ||
| 'openssl/crypto/md5/md5_dgst.c', | ||
| 'openssl/crypto/md5/md5_one.c', | ||
| 'openssl/crypto/md5/md5_sha1.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_blowfish.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_blowfish_hw.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_cast5.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_cast5_hw.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_des.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_des_hw.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_desx.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_desx_hw.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_idea.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_idea_hw.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_rc2.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_rc2_hw.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_rc4.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_rc4_hmac_md5_hw.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_rc4_hw.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_seed.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_seed_hw.c', | ||
| 'openssl/providers/implementations/ciphers/cipher_tdes_common.c', | ||
| 'openssl/providers/implementations/digests/md4_prov.c', | ||
| 'openssl/providers/implementations/digests/mdc2_prov.c', | ||
| 'openssl/providers/implementations/digests/ripemd_prov.c', | ||
| 'openssl/providers/implementations/digests/wp_prov.c', | ||
| 'openssl/providers/implementations/kdfs/pbkdf1.c', | ||
| 'openssl/providers/prov_running.c', | ||
| 'openssl/providers/legacyprov.c', | ||
|
|
||
| ], | ||
| 'openssl_sources_BSD-x86': [ | ||
|
|
||
| ], | ||
| 'openssl_defines_BSD-x86': [ | ||
| 'NDEBUG', | ||
| 'L_ENDIAN', | ||
| 'OPENSSL_BUILDING_OPENSSL', | ||
| 'DES_ASM', | ||
| 'MD5_ASM', | ||
| 'OPENSSL_BN_ASM_GF2m', | ||
| 'OPENSSL_BN_ASM_MONT', | ||
| 'OPENSSL_BN_ASM_PART_WORDS', | ||
| 'OPENSSL_IA32_SSE2', | ||
| ], | ||
| 'openssl_cflags_BSD-x86': [ | ||
| '-Wa,--noexecstack', | ||
| '-Wall -O3 -fomit-frame-pointer', | ||
| '-pthread', | ||
| '-Wall -O3 -fomit-frame-pointer', | ||
| ], | ||
| 'openssl_ex_libs_BSD-x86': [ | ||
| '-pthread', | ||
| ], | ||
| 'version_script': '' | ||
| }, | ||
| 'include_dirs': [ | ||
| '.', | ||
| './include', | ||
| './crypto', | ||
| './crypto/include/internal', | ||
| './providers/common/include', | ||
| ], | ||
| 'defines': ['<@(openssl_defines_BSD-x86)'], | ||
| 'cflags': ['<@(openssl_cflags_BSD-x86)'], | ||
| 'libraries': ['<@(openssl_ex_libs_BSD-x86)'], | ||
|
|
||
| 'sources': ['<@(openssl_sources)', '<@(openssl_sources_BSD-x86)'], | ||
| 'direct_dependent_settings': { | ||
| 'include_dirs': ['./include', '.'], | ||
| 'defines': ['<@(openssl_defines_BSD-x86)'], | ||
| }, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| global: | ||
| OSSL_provider_init; | ||
| local: *; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
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.
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.
I'm guessing it does not make sense for this to have
danielbeveniusin the path. Same for the next line.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.
Although that may be a more general comment since it's not a change in this PR
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.
I've taken a look at this and I'm not sure how I can prevent this in Perl. I'll take another look but I don't think this is critical as my understanding is that after we generate this file we only use it to parse out values. Still I'd rather fix this but not sure how at the moment.
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.
I assume the paths with be more generic (but still absolute) if regenerating the config via the Docker file?
node/Makefile
Lines 1479 to 1481 in ed01811