From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com []) by mx.groups.io with SMTP id smtpd.web11.2684.1606280890536499845 for ; Tue, 24 Nov 2020 21:08:10 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: michael.d.kinney@intel.com) IronPort-SDR: lTY5mpSxcUJ54RpvaNQcNmp2ezp8bhs2iMJqzwnRfDFdpVvmLt7U/jVE6aR3avsHWMlQxtC/MC 5CtYlebue5VQ== X-IronPort-AV: E=McAfee;i="6000,8403,9815"; a="168558277" X-IronPort-AV: E=Sophos;i="5.78,368,1599548400"; d="scan'208";a="168558277" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2020 21:08:10 -0800 IronPort-SDR: up6SBrLYAJ1jRMAm8UQN9LIkMnPFM33ifhp9Z3NHoAIQTU9t8vnb8ha5An5vT+URSduIVcD/z7 UjDL0hzJjJag== X-IronPort-AV: E=Sophos;i="5.78,368,1599548400"; d="scan'208";a="332842115" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.212.122.89]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2020 21:08:09 -0800 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Xiaoyu Lu , Guomin Jiang Subject: [Patch v2][edk2-stable202011 4/4] CryptoPkg/Test/UnitTest/Library/BaseCryptLib: Fix MD5 Hash tests Date: Tue, 24 Nov 2020 21:07:58 -0800 Message-Id: <20201125050758.1507-5-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.29.2.windows.2 In-Reply-To: <20201125050758.1507-1-michael.d.kinney@intel.com> References: <20201125050758.1507-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Only include MD5 unit tests if ENABLE_MD5_DEPRECATED_INTERFACES is defined. Cc: Jiewen Yao Cc: Jian J Wang Cc: Xiaoyu Lu Cc: Guomin Jiang Signed-off-by: Michael D Kinney --- CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c index bc47c5736246..24919053324a 100644 --- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c +++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/HashTests.c @@ -21,10 +21,11 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *HashData = "abc"; // // Result for MD5("abc"). (From "A.5 Test suite" of IETF RFC1321) // +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 Md5Digest[MD5_DIGEST_SIZE] = { 0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0, 0xd6, 0x96, 0x3f, 0x7d, 0x28, 0xe1, 0x7f, 0x72 - }; +#endif // // Result for SHA-1("abc"). (From "A.1 SHA-1 Example" of NIST FIPS 180-2) @@ -107,7 +108,9 @@ typedef struct { VOID *HashCtx; } HASH_TEST_CONTEXT; +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES HASH_TEST_CONTEXT mMd5TestCtx = {MD5_DIGEST_SIZE, Md5GetContextSize, Md5Init, Md5Update, Md5Final, Md5HashAll, Md5Digest}; +#endif HASH_TEST_CONTEXT mSha1TestCtx = {SHA1_DIGEST_SIZE, Sha1GetContextSize, Sha1Init, Sha1Update, Sha1Final, Sha1HashAll, Sha1Digest}; HASH_TEST_CONTEXT mSha256TestCtx = {SHA256_DIGEST_SIZE, Sha256GetContextSize, Sha256Init, Sha256Update, Sha256Final, Sha256HashAll, Sha256Digest}; HASH_TEST_CONTEXT mSha384TestCtx = {SHA384_DIGEST_SIZE, Sha384GetContextSize, Sha384Init, Sha384Update, Sha384Final, Sha384HashAll, Sha384Digest}; @@ -187,7 +190,9 @@ TEST_DESC mHashTest[] = { // // -----Description----------------Class---------------------Function---------------Pre------------------Post------------Context // +#ifdef ENABLE_MD5_DEPRECATED_INTERFACES {"TestVerifyMd5()", "CryptoPkg.BaseCryptLib.Hash", TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mMd5TestCtx}, +#endif {"TestVerifySha1()", "CryptoPkg.BaseCryptLib.Hash", TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha1TestCtx}, {"TestVerifySha256()", "CryptoPkg.BaseCryptLib.Hash", TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha256TestCtx}, {"TestVerifySha384()", "CryptoPkg.BaseCryptLib.Hash", TestVerifyHash, TestVerifyHashPreReq, TestVerifyHashCleanUp, &mSha384TestCtx}, -- 2.29.2.windows.2