aboutsummaryrefslogtreecommitdiff
path: root/crypto/modes
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-10-04 01:38:17 +0200
committerRichard Levitte <levitte@openssl.org>2019-10-10 14:12:15 +0200
commitdec95d75897125133380c7ce3c6ce58c93c06f10 (patch)
treec95ecfb434a58251f6f422d413eda49f1ac53857 /crypto/modes
parente805c2d6d36d6be3db8141abc98f3ce5c6fa9776 (diff)
downloadopenssl-dec95d75897125133380c7ce3c6ce58c93c06f10.zip
openssl-dec95d75897125133380c7ce3c6ce58c93c06f10.tar.gz
openssl-dec95d75897125133380c7ce3c6ce58c93c06f10.tar.bz2
Rework how our providers are built
We put almost everything in these internal static libraries: libcommon Block building code that can be used by all our implementations, legacy and non-legacy alike. libimplementations All non-legacy algorithm implementations and only them. All the code that ends up here is agnostic to the definitions of FIPS_MODE. liblegacy All legacy implementations. libnonfips Support code for the algorithm implementations. Built with FIPS_MODE undefined. Any code that checks that FIPS_MODE isn't defined must end up in this library. libfips Support code for the algorithm implementations. Built with FIPS_MODE defined. Any code that checks that FIPS_MODE is defined must end up in this library. The FIPS provider module is built from providers/fips/*.c and linked with libimplementations, libcommon and libfips. The Legacy provider module is built from providers/legacy/*.c and linked with liblegacy, libcommon and libcrypto. If module building is disabled, the object files from liblegacy and libcommon are added to libcrypto and the Legacy provider becomes a built-in provider. The Default provider module is built-in, so it ends up being linked with libimplementations, libcommon and libnonfips. For libcrypto in form of static library, the object files from those other libraries are simply being added to libcrypto. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/10088)
Diffstat (limited to 'crypto/modes')
-rw-r--r--crypto/modes/build.info4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/modes/build.info b/crypto/modes/build.info
index 8a8aead..4ae0d8b 100644
--- a/crypto/modes/build.info
+++ b/crypto/modes/build.info
@@ -54,8 +54,8 @@ SOURCE[../../libcrypto]=$COMMON \
cts128.c ocb128.c siv128.c
DEFINE[../../libcrypto]=$MODESDEF
-SOURCE[../../providers/fips]=$COMMON
-DEFINE[../../providers/fips]=$MODESDEF
+SOURCE[../../providers/libfips.a]=$COMMON
+DEFINE[../../providers/libfips.a]=$MODESDEF
INCLUDE[gcm128.o]=..