diff options
| author | Adam Langley <agl@google.com> | 2018-07-19 10:03:56 -0700 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2018-07-30 15:44:53 -0700 |
| commit | 66005f41fbc3529ffe8d007708756720529da20d (patch) | |
| tree | 9fb6aed71e54a1c33da5424d9007f3aa6a38b849 | |
| parent | 546093ca4a6b2bf9b7c29018687d53f8a2ad428a (diff) | |
| download | boringssl-fips-20180730.zip boringssl-fips-20180730.tar.gz boringssl-fips-20180730.tar.bz2 | |
Fix the build with FIPS + NO_ASM.fips-20180730fips-20180730
Setting OPENSSL_NO_ASM skips enabling the “ASM” language in CMake.
However, the FIPS module fundamentally needs to build asm because
delocate works via textual assembly. Thus this combination is currently
broken with CMake.
This change ensures that support for building asm is enabled in CMake
for this combination.
Change-Id: I4516cf3a6f579ee7c72f04ac25d15785926cf125
Reviewed-on: https://boringssl-review.googlesource.com/29884
Reviewed-by: Adam Langley <agl@google.com>
| -rw-r--r-- | crypto/fipsmodule/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/fipsmodule/CMakeLists.txt b/crypto/fipsmodule/CMakeLists.txt index e83c483..3082375 100644 --- a/crypto/fipsmodule/CMakeLists.txt +++ b/crypto/fipsmodule/CMakeLists.txt @@ -121,6 +121,13 @@ perlasm(x86_64-mont.${ASM_EXT} bn/asm/x86_64-mont.pl) perlasm(x86-mont.${ASM_EXT} bn/asm/x86-mont.pl) if(FIPS_DELOCATE) + if(OPENSSL_NO_ASM) + # If OPENSSL_NO_ASM was defined then ASM will not have been enabled, but in + # FIPS mode we have to have it because the module build requires going via + # textual assembly. + enable_language(ASM) + endif() + add_library( bcm_c_generated_asm |