[edk2-devel] [PATCH V6 00/13] CryptoPkg: Retire the deprecated functions

Gao, Zhichao posted 13 patches 1 week ago
Failed in applying to current master (apply log)
CryptoPkg/CryptoPkg.dsc                       |   46 +-
CryptoPkg/Driver/Crypto.c                     |  599 +++------
CryptoPkg/Include/Library/BaseCryptLib.h      |  809 ------------
.../Library/BaseCryptLib/BaseCryptLib.inf     |    7 +-
.../Library/BaseCryptLib/Cipher/CryptAes.c    |  114 --
.../BaseCryptLib/Cipher/CryptAesNull.c        |   52 -
.../Library/BaseCryptLib/Cipher/CryptArc4.c   |  205 ---
.../BaseCryptLib/Cipher/CryptArc4Null.c       |  124 --
.../Library/BaseCryptLib/Cipher/CryptTdes.c   |  364 ------
.../BaseCryptLib/Cipher/CryptTdesNull.c       |  160 ---
.../Library/BaseCryptLib/Hash/CryptMd4.c      |  223 ----
.../Library/BaseCryptLib/Hash/CryptMd4Null.c  |  143 --
.../Library/BaseCryptLib/Hmac/CryptHmacMd5.c  |  216 ---
.../BaseCryptLib/Hmac/CryptHmacMd5Null.c      |  139 --
.../Library/BaseCryptLib/Hmac/CryptHmacSha1.c |  216 ---
.../BaseCryptLib/Hmac/CryptHmacSha1Null.c     |  139 --
.../Library/BaseCryptLib/PeiCryptLib.inf      |   11 +-
.../Library/BaseCryptLib/PeiCryptLib.uni      |    8 +-
CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c |    7 +-
.../Library/BaseCryptLib/RuntimeCryptLib.inf  |   11 +-
.../Library/BaseCryptLib/RuntimeCryptLib.uni  |    8 +-
.../Library/BaseCryptLib/SmmCryptLib.inf      |   12 +-
.../Library/BaseCryptLib/SmmCryptLib.uni      |    8 +-
.../BaseCryptLibNull/BaseCryptLibNull.inf     |    5 -
.../BaseCryptLibNull/Cipher/CryptAesNull.c    |   52 -
.../BaseCryptLibNull/Cipher/CryptArc4Null.c   |  124 --
.../BaseCryptLibNull/Cipher/CryptTdesNull.c   |  160 ---
.../BaseCryptLibNull/Hash/CryptMd4Null.c      |  143 --
.../BaseCryptLibNull/Hmac/CryptHmacMd5Null.c  |  139 --
.../BaseCryptLibNull/Hmac/CryptHmacSha1Null.c |  139 --
.../BaseCryptLibOnProtocolPpi/CryptLib.c      | 1157 ++---------------
.../Library/Include/openssl/opensslconf.h     |  689 +++++-----
CryptoPkg/Library/OpensslLib/OpensslLib.inf   |   28 -
.../Library/OpensslLib/OpensslLibCrypto.inf   |   28 -
CryptoPkg/Library/OpensslLib/process_files.pl |    4 +
CryptoPkg/Private/Protocol/Crypto.h           |  709 ++--------
36 files changed, 793 insertions(+), 6205 deletions(-)
delete mode 100644 CryptoPkg/Library/BaseCryptLib/Cipher/CryptArc4.c
delete mode 100644 CryptoPkg/Library/BaseCryptLib/Cipher/CryptArc4Null.c
delete mode 100644 CryptoPkg/Library/BaseCryptLib/Cipher/CryptTdes.c
delete mode 100644 CryptoPkg/Library/BaseCryptLib/Cipher/CryptTdesNull.c
delete mode 100644 CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4.c
delete mode 100644 CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4Null.c
delete mode 100644 CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5.c
delete mode 100644 CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5Null.c
delete mode 100644 CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha1.c
delete mode 100644 CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha1Null.c
delete mode 100644 CryptoPkg/Library/BaseCryptLibNull/Cipher/CryptArc4Null.c
delete mode 100644 CryptoPkg/Library/BaseCryptLibNull/Cipher/CryptTdesNull.c
delete mode 100644 CryptoPkg/Library/BaseCryptLibNull/Hash/CryptMd4Null.c
delete mode 100644 CryptoPkg/Library/BaseCryptLibNull/Hmac/CryptHmacMd5Null.c
delete mode 100644 CryptoPkg/Library/BaseCryptLibNull/Hmac/CryptHmacSha1Null.c

[edk2-devel] [PATCH V6 00/13] CryptoPkg: Retire the deprecated functions

Posted by Gao, Zhichao 1 week ago
Retire below deprecated functions:
MD4, ARC4, TDES, AES ECB MODE, HMAC MD5, HMAC SHA1.

V2:
Seprate the MD5 and SHA1 changes to other patch set.
Change the deprecated function wrapper implementatuion in
EDKII_CRYPTO_PROTOCOL to call a dummy function to print debug
message and assert.

V3:
Remove the missing part of deprecated functions in V2.
Change the name field in the EDKII_CRYPTO_PROTOCOL to indicate
the function is deprecated and unsupported.

V4:
Fixed some typos.
Separate the change of OpensslLib and make the change with
process_files.pl.
Moving the incorrect changes of AES_ECB from HAMC MD5 patch
to Aes Ecb one.

V5:
Fix incorrect symbol in patch #2.
Separate the patch #8 OpensslLib changes and create it thru
change the process_files.pl.
Change the incorrect Author Name of patch #2, #4, #6.
Add function comment for the deprecated functions for patch #2,
#4, #6, #8, #10, #11.
The V5 patch set can also view at the fork branch:
https://github.com/ZhichaoGao/edk2/commits/deprecated_algo

V6:
Change the line ending of opensslconfig.h in patch #3, #5, #7,
#9.
Add one more patch #12 to convert the line ending from '\n' to '\r\n'
to align the format and match the patch check.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Philippe Mathieu-Daude <philmd@redhat.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>

Zhichao Gao (13):
  CryptoPkg/CryptoDxe: Add function to indicate the deprecated algorithm
  CryptoPkg/BaseCrpytLib: Retire MD4 algorithm
  CryptoPkg/OpensslLib: Set MD4 disable in OpensslLib
  CryptoPkg/BaseCryptLib: Retire ARC4 algorithm
  CryptoPkg/OpensslLib: Set ARC4 disable in OpensslLib
  CryptoPkg/BaseCryptLib: Retire the TDES algorithm
  CryptoPkg/OpensslLib: Set TDES disable in OpensslLib
  CryptoPkg/BaseCryptLib: Retire Aes Ecb mode algorithm
  CryptoPkg/OpensslLib: Remove the Aes Ecb file in the OpensslLib
  CryptoPkg/BaseCryptLib: Retire HMAC MD5 algorithm
  CryptoPkg/BaseCryptLib: Retire HMAC SHA1 algorithm
  CryptoPkg/opensslconf.h: Covert the file ending to dos format
  CryptoPkg/Crypto.h: Update the version of Crypto Driver

 CryptoPkg/CryptoPkg.dsc                       |   46 +-
 CryptoPkg/Driver/Crypto.c                     |  599 +++------
 CryptoPkg/Include/Library/BaseCryptLib.h      |  809 ------------
 .../Library/BaseCryptLib/BaseCryptLib.inf     |    7 +-
 .../Library/BaseCryptLib/Cipher/CryptAes.c    |  114 --
 .../BaseCryptLib/Cipher/CryptAesNull.c        |   52 -
 .../Library/BaseCryptLib/Cipher/CryptArc4.c   |  205 ---
 .../BaseCryptLib/Cipher/CryptArc4Null.c       |  124 --
 .../Library/BaseCryptLib/Cipher/CryptTdes.c   |  364 ------
 .../BaseCryptLib/Cipher/CryptTdesNull.c       |  160 ---
 .../Library/BaseCryptLib/Hash/CryptMd4.c      |  223 ----
 .../Library/BaseCryptLib/Hash/CryptMd4Null.c  |  143 --
 .../Library/BaseCryptLib/Hmac/CryptHmacMd5.c  |  216 ---
 .../BaseCryptLib/Hmac/CryptHmacMd5Null.c      |  139 --
 .../Library/BaseCryptLib/Hmac/CryptHmacSha1.c |  216 ---
 .../BaseCryptLib/Hmac/CryptHmacSha1Null.c     |  139 --
 .../Library/BaseCryptLib/PeiCryptLib.inf      |   11 +-
 .../Library/BaseCryptLib/PeiCryptLib.uni      |    8 +-
 CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c |    7 +-
 .../Library/BaseCryptLib/RuntimeCryptLib.inf  |   11 +-
 .../Library/BaseCryptLib/RuntimeCryptLib.uni  |    8 +-
 .../Library/BaseCryptLib/SmmCryptLib.inf      |   12 +-
 .../Library/BaseCryptLib/SmmCryptLib.uni      |    8 +-
 .../BaseCryptLibNull/BaseCryptLibNull.inf     |    5 -
 .../BaseCryptLibNull/Cipher/CryptAesNull.c    |   52 -
 .../BaseCryptLibNull/Cipher/CryptArc4Null.c   |  124 --
 .../BaseCryptLibNull/Cipher/CryptTdesNull.c   |  160 ---
 .../BaseCryptLibNull/Hash/CryptMd4Null.c      |  143 --
 .../BaseCryptLibNull/Hmac/CryptHmacMd5Null.c  |  139 --
 .../BaseCryptLibNull/Hmac/CryptHmacSha1Null.c |  139 --
 .../BaseCryptLibOnProtocolPpi/CryptLib.c      | 1157 ++---------------
 .../Library/Include/openssl/opensslconf.h     |  689 +++++-----
 CryptoPkg/Library/OpensslLib/OpensslLib.inf   |   28 -
 .../Library/OpensslLib/OpensslLibCrypto.inf   |   28 -
 CryptoPkg/Library/OpensslLib/process_files.pl |    4 +
 CryptoPkg/Private/Protocol/Crypto.h           |  709 ++--------
 36 files changed, 793 insertions(+), 6205 deletions(-)
 delete mode 100644 CryptoPkg/Library/BaseCryptLib/Cipher/CryptArc4.c
 delete mode 100644 CryptoPkg/Library/BaseCryptLib/Cipher/CryptArc4Null.c
 delete mode 100644 CryptoPkg/Library/BaseCryptLib/Cipher/CryptTdes.c
 delete mode 100644 CryptoPkg/Library/BaseCryptLib/Cipher/CryptTdesNull.c
 delete mode 100644 CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4.c
 delete mode 100644 CryptoPkg/Library/BaseCryptLib/Hash/CryptMd4Null.c
 delete mode 100644 CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5.c
 delete mode 100644 CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacMd5Null.c
 delete mode 100644 CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha1.c
 delete mode 100644 CryptoPkg/Library/BaseCryptLib/Hmac/CryptHmacSha1Null.c
 delete mode 100644 CryptoPkg/Library/BaseCryptLibNull/Cipher/CryptArc4Null.c
 delete mode 100644 CryptoPkg/Library/BaseCryptLibNull/Cipher/CryptTdesNull.c
 delete mode 100644 CryptoPkg/Library/BaseCryptLibNull/Hash/CryptMd4Null.c
 delete mode 100644 CryptoPkg/Library/BaseCryptLibNull/Hmac/CryptHmacMd5Null.c
 delete mode 100644 CryptoPkg/Library/BaseCryptLibNull/Hmac/CryptHmacSha1Null.c

-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#59629): https://edk2.groups.io/g/devel/message/59629
Mute This Topic: https://groups.io/mt/74221323/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-