From e42cf7180b4fb32e985f15484e04c7fb8afc11ab Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 4 Oct 2019 11:28:20 +0200 Subject: [PATCH] Providers: move default kdfs,macs From providers/default/ to providers/implementations/ Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/10088) --- providers/default/build.info | 2 +- providers/default/kdfs/build.info | 2 -- providers/default/macs/build.info | 13 ------------- providers/implementations/kdfs/build.info | 7 +++++++ .../{default => implementations}/kdfs/scrypt.c | 0 .../{default => implementations}/kdfs/sshkdf.c | 0 .../{default => implementations}/kdfs/x942kdf.c | 0 .../macs/blake2_mac_impl.c | 0 .../macs/blake2b_mac.c | 0 .../macs/blake2s_mac.c | 0 providers/implementations/macs/build.info | 17 +++++++++++++++++ .../macs/poly1305_prov.c | 0 .../macs/siphash_prov.c | 0 13 files changed, 25 insertions(+), 16 deletions(-) delete mode 100644 providers/default/kdfs/build.info delete mode 100644 providers/default/macs/build.info rename providers/{default => implementations}/kdfs/scrypt.c (100%) rename providers/{default => implementations}/kdfs/sshkdf.c (100%) rename providers/{default => implementations}/kdfs/x942kdf.c (100%) rename providers/{default => implementations}/macs/blake2_mac_impl.c (100%) rename providers/{default => implementations}/macs/blake2b_mac.c (100%) rename providers/{default => implementations}/macs/blake2s_mac.c (100%) rename providers/{default => implementations}/macs/poly1305_prov.c (100%) rename providers/{default => implementations}/macs/siphash_prov.c (100%) diff --git a/providers/default/build.info b/providers/default/build.info index 31ae507965..67b4d3a977 100644 --- a/providers/default/build.info +++ b/providers/default/build.info @@ -1,4 +1,4 @@ -SUBDIRS=digests kdfs macs ciphers +SUBDIRS=digests ciphers $GOAL=../../libcrypto SOURCE[$GOAL]=defltprov.c INCLUDE[$GOAL]=include diff --git a/providers/default/kdfs/build.info b/providers/default/kdfs/build.info deleted file mode 100644 index 90b127d731..0000000000 --- a/providers/default/kdfs/build.info +++ /dev/null @@ -1,2 +0,0 @@ -$GOAL=../../libimplementations.a -SOURCE[$GOAL]=scrypt.c sshkdf.c x942kdf.c diff --git a/providers/default/macs/build.info b/providers/default/macs/build.info deleted file mode 100644 index 821a3d467b..0000000000 --- a/providers/default/macs/build.info +++ /dev/null @@ -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 diff --git a/providers/implementations/kdfs/build.info b/providers/implementations/kdfs/build.info index 8800b12f7e..dee8f532fa 100644 --- a/providers/implementations/kdfs/build.info +++ b/providers/implementations/kdfs/build.info @@ -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 diff --git a/providers/default/kdfs/scrypt.c b/providers/implementations/kdfs/scrypt.c similarity index 100% rename from providers/default/kdfs/scrypt.c rename to providers/implementations/kdfs/scrypt.c diff --git a/providers/default/kdfs/sshkdf.c b/providers/implementations/kdfs/sshkdf.c similarity index 100% rename from providers/default/kdfs/sshkdf.c rename to providers/implementations/kdfs/sshkdf.c diff --git a/providers/default/kdfs/x942kdf.c b/providers/implementations/kdfs/x942kdf.c similarity index 100% rename from providers/default/kdfs/x942kdf.c rename to providers/implementations/kdfs/x942kdf.c diff --git a/providers/default/macs/blake2_mac_impl.c b/providers/implementations/macs/blake2_mac_impl.c similarity index 100% rename from providers/default/macs/blake2_mac_impl.c rename to providers/implementations/macs/blake2_mac_impl.c diff --git a/providers/default/macs/blake2b_mac.c b/providers/implementations/macs/blake2b_mac.c similarity index 100% rename from providers/default/macs/blake2b_mac.c rename to providers/implementations/macs/blake2b_mac.c diff --git a/providers/default/macs/blake2s_mac.c b/providers/implementations/macs/blake2s_mac.c similarity index 100% rename from providers/default/macs/blake2s_mac.c rename to providers/implementations/macs/blake2s_mac.c diff --git a/providers/implementations/macs/build.info b/providers/implementations/macs/build.info index d4538098e0..07c40d354b 100644 --- a/providers/implementations/macs/build.info +++ b/providers/implementations/macs/build.info @@ -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 diff --git a/providers/default/macs/poly1305_prov.c b/providers/implementations/macs/poly1305_prov.c similarity index 100% rename from providers/default/macs/poly1305_prov.c rename to providers/implementations/macs/poly1305_prov.c diff --git a/providers/default/macs/siphash_prov.c b/providers/implementations/macs/siphash_prov.c similarity index 100% rename from providers/default/macs/siphash_prov.c rename to providers/implementations/macs/siphash_prov.c -- 2.25.1