uefi-ref/edk2
1
0
Fork 0
mirror of https://github.com/tianocore/edk2 synced 2026-08-27 00:23:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fix_2_wcm_scan_timer

Browse source
This commit is contained in:
mergify[bot] 2025-05-27 23:14:30 +00:00 • committed by GitHub
commit 7c204d72cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CryptoPkg/Driver/Crypto.c
View file

@ -3220,11 +3220,11 @@ CryptoServiceX509GetSignatureAlgorithm (
@param[in, out] ExtensionDataSize Extension bytes size.
@retval TRUE The certificate Extension data retrieved successfully.
@retval TRUE The Certificate Extension is found, but the oid extension is not found.
@retval FALSE If Cert is NULL.
If ExtensionDataSize is NULL.
If ExtensionData is not NULL and *ExtensionDataSize is 0.
If Certificate is invalid.
@retval FALSE If no Extension entry match Oid.
@retval FALSE If the ExtensionData is NULL. The required buffer size
is returned in the ExtensionDataSize parameter.
@retval FALSE The operation is not supported.

2
CryptoPkg/Include/Library/BaseCryptLib.h
View file

@ -2713,11 +2713,11 @@ X509GetSignatureAlgorithm (
@param[in, out] ExtensionDataSize Extension bytes size.
@retval TRUE The certificate Extension data retrieved successfully.
@retval TRUE The Certificate Extension is found, but the oid extension is not found.
@retval FALSE If Cert is NULL.
If ExtensionDataSize is NULL.
If ExtensionData is not NULL and *ExtensionDataSize is 0.
If Certificate is invalid.
@retval FALSE If no Extension entry match Oid.
@retval FALSE If the ExtensionData is NULL. The required buffer size
is returned in the ExtensionDataSize parameter.
@retval FALSE The operation is not supported.

4
CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
View file

@ -1270,11 +1270,11 @@ _Exit:
@param[in, out] ExtensionDataSize Extension bytes size.
@retval TRUE The certificate Extension data retrieved successfully.
@retval TRUE The Certificate Extension is found, but the oid extension is not found.
@retval FALSE If Cert is NULL.
If ExtensionDataSize is NULL.
If ExtensionData is not NULL and *ExtensionDataSize is 0.
If Certificate is invalid.
@retval FALSE If no Extension entry match Oid.
@retval FALSE If the ExtensionData is NULL. The required buffer size
is returned in the ExtensionDataSize parameter.
@retval FALSE The operation is not supported.
@ -1380,6 +1380,8 @@ X509GetExtensionData (
*ExtensionDataSize = OctLength;
} else {
/* the cert extension is found, but the oid extension is not found; */
Status = TRUE;
*ExtensionDataSize = 0;
}

2
CryptoPkg/Library/BaseCryptLib/Pk/CryptX509Null.c
View file

@ -459,11 +459,11 @@ X509GetSignatureAlgorithm (
@param[in, out] ExtensionDataSize Extension bytes size.
@retval TRUE The certificate Extension data retrieved successfully.
@retval TRUE The Certificate Extension is found, but the oid extension is not found.
@retval FALSE If Cert is NULL.
If ExtensionDataSize is NULL.
If ExtensionData is not NULL and *ExtensionDataSize is 0.
If Certificate is invalid.
@retval FALSE If no Extension entry match Oid.
@retval FALSE If the ExtensionData is NULL. The required buffer size
is returned in the ExtensionDataSize parameter.
@retval FALSE The operation is not supported.

11
CryptoPkg/Library/BaseCryptLibMbedTls/Pk/CryptX509.c
View file

@ -1388,11 +1388,11 @@ InternalX509FindExtensionData (
@param[in, out] ExtensionDataSize Extension bytes size.
@retval TRUE The certificate Extension data retrieved successfully.
@retval TRUE The Certificate Extension is found, but the oid extension is not found.
@retval FALSE If Cert is NULL.
If ExtensionDataSize is NULL.
If ExtensionData is not NULL and *ExtensionDataSize is 0.
If Certificate is invalid.
@retval FALSE If no Extension entry match Oid.
@retval FALSE If the ExtensionData is NULL. The required buffer size
is returned in the ExtensionDataSize parameter.
@retval FALSE The operation is not supported.
@ -1422,6 +1422,10 @@ X509GetExtensionData (
(OidSize == 0) ||
(ExtensionDataSize == NULL))
{
if (ExtensionDataSize != NULL) {
*ExtensionDataSize = 0;
}
return FALSE;
}
@ -1440,6 +1444,11 @@ X509GetExtensionData (
if (Ret == 0) {
ReturnStatus = InternalX509FindExtensionData (Ptr, End, Oid, OidSize, &Ptr, &ObjLen);
if (!Status) {
Status = TRUE;
*ExtensionDataSize = 0;
goto Cleanup;
}
}
if (ReturnStatus == RETURN_SUCCESS) {

2
CryptoPkg/Library/BaseCryptLibMbedTls/Pk/CryptX509Null.c
View file

@ -459,11 +459,11 @@ X509GetSignatureAlgorithm (
@param[in, out] ExtensionDataSize Extension bytes size.
@retval TRUE The certificate Extension data retrieved successfully.
@retval TRUE The Certificate Extension is found, but the oid extension is not found.
@retval FALSE If Cert is NULL.
If ExtensionDataSize is NULL.
If ExtensionData is not NULL and *ExtensionDataSize is 0.
If Certificate is invalid.
@retval FALSE If no Extension entry match Oid.
@retval FALSE If the ExtensionData is NULL. The required buffer size
is returned in the ExtensionDataSize parameter.
@retval FALSE The operation is not supported.

2
CryptoPkg/Library/BaseCryptLibNull/Pk/CryptX509Null.c
View file

@ -459,11 +459,11 @@ X509GetSignatureAlgorithm (
@param[in, out] ExtensionDataSize Extension bytes size.
@retval TRUE The certificate Extension data retrieved successfully.
@retval TRUE The Certificate Extension is found, but the oid extension is not found.
@retval FALSE If Cert is NULL.
If ExtensionDataSize is NULL.
If ExtensionData is not NULL and *ExtensionDataSize is 0.
If Certificate is invalid.
@retval FALSE If no Extension entry match Oid.
@retval FALSE If the ExtensionData is NULL. The required buffer size
is returned in the ExtensionDataSize parameter.
@retval FALSE The operation is not supported.

2
CryptoPkg/Library/BaseCryptLibOnProtocolPpi/CryptLib.c
View file

@ -2456,11 +2456,11 @@ X509GetSignatureAlgorithm (
@param[in, out] ExtensionDataSize Extension bytes size.
@retval TRUE The certificate Extension data retrieved successfully.
@retval TRUE The Certificate Extension is found, but the oid extension is not found.
@retval FALSE If Cert is NULL.
If ExtensionDataSize is NULL.
If ExtensionData is not NULL and *ExtensionDataSize is 0.
If Certificate is invalid.
@retval FALSE If no Extension entry match Oid.
@retval FALSE If the ExtensionData is NULL. The required buffer size
is returned in the ExtensionDataSize parameter.
@retval FALSE The operation is not supported.

2
CryptoPkg/Private/Protocol/Crypto.h
View file

@ -2577,11 +2577,11 @@ BOOLEAN
@param[in, out] ExtensionDataSize Extension bytes size.
@retval TRUE The certificate Extension data retrieved successfully.
@retval TRUE The Certificate Extension is found, but the oid extension is not found.
@retval FALSE If Cert is NULL.
If ExtensionDataSize is NULL.
If ExtensionData is not NULL and *ExtensionDataSize is 0.
If Certificate is invalid.
@retval FALSE If no Extension entry match Oid.
@retval FALSE If the ExtensionData is NULL. The required buffer size
is returned in the ExtensionDataSize parameter.
@retval FALSE The operation is not supported.

1
Maintainers.txt
View file

@ -175,7 +175,6 @@ W: https://github.com/tianocore/tianocore.github.io/wiki/BaseTools
M: Rebecca Cran <rebecca@bsdio.com> [bexcran]
M: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
M: Guillermo Antonio Palomino Sosa <guillermo.a.palomino.sosa@intel.com> [gapalomi]
R: Bob Feng <bob.c.feng@intel.com> [BobCF]
R: Yuwei Chen <yuwei.chen@intel.com> [YuweiChen1110]
BaseTools: Plugins

4
NetworkPkg/Ip6Dxe/Ip6Icmp.c
View file

@ -467,14 +467,14 @@ Ip6GetPrefix (
UINT8 Mask;
UINT8 Value;
ASSERT ((Prefix != NULL) && (PrefixLength < IP6_PREFIX_MAX));
ASSERT ((Prefix != NULL) && (PrefixLength <= IP6_PREFIX_MAX));
if (PrefixLength == 0) {
ZeroMem (Prefix, sizeof (EFI_IPv6_ADDRESS));
return;
}
if (PrefixLength >= IP6_PREFIX_MAX) {
if (PrefixLength > IP6_PREFIX_MAX) {
return;
}

2
NetworkPkg/Library/DxeNetLib/DxeNetLib.c
View file

@ -844,7 +844,7 @@ NetIp6IsNetEqual (
UINT8 Bit;
UINT8 Mask;
ASSERT ((Ip1 != NULL) && (Ip2 != NULL) && (PrefixLength < IP6_PREFIX_MAX));
ASSERT ((Ip1 != NULL) && (Ip2 != NULL) && (PrefixLength <= IP6_PREFIX_MAX));
if (PrefixLength == 0) {
return TRUE;