Skip to content

Conversation

@skmcgrail
Copy link
Member

@skmcgrail skmcgrail commented Sep 8, 2023

Issues:

Addresses CryptoAlg-1976

Description of changes:

  • boringssl_prefix_symbols.h, boringssl_prefix_symbols_asm.h, and boringssl_prefix_symbols_nasm.inc have been relocated to openssl/boringssl_prefix_symbols_nasm.h, openssl/boringssl_prefix_symbols_asm.h, and openssl/boringssl_prefix_symbols_nasm.inc respectively.
  • Empty (stub) files for the prefix headers are now in include/openssl directory of the repository, these will be installed by cmake --install <build folder> if a prefix build was not performed.
  • If the user performs a prefix build the prefix headers will be generated and will be installed in the final installation directory instead of the empty stubs.
  • The BORINGSSL_PREFIX define is now embedded into the generated prefix headers, so the user is no longer required to provide it when linking to an aws-lc installation that was built with a prefix.
  • All conditional #include directives for the prefix headers have been removed, as the files will always be present as either the empty stubs or the generated content.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.

@skmcgrail skmcgrail force-pushed the prefix-build branch 2 times, most recently from 373c387 to 90dd56f Compare September 11, 2023 19:22
@skmcgrail skmcgrail marked this pull request as ready for review September 11, 2023 19:23
@skmcgrail skmcgrail requested a review from a team as a code owner September 11, 2023 19:23
@skmcgrail skmcgrail force-pushed the prefix-build branch 2 times, most recently from e019226 to d40b2b5 Compare September 11, 2023 20:35
@skmcgrail
Copy link
Member Author

A note for reviewers: aws-lc-rs CI item is expected to fail given the changes here. We will have to update aws-lc-rs after this is merged in.

justsmth
justsmth previously approved these changes Sep 13, 2023
samuel40791765
samuel40791765 previously approved these changes Sep 13, 2023
@skmcgrail skmcgrail dismissed stale reviews from samuel40791765 and justsmth via 23889bf September 13, 2023 19:22
@skmcgrail skmcgrail merged commit ebe0892 into aws:main Sep 13, 2023
@skmcgrail skmcgrail deleted the prefix-build branch September 13, 2023 21:28
skmcgrail added a commit to skmcgrail/aws-lc that referenced this pull request Sep 14, 2023
skmcgrail added a commit that referenced this pull request Sep 14, 2023
* Simplify the Kyber prefix build (#1131)

Use the same symbol prefixing process as the rest of AWS-LC. This does not change how s2n-bignum gets handled.

(cherry picked from commit 754a124)

* Simplify Prefix Build Support (#1178)

(cherry picked from commit ebe0892)

* Add prefix symbols for Windows FIPS Shared Build (#1191)

(cherry picked from commit 195441d)

---------

Co-authored-by: Andrew Hopkins <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants