Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

CryptoPkg: Support for SHA384 & SHA512 RSA signing schemes 

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2389

Currently RSA signing scheme support is available for MD5, SHA-1 or
SHA-256 algorithms.The fix is to extend this support for SHA384 and
SHA512.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>

Signed-off-by: Pavana.K <pavana.k@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
This commit is contained in:
Pavana.K 2020-01-02 20:30:27 +00:00 committed by mergify[bot]
parent 396e791059
commit c9d7262843
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaBasic.c
View File

@ -7,7 +7,7 @@
3) RsaSetKey 3) RsaSetKey
4) RsaPkcs1Verify 4) RsaPkcs1Verify
Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2020, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
@ -250,7 +250,7 @@ RsaSetKey (
If RsaContext is NULL, then return FALSE. If RsaContext is NULL, then return FALSE.
If MessageHash is NULL, then return FALSE. If MessageHash is NULL, then return FALSE.
If Signature is NULL, then return FALSE. If Signature is NULL, then return FALSE.
If HashSize is not equal to the size of MD5, SHA-1 or SHA-256 digest, then return FALSE. If HashSize is not equal to the size of MD5, SHA-1, SHA-256, SHA-384 or SHA-512 digest, then return FALSE.
@param[in] RsaContext Pointer to RSA context for signature verification. @param[in] RsaContext Pointer to RSA context for signature verification.
@param[in] MessageHash Pointer to octet message hash to be checked. @param[in] MessageHash Pointer to octet message hash to be checked.
@ -288,7 +288,7 @@ RsaPkcs1Verify (
// //
// Determine the message digest algorithm according to digest size. // Determine the message digest algorithm according to digest size.
// Only MD5, SHA-1 or SHA-256 algorithm is supported. // Only MD5, SHA-1, SHA-256, SHA-384 or SHA-512 algorithm is supported.
// //
switch (HashSize) { switch (HashSize) {
case MD5_DIGEST_SIZE: case MD5_DIGEST_SIZE:
@ -303,6 +303,14 @@ RsaPkcs1Verify (
DigestType = NID_sha256; DigestType = NID_sha256;
break; break;
case SHA384_DIGEST_SIZE:
DigestType = NID_sha384;
break;
case SHA512_DIGEST_SIZE:
DigestType = NID_sha512;
break;
default: default:
return FALSE; return FALSE;
} }

14
CryptoPkg/Library/BaseCryptLib/Pk/CryptRsaExt.c
View File

@ -7,7 +7,7 @@
3) RsaCheckKey 3) RsaCheckKey
4) RsaPkcs1Sign 4) RsaPkcs1Sign
Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2020, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
**/ **/
@ -276,7 +276,7 @@ RsaCheckKey (
If RsaContext is NULL, then return FALSE. If RsaContext is NULL, then return FALSE.
If MessageHash is NULL, then return FALSE. If MessageHash is NULL, then return FALSE.
If HashSize is not equal to the size of MD5, SHA-1 or SHA-256 digest, then return FALSE. If HashSize is not equal to the size of MD5, SHA-1, SHA-256, SHA-384 or SHA-512 digest, then return FALSE.
If SigSize is large enough but Signature is NULL, then return FALSE. If SigSize is large enough but Signature is NULL, then return FALSE.
@param[in] RsaContext Pointer to RSA context for signature generation. @param[in] RsaContext Pointer to RSA context for signature generation.
@ -326,7 +326,7 @@ RsaPkcs1Sign (
// //
// Determine the message digest algorithm according to digest size. // Determine the message digest algorithm according to digest size.
// Only MD5, SHA-1 or SHA-256 algorithm is supported. // Only MD5, SHA-1, SHA-256, SHA-384 or SHA-512 algorithm is supported.
// //
switch (HashSize) { switch (HashSize) {
case MD5_DIGEST_SIZE: case MD5_DIGEST_SIZE:
@ -341,6 +341,14 @@ RsaPkcs1Sign (
DigestType = NID_sha256; DigestType = NID_sha256;
break; break;
case SHA384_DIGEST_SIZE:
DigestType = NID_sha384;
break;
case SHA512_DIGEST_SIZE:
DigestType = NID_sha512;
break;
default: default:
return FALSE; return FALSE;
} }