Providers: move default kdfs,macs

From providers/default/ to providers/implementations/

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10088)
This commit is contained in:
Richard Levitte 2019-10-04 11:28:20 +02:00
parent 5687e357c6
commit e42cf7180b
13 changed files with 25 additions and 16 deletions

View File

@ -1,4 +1,4 @@
SUBDIRS=digests kdfs macs ciphers
SUBDIRS=digests ciphers
$GOAL=../../libcrypto
SOURCE[$GOAL]=defltprov.c
INCLUDE[$GOAL]=include

View File

@ -1,2 +0,0 @@
$GOAL=../../libimplementations.a
SOURCE[$GOAL]=scrypt.c sshkdf.c x942kdf.c

View File

@ -1,13 +0,0 @@
$GOAL=../../libimplementations.a
IF[{- !$disabled{blake2} -}]
SOURCE[$GOAL]=blake2b_mac.c blake2s_mac.c
ENDIF
IF[{- !$disabled{siphash} -}]
SOURCE[$GOAL]=siphash_prov.c
ENDIF
IF[{- !$disabled{poly1305} -}]
SOURCE[$GOAL]=poly1305_prov.c
ENDIF

View File

@ -6,6 +6,9 @@ $HKDF_GOAL=../../libimplementations.a
$KBKDF_GOAL=../../libimplementations.a
$PBKDF2_GOAL=../../libimplementations.a
$SSKDF_GOAL=../../libimplementations.a
$SCRYPT_GOAL=../../libimplementations.a
$SSHKDF_GOAL=../../libimplementations.a
$X942KDF_GOAL=../../libimplementations.a
SOURCE[$TLS1_PRF_GOAL]=tls1_prf.c
@ -20,3 +23,7 @@ SOURCE[../../libfips.a]=pbkdf2_fips.c
SOURCE[../../libnonfips.a]=pbkdf2_fips.c
SOURCE[$SSKDF_GOAL]=sskdf.c
SOURCE[$SCRYPT_GOAL]=scrypt.c
SOURCE[$SSHKDF_GOAL]=sshkdf.c
SOURCE[$X942KDF_GOAL]=x942kdf.c

View File

@ -5,6 +5,9 @@ $GMAC_GOAL=../../libimplementations.a
$HMAC_GOAL=../../libimplementations.a
$KMAC_GOAL=../../libimplementations.a
$CMAC_GOAL=../../libimplementations.a
$BLAKE2_GOAL=../../libimplementations.a
$SIPHASH_GOAL=../../libimplementations.a
$POLY1305_GOAL=../../libimplementations.a
SOURCE[$GMAC_GOAL]=gmac_prov.c
SOURCE[$HMAC_GOAL]=hmac_prov.c
@ -13,3 +16,17 @@ SOURCE[$KMAC_GOAL]=kmac_prov.c
IF[{- !$disabled{cmac} -}]
SOURCE[$CMAC_GOAL]=cmac_prov.c
ENDIF
$GOAL=../../libimplementations.a
IF[{- !$disabled{blake2} -}]
SOURCE[$BLAKE2_GOAL]=blake2b_mac.c blake2s_mac.c
ENDIF
IF[{- !$disabled{siphash} -}]
SOURCE[$SIPHASH_GOAL]=siphash_prov.c
ENDIF
IF[{- !$disabled{poly1305} -}]
SOURCE[$POLY1305_GOAL]=poly1305_prov.c
ENDIF