Browse Source

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)
master
Richard Levitte 3 years ago
parent
commit
5687e357c6
28 changed files with 70 additions and 36 deletions
  1. +1
    -1
      providers/build.info
  2. +1
    -1
      providers/common/build.info
  3. +0
    -5
      providers/common/exchange/build.info
  4. +0
    -5
      providers/common/kdfs/build.info
  5. +0
    -8
      providers/common/keymgmt/build.info
  6. +0
    -9
      providers/common/macs/build.info
  7. +0
    -7
      providers/common/signature/build.info
  8. +1
    -0
      providers/implementations/build.info
  9. +8
    -0
      providers/implementations/exchange/build.info
  10. +0
    -0
      providers/implementations/exchange/dh_exch.c
  11. +22
    -0
      providers/implementations/kdfs/build.info
  12. +0
    -0
      providers/implementations/kdfs/hkdf.c
  13. +0
    -0
      providers/implementations/kdfs/kbkdf.c
  14. +0
    -0
      providers/implementations/kdfs/pbkdf2.c
  15. +0
    -0
      providers/implementations/kdfs/pbkdf2.h
  16. +0
    -0
      providers/implementations/kdfs/pbkdf2_fips.c
  17. +0
    -0
      providers/implementations/kdfs/sskdf.c
  18. +0
    -0
      providers/implementations/kdfs/tls1_prf.c
  19. +12
    -0
      providers/implementations/keymgmt/build.info
  20. +0
    -0
      providers/implementations/keymgmt/dh_kmgmt.c
  21. +0
    -0
      providers/implementations/keymgmt/dsa_kmgmt.c
  22. +15
    -0
      providers/implementations/macs/build.info
  23. +0
    -0
      providers/implementations/macs/cmac_prov.c
  24. +0
    -0
      providers/implementations/macs/gmac_prov.c
  25. +0
    -0
      providers/implementations/macs/hmac_prov.c
  26. +0
    -0
      providers/implementations/macs/kmac_prov.c
  27. +10
    -0
      providers/implementations/signature/build.info
  28. +0
    -0
      providers/implementations/signature/dsa.c

+ 1
- 1
providers/build.info View 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


+ 1
- 1
providers/common/build.info View 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


+ 0
- 5
providers/common/exchange/build.info View File

@ -1,5 +0,0 @@
$GOAL=../../libimplementations.a
IF[{- !$disabled{dh} -}]
SOURCE[$GOAL]=dh_exch.c
ENDIF

+ 0
- 5
providers/common/kdfs/build.info View File

@ -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

+ 0
- 8
providers/common/keymgmt/build.info View File

@ -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

+ 0
- 9
providers/common/macs/build.info View File

@ -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

+ 0
- 7
providers/common/signature/build.info View File

@ -1,7 +0,0 @@
$GOAL=../../libimplementations.a
IF[{- !$disabled{dsa} -}]
SOURCE[$GOAL]=dsa.c
ENDIF

+ 1
- 0
providers/implementations/build.info View File

@ -0,0 +1 @@
SUBDIRS=macs kdfs exchange keymgmt signature

+ 8
- 0
providers/implementations/exchange/build.info View File

@ -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

providers/common/exchange/dh_exch.c → providers/implementations/exchange/dh_exch.c View File


+ 22
- 0
providers/implementations/kdfs/build.info View File

@ -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

providers/common/kdfs/hkdf.c → providers/implementations/kdfs/hkdf.c View File


providers/common/kdfs/kbkdf.c → providers/implementations/kdfs/kbkdf.c View File


providers/common/kdfs/pbkdf2.c → providers/implementations/kdfs/pbkdf2.c View File


providers/common/kdfs/pbkdf2.h → providers/implementations/kdfs/pbkdf2.h View File


providers/common/kdfs/pbkdf2_fips.c → providers/implementations/kdfs/pbkdf2_fips.c View File


providers/common/kdfs/sskdf.c → providers/implementations/kdfs/sskdf.c View File


providers/common/kdfs/tls1_prf.c → providers/implementations/kdfs/tls1_prf.c View File


+ 12
- 0
providers/implementations/keymgmt/build.info View File

@ -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

providers/common/keymgmt/dh_kmgmt.c → providers/implementations/keymgmt/dh_kmgmt.c View File


providers/common/keymgmt/dsa_kmgmt.c → providers/implementations/keymgmt/dsa_kmgmt.c View File


+ 15
- 0
providers/implementations/macs/build.info View File

@ -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

providers/common/macs/cmac_prov.c → providers/implementations/macs/cmac_prov.c View File


providers/common/macs/gmac_prov.c → providers/implementations/macs/gmac_prov.c View File


providers/common/macs/hmac_prov.c → providers/implementations/macs/hmac_prov.c View File


providers/common/macs/kmac_prov.c → providers/implementations/macs/kmac_prov.c View File


+ 10
- 0
providers/implementations/signature/build.info View File

@ -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

providers/common/signature/dsa.c → providers/implementations/signature/dsa.c View File


Loading…
Cancel
Save