Providers: move common exchange,kdfs,keymgmt,macs,signature
authorRichard Levitte <levitte@openssl.org>
Fri, 4 Oct 2019 08:24:09 +0000 (10:24 +0200)
committerRichard Levitte <levitte@openssl.org>
Thu, 10 Oct 2019 12:12:15 +0000 (14:12 +0200)
From providers/common/ to providers/implementations/

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

28 files changed:
providers/build.info
providers/common/build.info
providers/common/exchange/build.info [deleted file]
providers/common/kdfs/build.info [deleted file]
providers/common/keymgmt/build.info [deleted file]
providers/common/macs/build.info [deleted file]
providers/common/signature/build.info [deleted file]
providers/implementations/build.info [new file with mode: 0644]
providers/implementations/exchange/build.info [new file with mode: 0644]
providers/implementations/exchange/dh_exch.c [moved from providers/common/exchange/dh_exch.c with 100% similarity]
providers/implementations/kdfs/build.info [new file with mode: 0644]
providers/implementations/kdfs/hkdf.c [moved from providers/common/kdfs/hkdf.c with 100% similarity]
providers/implementations/kdfs/kbkdf.c [moved from providers/common/kdfs/kbkdf.c with 100% similarity]
providers/implementations/kdfs/pbkdf2.c [moved from providers/common/kdfs/pbkdf2.c with 100% similarity]
providers/implementations/kdfs/pbkdf2.h [moved from providers/common/kdfs/pbkdf2.h with 100% similarity]
providers/implementations/kdfs/pbkdf2_fips.c [moved from providers/common/kdfs/pbkdf2_fips.c with 100% similarity]
providers/implementations/kdfs/sskdf.c [moved from providers/common/kdfs/sskdf.c with 100% similarity]
providers/implementations/kdfs/tls1_prf.c [moved from providers/common/kdfs/tls1_prf.c with 100% similarity]
providers/implementations/keymgmt/build.info [new file with mode: 0644]
providers/implementations/keymgmt/dh_kmgmt.c [moved from providers/common/keymgmt/dh_kmgmt.c with 100% similarity]
providers/implementations/keymgmt/dsa_kmgmt.c [moved from providers/common/keymgmt/dsa_kmgmt.c with 100% similarity]
providers/implementations/macs/build.info [new file with mode: 0644]
providers/implementations/macs/cmac_prov.c [moved from providers/common/macs/cmac_prov.c with 100% similarity]
providers/implementations/macs/gmac_prov.c [moved from providers/common/macs/gmac_prov.c with 100% similarity]
providers/implementations/macs/hmac_prov.c [moved from providers/common/macs/hmac_prov.c with 100% similarity]
providers/implementations/macs/kmac_prov.c [moved from providers/common/macs/kmac_prov.c with 100% similarity]
providers/implementations/signature/build.info [new file with mode: 0644]
providers/implementations/signature/dsa.c [moved from providers/common/signature/dsa.c with 100% similarity]

index e951c62..973adac 100644 (file)
@@ -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
 
index 95c2fd1..4e662eb 100644 (file)
@@ -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
+++ /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
+++ /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
+++ /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
+++ /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
+++ /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
@@ -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
@@ -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/implementations/kdfs/build.info b/providers/implementations/kdfs/build.info
new file mode 100644 (file)
index 0000000..8800b12
--- /dev/null
@@ -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/implementations/keymgmt/build.info b/providers/implementations/keymgmt/build.info
new file mode 100644 (file)
index 0000000..dc6039b
--- /dev/null
@@ -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/implementations/macs/build.info b/providers/implementations/macs/build.info
new file mode 100644 (file)
index 0000000..d453809
--- /dev/null
@@ -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/implementations/signature/build.info b/providers/implementations/signature/build.info
new file mode 100644 (file)
index 0000000..a9687fc
--- /dev/null
@@ -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
+
+