Providers: move common exchange,kdfs,keymgmt,macs,signature

From providers/common/ to providers/implementations/

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10088)

diff --git a/providers/build.info b/providers/build.info
index e951c6229db65fe2f23d0a99fda3d7fef75b3545..973adac5c74992479f9abd124d9793175c14e107 100644 (file)
--- a/providers/build.info
+++ b/providers/build.info
@@ -28,7 +28,7 @@
 #                       FIPS_MODE undefined.  The default and legacy
 #                       providers use this.
 
-SUBDIRS=common default
+SUBDIRS=common default implementations
 
 INCLUDE[../libcrypto]=common/include
 

diff --git a/providers/common/build.info b/providers/common/build.info
index 95c2fd107e22e301c65d0dc5912f3daef55486f5..4e662eb97a6a7c565739cbf344262856c53afde3 100644 (file)
--- a/providers/common/build.info
+++ b/providers/common/build.info
@@ -1,4 +1,4 @@
-SUBDIRS=digests ciphers macs kdfs exchange keymgmt signature
+SUBDIRS=digests ciphers
 
 SOURCE[../libcommon.a]=provider_err.c provlib.c
 $FIPSCOMMON=provider_util.c

diff --git a/providers/common/exchange/build.info b/providers/common/exchange/build.info
deleted file mode 100644 (file)
index 90ea0c9..0000000
--- a/providers/common/exchange/build.info
+++ /dev/null
@@ -1,5 +0,0 @@
-$GOAL=../../libimplementations.a
-
-IF[{- !$disabled{dh} -}]
-  SOURCE[$GOAL]=dh_exch.c
-ENDIF

diff --git a/providers/common/kdfs/build.info b/providers/common/kdfs/build.info
deleted file mode 100644 (file)
index b2b354d..0000000
--- a/providers/common/kdfs/build.info
+++ /dev/null
@@ -1,5 +0,0 @@
-$GOAL=../../libimplementations.a
-
-SOURCE[$GOAL]=tls1_prf.c hkdf.c kbkdf.c pbkdf2.c sskdf.c
-SOURCE[../../libfips.a]=pbkdf2_fips.c
-SOURCE[../../libnonfips.a]=pbkdf2_fips.c

diff --git a/providers/common/keymgmt/build.info b/providers/common/keymgmt/build.info
deleted file mode 100644 (file)
index 533c489..0000000
--- a/providers/common/keymgmt/build.info
+++ /dev/null
@@ -1,8 +0,0 @@
-$GOAL=../../libimplementations.a
-
-IF[{- !$disabled{dh} -}]
-  SOURCE[$GOAL]=dh_kmgmt.c
-ENDIF
-IF[{- !$disabled{dsa} -}]
-  SOURCE[$GOAL]=dsa_kmgmt.c
-ENDIF

diff --git a/providers/common/macs/build.info b/providers/common/macs/build.info
deleted file mode 100644 (file)
index 1eafe70..0000000
--- a/providers/common/macs/build.info
+++ /dev/null
@@ -1,9 +0,0 @@
-$GOAL=../../libimplementations.a
-
-$COMMON=gmac_prov.c hmac_prov.c kmac_prov.c
-
-IF[{- !$disabled{cmac} -}]
-  $COMMON=$COMMON cmac_prov.c
-ENDIF
-
-SOURCE[$GOAL]=$COMMON

diff --git a/providers/common/signature/build.info b/providers/common/signature/build.info
deleted file mode 100644 (file)
index 496fb7d..0000000
--- a/providers/common/signature/build.info
+++ /dev/null
@@ -1,7 +0,0 @@
-$GOAL=../../libimplementations.a
-
-IF[{- !$disabled{dsa} -}]
-  SOURCE[$GOAL]=dsa.c
-ENDIF
-
-

diff --git a/providers/implementations/build.info b/providers/implementations/build.info
new file mode 100644 (file)
index 0000000..1170ef9
--- /dev/null
+++ b/providers/implementations/build.info
@@ -0,0 +1 @@
+SUBDIRS=macs kdfs exchange keymgmt signature

diff --git a/providers/implementations/exchange/build.info b/providers/implementations/exchange/build.info
new file mode 100644 (file)
index 0000000..fdedb86
--- /dev/null
+++ b/providers/implementations/exchange/build.info
@@ -0,0 +1,8 @@
+# We make separate GOAL variables for each algorithm, to make it easy to
+# switch each to the Legacy provider when needed.
+
+$DH_GOAL=../../libimplementations.a
+
+IF[{- !$disabled{dh} -}]
+  SOURCE[$DH_GOAL]=dh_exch.c
+ENDIF

diff --git a/providers/common/exchange/dh_exch.c b/providers/implementations/exchange/dh_exch.c
similarity index 100%
rename from providers/common/exchange/dh_exch.c
rename to providers/implementations/exchange/dh_exch.c

diff --git a/providers/implementations/kdfs/build.info b/providers/implementations/kdfs/build.info
new file mode 100644 (file)
index 0000000..8800b12
--- /dev/null
+++ b/providers/implementations/kdfs/build.info
@@ -0,0 +1,22 @@
+# We make separate GOAL variables for each algorithm, to make it easy to
+# switch each to the Legacy provider when needed.
+
+$TLS1_PRF_GOAL=../../libimplementations.a
+$HKDF_GOAL=../../libimplementations.a
+$KBKDF_GOAL=../../libimplementations.a
+$PBKDF2_GOAL=../../libimplementations.a
+$SSKDF_GOAL=../../libimplementations.a
+
+SOURCE[$TLS1_PRF_GOAL]=tls1_prf.c
+
+SOURCE[$HKDF_GOAL]=hkdf.c
+
+SOURCE[$KBKDF_GOAL]=kbkdf.c
+
+SOURCE[$PBKDF2_GOAL]=pbkdf2.c
+# Extra code to satisfy the FIPS and non-FIPS separation.
+# When the PBKDF2 moves to legacy, this can be removed.
+SOURCE[../../libfips.a]=pbkdf2_fips.c
+SOURCE[../../libnonfips.a]=pbkdf2_fips.c
+
+SOURCE[$SSKDF_GOAL]=sskdf.c

diff --git a/providers/common/kdfs/hkdf.c b/providers/implementations/kdfs/hkdf.c
similarity index 100%
rename from providers/common/kdfs/hkdf.c
rename to providers/implementations/kdfs/hkdf.c

diff --git a/providers/common/kdfs/kbkdf.c b/providers/implementations/kdfs/kbkdf.c
similarity index 100%
rename from providers/common/kdfs/kbkdf.c
rename to providers/implementations/kdfs/kbkdf.c

diff --git a/providers/common/kdfs/pbkdf2.c b/providers/implementations/kdfs/pbkdf2.c
similarity index 100%
rename from providers/common/kdfs/pbkdf2.c
rename to providers/implementations/kdfs/pbkdf2.c

diff --git a/providers/common/kdfs/pbkdf2.h b/providers/implementations/kdfs/pbkdf2.h
similarity index 100%
rename from providers/common/kdfs/pbkdf2.h
rename to providers/implementations/kdfs/pbkdf2.h

diff --git a/providers/common/kdfs/pbkdf2_fips.c b/providers/implementations/kdfs/pbkdf2_fips.c
similarity index 100%
rename from providers/common/kdfs/pbkdf2_fips.c
rename to providers/implementations/kdfs/pbkdf2_fips.c

diff --git a/providers/common/kdfs/sskdf.c b/providers/implementations/kdfs/sskdf.c
similarity index 100%
rename from providers/common/kdfs/sskdf.c
rename to providers/implementations/kdfs/sskdf.c

diff --git a/providers/common/kdfs/tls1_prf.c b/providers/implementations/kdfs/tls1_prf.c
similarity index 100%
rename from providers/common/kdfs/tls1_prf.c
rename to providers/implementations/kdfs/tls1_prf.c

diff --git a/providers/implementations/keymgmt/build.info b/providers/implementations/keymgmt/build.info
new file mode 100644 (file)
index 0000000..dc6039b
--- /dev/null
+++ b/providers/implementations/keymgmt/build.info
@@ -0,0 +1,12 @@
+# We make separate GOAL variables for each algorithm, to make it easy to
+# switch each to the Legacy provider when needed.
+
+$DH_GOAL=../../libimplementations.a
+$DSA_GOAL=../../libimplementations.a
+
+IF[{- !$disabled{dh} -}]
+  SOURCE[$DH_GOAL]=dh_kmgmt.c
+ENDIF
+IF[{- !$disabled{dsa} -}]
+  SOURCE[$DSA_GOAL]=dsa_kmgmt.c
+ENDIF

diff --git a/providers/common/keymgmt/dh_kmgmt.c b/providers/implementations/keymgmt/dh_kmgmt.c
similarity index 100%
rename from providers/common/keymgmt/dh_kmgmt.c
rename to providers/implementations/keymgmt/dh_kmgmt.c

diff --git a/providers/common/keymgmt/dsa_kmgmt.c b/providers/implementations/keymgmt/dsa_kmgmt.c
similarity index 100%
rename from providers/common/keymgmt/dsa_kmgmt.c
rename to providers/implementations/keymgmt/dsa_kmgmt.c

diff --git a/providers/implementations/macs/build.info b/providers/implementations/macs/build.info
new file mode 100644 (file)
index 0000000..d453809
--- /dev/null
+++ b/providers/implementations/macs/build.info
@@ -0,0 +1,15 @@
+# We make separate GOAL variables for each algorithm, to make it easy to
+# switch each to the Legacy provider when needed.
+
+$GMAC_GOAL=../../libimplementations.a
+$HMAC_GOAL=../../libimplementations.a
+$KMAC_GOAL=../../libimplementations.a
+$CMAC_GOAL=../../libimplementations.a
+
+SOURCE[$GMAC_GOAL]=gmac_prov.c
+SOURCE[$HMAC_GOAL]=hmac_prov.c
+SOURCE[$KMAC_GOAL]=kmac_prov.c
+
+IF[{- !$disabled{cmac} -}]
+  SOURCE[$CMAC_GOAL]=cmac_prov.c
+ENDIF

diff --git a/providers/common/macs/cmac_prov.c b/providers/implementations/macs/cmac_prov.c
similarity index 100%
rename from providers/common/macs/cmac_prov.c
rename to providers/implementations/macs/cmac_prov.c

diff --git a/providers/common/macs/gmac_prov.c b/providers/implementations/macs/gmac_prov.c
similarity index 100%
rename from providers/common/macs/gmac_prov.c
rename to providers/implementations/macs/gmac_prov.c

diff --git a/providers/common/macs/hmac_prov.c b/providers/implementations/macs/hmac_prov.c
similarity index 100%
rename from providers/common/macs/hmac_prov.c
rename to providers/implementations/macs/hmac_prov.c

diff --git a/providers/common/macs/kmac_prov.c b/providers/implementations/macs/kmac_prov.c
similarity index 100%
rename from providers/common/macs/kmac_prov.c
rename to providers/implementations/macs/kmac_prov.c

diff --git a/providers/implementations/signature/build.info b/providers/implementations/signature/build.info
new file mode 100644 (file)
index 0000000..a9687fc
--- /dev/null
+++ b/providers/implementations/signature/build.info
@@ -0,0 +1,10 @@
+# We make separate GOAL variables for each algorithm, to make it easy to
+# switch each to the Legacy provider when needed.
+
+$DSA_GOAL=../../libimplementations.a
+
+IF[{- !$disabled{dsa} -}]
+  SOURCE[$DSA_GOAL]=dsa.c
+ENDIF
+
+

diff --git a/providers/common/signature/dsa.c b/providers/implementations/signature/dsa.c
similarity index 100%
rename from providers/common/signature/dsa.c
rename to providers/implementations/signature/dsa.c