mirror of
https://github.com/openssl/openssl.git
synced 2024-12-15 06:01:37 +08:00
848af5e8fe
libimplementations.a was a nice idea, but had a few flaws:
1. The idea to have common code in libimplementations.a and FIPS
sensitive helper functions in libfips.a / libnonfips.a didn't
catch on, and we saw full implementation ending up in them instead
and not appearing in libimplementations.a at all.
2. Because more or less ALL algorithm implementations were included
in libimplementations.a (the idea being that the appropriate
objects from it would be selected automatically by the linker when
building the shared libraries), it's very hard to find only the
implementation source that should go into the FIPS module, with
the result that the FIPS checksum mechanism include source files
that it shouldn't
To mitigate, we drop libimplementations.a, but retain the idea of
collecting implementations in static libraries. With that, we not
have:
libfips.a
Includes all implementations that should become part of the FIPS
provider.
liblegacy.a
Includes all implementations that should become part of the legacy
provider.
libdefault.a
Includes all implementations that should become part of the
default and base providers.
With this, libnonfips.a becomes irrelevant and is dropped.
libcommon.a is retained to include common provider code that can be
used uniformly by all providers.
Fixes #15157
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15171)
136 lines
4.4 KiB
Plaintext
136 lines
4.4 KiB
Plaintext
# Note that these directories are filtered in Configure. Look for %skipdir
|
|
# there for further explanations.
|
|
SUBDIRS=objects buffer bio stack lhash rand evp asn1 pem x509 conf \
|
|
txt_db pkcs7 pkcs12 ui kdf store property \
|
|
md2 md4 md5 sha mdc2 hmac ripemd whrlpool poly1305 \
|
|
siphash sm3 des aes rc2 rc4 rc5 idea aria bf cast camellia \
|
|
seed sm4 chacha modes bn ec rsa dsa dh sm2 dso engine \
|
|
err comp http ocsp cms ts srp cmac ct async ess crmf cmp encode_decode \
|
|
ffc
|
|
|
|
LIBS=../libcrypto
|
|
|
|
$UPLINKSRC=
|
|
$UPLINKDEF=
|
|
IF[{- !$disabled{uplink} -}]
|
|
$UPLINKSRC_common=../ms/uplink.c
|
|
$UPLINKSRC_x86=$UPLINKSRC_common uplink-x86.s
|
|
$UPLINKSRC_x86_64=$UPLINKSRC_common uplink-x86_64.s
|
|
$UPLINKSRC_ia64=$UPLINKSRC_common uplink-ia64.s
|
|
|
|
IF[$UPLINKSRC_{- $target{uplink_arch} -}]
|
|
$UPLINKSRC=$UPLINKSRC_{- $target{uplink_arch} -}
|
|
$UPLINKDEF=OPENSSL_USE_APPLINK
|
|
ENDIF
|
|
ENDIF
|
|
|
|
$CPUIDASM=mem_clr.c
|
|
$CPUIDDEF=
|
|
IF[{- !$disabled{asm} && $config{processor} ne '386' -}]
|
|
$CPUIDASM_x86=x86cpuid.s
|
|
|
|
$CPUIDASM_x86_64=x86_64cpuid.s
|
|
|
|
$CPUIDASM_ia64=ia64cpuid.s
|
|
|
|
$CPUIDASM_sparcv9=sparcv9cap.c sparccpuid.S
|
|
|
|
$CPUIDASM_alpha=alphacpuid.s
|
|
|
|
$CPUIDASM_s390x=s390xcap.c s390xcpuid.S
|
|
|
|
$CPUIDASM_armv4=armcap.c armv4cpuid.S
|
|
|
|
$CPUIDASM_aarch64=armcap.c arm64cpuid.S
|
|
|
|
$CPUIDASM_parisc11=pariscid.s
|
|
$CPUIDASM_parisc20_64=$CPUIDASM_parisc11
|
|
|
|
$CPUIDASM_ppc32=ppccpuid.s ppccap.c
|
|
$CPUIDASM_ppc64=$CPUIDASM_ppc32
|
|
|
|
$CPUIDASM_c64xplus=c64xpluscpuid.s
|
|
|
|
# Now that we have defined all the arch specific variables, use the
|
|
# appropriate one, and define the appropriate macros
|
|
IF[$CPUIDASM_{- $target{asm_arch} -}]
|
|
$CPUIDASM=$CPUIDASM_{- $target{asm_arch} -}
|
|
$CPUIDDEF=OPENSSL_CPUID_OBJ
|
|
ENDIF
|
|
ENDIF
|
|
|
|
# CPUID support. We need to add that explicitly in every shared library and
|
|
# provider module that uses it. ctype.c is included here because the CPUID
|
|
# uses functions from there to parse magic environment variables.
|
|
$CPUID_COMMON=$CPUIDASM cpuid.c ctype.c
|
|
INCLUDE[cpuid.o]=..
|
|
|
|
SOURCE[../libcrypto]=$CPUID_COMMON
|
|
DEFINE[../libcrypto]=$CPUIDDEF
|
|
SOURCE[../providers/libfips.a]=$CPUID_COMMON
|
|
DEFINE[../providers/libfips.a]=$CPUIDDEF
|
|
# We only need to include the CPUID stuff in the legacy provider when it's a
|
|
# separate module and it's dynamically linked with libcrypto. Otherwise, it
|
|
# already gets everything that the static libcrypto.a has, and doesn't need it
|
|
# added again.
|
|
IF[{- !$disabled{module} && !$disabled{shared} -}]
|
|
SOURCE[../providers/liblegacy.a]=$CPUID_COMMON
|
|
DEFINE[../providers/liblegacy.a]=$CPUIDDEF
|
|
ENDIF
|
|
|
|
# Implementations are now spread across several libraries, so the CPUID define
|
|
# need to be applied to all affected libraries and modules.
|
|
DEFINE[../providers/libcommon.a]=$CPUIDDEF
|
|
|
|
# The Core
|
|
$CORE_COMMON=provider_core.c provider_predefined.c \
|
|
core_fetch.c core_algorithm.c core_namemap.c self_test_core.c
|
|
|
|
SOURCE[../libcrypto]=$CORE_COMMON provider_conf.c
|
|
SOURCE[../providers/libfips.a]=$CORE_COMMON
|
|
|
|
# Central utilities
|
|
$UTIL_COMMON=\
|
|
cryptlib.c params.c params_from_text.c bsearch.c ex_data.c o_str.c \
|
|
threads_pthread.c threads_win.c threads_none.c initthread.c \
|
|
context.c sparse_array.c asn1_dsa.c packet.c param_build.c \
|
|
param_build_set.c der_writer.c passphrase.c threads_lib.c params_dup.c
|
|
|
|
SOURCE[../libcrypto]=$UTIL_COMMON \
|
|
mem.c mem_sec.c \
|
|
cversion.c info.c cpt_err.c ebcdic.c uid.c o_time.c o_dir.c \
|
|
o_fopen.c getenv.c o_init.c init.c trace.c provider.c \
|
|
punycode.c
|
|
SOURCE[../providers/libfips.a]=$UTIL_COMMON
|
|
|
|
SOURCE[../libcrypto]=$UPLINKSRC
|
|
DEFINE[../libcrypto]=$UPLINKDEF
|
|
|
|
DEPEND[info.o]=buildinf.h
|
|
DEPEND[cversion.o]=buildinf.h
|
|
GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)"
|
|
|
|
GENERATE[uplink-x86.s]=../ms/uplink-x86.pl
|
|
GENERATE[uplink-x86_64.s]=../ms/uplink-x86_64.pl
|
|
GENERATE[uplink-ia64.s]=../ms/uplink-ia64.pl
|
|
|
|
GENERATE[x86cpuid.s]=x86cpuid.pl
|
|
DEPEND[x86cpuid.s]=perlasm/x86asm.pl
|
|
|
|
GENERATE[x86_64cpuid.s]=x86_64cpuid.pl
|
|
|
|
GENERATE[ia64cpuid.s]=ia64cpuid.S
|
|
GENERATE[ppccpuid.s]=ppccpuid.pl
|
|
GENERATE[pariscid.s]=pariscid.pl
|
|
GENERATE[alphacpuid.s]=alphacpuid.pl
|
|
GENERATE[arm64cpuid.S]=arm64cpuid.pl
|
|
INCLUDE[arm64cpuid.o]=.
|
|
GENERATE[armv4cpuid.S]=armv4cpuid.pl
|
|
INCLUDE[armv4cpuid.o]=.
|
|
GENERATE[s390xcpuid.S]=s390xcpuid.pl
|
|
INCLUDE[s390xcpuid.o]=.
|
|
|
|
IF[{- $config{target} =~ /^(?:Cygwin|mingw|VC-|BC-)/ -}]
|
|
SHARED_SOURCE[../libcrypto]=dllmain.c
|
|
ENDIF
|