/** @file\r
Authenticode Portable Executable Signature Verification over OpenSSL.\r
\r
-Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+ Caution: This module requires additional review when modified.\r
+ This library will have external input - signature (e.g. PE/COFF Authenticode).\r
+ This external input must be validated carefully to avoid security issue like\r
+ buffer overflow, integer overflow.\r
+\r
+ AuthenticodeVerify() will get PE/COFF Authenticode and will do basic check for\r
+ data structure.\r
+\r
+Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
#include <openssl/x509.h>\r
#include <openssl/pkcs7.h>\r
\r
+//\r
+// OID ASN.1 Value for SPC_INDIRECT_DATA_OBJID\r
+//\r
+UINT8 mSpcIndirectOidValue[] = {\r
+ 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x02, 0x01, 0x04\r
+ };\r
\r
/**\r
- Verifies the validility of a PE/COFF Authenticode Signature as described in "Windows\r
+ Verifies the validity of a PE/COFF Authenticode Signature as described in "Windows\r
Authenticode Portable Executable Signature Format".\r
\r
- If AuthData is NULL, then ASSERT().\r
- If ImageHash is NULL, then ASSERT().\r
+ If AuthData is NULL, then return FALSE.\r
+ If ImageHash is NULL, then return FALSE.\r
+\r
+ Caution: This function may receive untrusted input.\r
+ PE/COFF Authenticode is external input, so this function will do basic check for\r
+ Authenticode data structure.\r
\r
@param[in] AuthData Pointer to the Authenticode Signature retrieved from signed\r
PE/COFF image to be verified.\r
@param[in] TrustedCert Pointer to a trusted/root certificate encoded in DER, which\r
is used for certificate chain verification.\r
@param[in] CertSize Size of the trusted certificate in bytes.\r
- @param[in] ImageHash Pointer to the original image file hash value. The procudure\r
+ @param[in] ImageHash Pointer to the original image file hash value. The procedure\r
for calculating the image hash value is described in Authenticode\r
specification.\r
@param[in] HashSize Size of Image hash value in bytes.\r
{\r
BOOLEAN Status;\r
PKCS7 *Pkcs7;\r
+ CONST UINT8 *Temp;\r
CONST UINT8 *OrigAuthData;\r
UINT8 *SpcIndirectDataContent;\r
UINT8 Asn1Byte;\r
UINTN ContentSize;\r
+ CONST UINT8 *SpcIndirectDataOid;\r
\r
//\r
- // ASSERT if Authenticode Signature Data or PE Image Hash is NULL\r
+ // Check input parameters.\r
//\r
- ASSERT (AuthData != NULL);\r
- ASSERT (ImageHash != NULL);\r
+ if ((AuthData == NULL) || (TrustedCert == NULL) || (ImageHash == NULL)) {\r
+ return FALSE;\r
+ }\r
\r
- if (DataSize > INT_MAX) {\r
+ if ((DataSize > INT_MAX) || (CertSize > INT_MAX) || (HashSize > INT_MAX)) {\r
return FALSE;\r
}\r
\r
//\r
// Retrieve & Parse PKCS#7 Data (DER encoding) from Authenticode Signature\r
//\r
- Pkcs7 = d2i_PKCS7 (NULL, &AuthData, (int)DataSize);\r
+ Temp = AuthData;\r
+ Pkcs7 = d2i_PKCS7 (NULL, &Temp, (int)DataSize);\r
if (Pkcs7 == NULL) {\r
goto _Exit;\r
}\r
// some authenticode-specific structure. Use opaque ASN.1 string to retrieve\r
// PKCS#7 ContentInfo here.\r
//\r
+ SpcIndirectDataOid = OBJ_get0_data(Pkcs7->d.sign->contents->type);\r
+ if (OBJ_length(Pkcs7->d.sign->contents->type) != sizeof(mSpcIndirectOidValue) ||\r
+ CompareMem (\r
+ SpcIndirectDataOid,\r
+ mSpcIndirectOidValue,\r
+ sizeof (mSpcIndirectOidValue)\r
+ ) != 0) {\r
+ //\r
+ // Un-matched SPC_INDIRECT_DATA_OBJID.\r
+ //\r
+ goto _Exit;\r
+ }\r
+\r
+\r
SpcIndirectDataContent = (UINT8 *)(Pkcs7->d.sign->contents->d.other->value.asn1_string->data);\r
\r
//\r
// Retrieve the SEQUENCE data size from ASN.1-encoded SpcIndirectDataContent.\r
//\r
Asn1Byte = *(SpcIndirectDataContent + 1);\r
+\r
if ((Asn1Byte & 0x80) == 0) {\r
//\r
- // Short Form of Length Encoding\r
+ // Short Form of Length Encoding (Length < 128)\r
//\r
ContentSize = (UINTN) (Asn1Byte & 0x7F);\r
//\r
// Skip the SEQUENCE Tag;\r
//\r
SpcIndirectDataContent += 2;\r
- } else {\r
+\r
+ } else if ((Asn1Byte & 0x81) == 0x81) {\r
//\r
- // Long Form of Length Encoding (Assume Only two bytes here)\r
+ // Long Form of Length Encoding (128 <= Length < 255, Single Octet)\r
//\r
- ContentSize = (UINTN) (*(SpcIndirectDataContent + 2));\r
- ContentSize = (ContentSize << 8) + (UINTN)(*(SpcIndirectDataContent + 3));\r
+ ContentSize = (UINTN) (*(UINT8 *)(SpcIndirectDataContent + 2));\r
+ //\r
+ // Skip the SEQUENCE Tag;\r
+ //\r
+ SpcIndirectDataContent += 3;\r
+\r
+ } else if ((Asn1Byte & 0x82) == 0x82) {\r
+ //\r
+ // Long Form of Length Encoding (Length > 255, Two Octet)\r
+ //\r
+ ContentSize = (UINTN) (*(UINT8 *)(SpcIndirectDataContent + 2));\r
+ ContentSize = (ContentSize << 8) + (UINTN)(*(UINT8 *)(SpcIndirectDataContent + 3));\r
//\r
// Skip the SEQUENCE Tag;\r
//\r
SpcIndirectDataContent += 4;\r
+\r
+ } else {\r
+ goto _Exit;\r
}\r
\r
//\r
projects / mirror_edk2.git / blobdiff