1. Fix build break issue for NOOPT target.

2. Fix potential system hang issue in X509_STORE_CTX_cleanup.
3. Fix potential overflow when convert UINTN to INT.
4. Update Pkcs7Sign() to output stripped PKCS#7 SignedData.
5. Update Pkcs7Verify() to support both wrapped/stripped PKCS#7 SignedData.

Signed-off-by: tye
Reviewed-by: xdu2
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12593 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c b/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c
index bc5c93ff988f9f5aceaca2b984570a79e28c813f..ed53b2dcbf738ee9ec288054ebad55593eeb9e05 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pem/CryptPem.c
@@ -85,6 +85,10 @@ RsaGetPrivateKeyFromPem (
   ASSERT (PemData    != NULL);\r
   ASSERT (RsaContext != NULL);\r
 \r
+  if (PemSize > INT_MAX) {\r
+    return FALSE;\r
+  }\r
+\r
   Status = FALSE;\r
   PemBio = NULL;\r
 \r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c
index 5f93e4af93cc22dff7786a0624c35665fe6a3e29..0370fd77a5de077d560fd4951e6436040bc87317 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptAuthenticode.c
@@ -65,6 +65,10 @@ AuthenticodeVerify (
   ASSERT (AuthData  != NULL);\r
   ASSERT (ImageHash != NULL);\r
 \r
+  if (DataSize > INT_MAX) {\r
+    return FALSE;\r
+  }\r
+\r
   Status       = FALSE;\r
   Pkcs7        = NULL;\r
   OrigAuthData = AuthData;\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7.c
index e866284f17ea802e77778538a9a170eb791b1581..433175bbf1e1490eab7ce5ced1203caf32066949 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7.c
@@ -18,6 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <openssl/x509.h>\r
 #include <openssl/pkcs7.h>\r
 \r
+UINT8 mOidValue[9] = { 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x07, 0x02 };\r
 \r
 /**\r
   Verification callback function to override any existing callbacks in OpenSSL\r
@@ -143,6 +144,8 @@ Pkcs7Sign (
   PKCS7     *Pkcs7;\r
   UINT8     *RsaContext;\r
   UINT8     *P7Data;\r
+  UINTN     P7DataSize;\r
+  UINT8     *Tmp;\r
 \r
   //\r
   // Check input parameters.\r
@@ -155,6 +158,10 @@ Pkcs7Sign (
     return FALSE;\r
   }\r
 \r
+  if (InDataSize > INT_MAX) {\r
+    return FALSE;\r
+  }\r
+\r
   RsaContext = NULL;\r
   Key        = NULL;\r
   Pkcs7      = NULL;\r
@@ -216,13 +223,23 @@ Pkcs7Sign (
   //\r
   // Convert PKCS#7 signedData structure into DER-encoded buffer.\r
   //\r
-  *SignedDataSize = i2d_PKCS7 (Pkcs7, NULL);\r
-  if (*SignedDataSize == 0) {\r
+  P7DataSize = i2d_PKCS7 (Pkcs7, NULL);\r
+  if (P7DataSize <= 19) {\r
     goto _Exit;\r
   }\r
+  P7Data     = OPENSSL_malloc (P7DataSize);\r
+  Tmp        = P7Data;\r
+  P7DataSize = i2d_PKCS7 (Pkcs7, (unsigned char **) &Tmp);\r
+\r
+  //\r
+  // Strip ContentInfo to content only for signeddata. The data be trimmed off\r
+  // is totally 19 bytes.\r
+  //\r
+  *SignedDataSize = P7DataSize - 19;\r
   *SignedData     = OPENSSL_malloc (*SignedDataSize);\r
-  P7Data          = *SignedData;\r
-  *SignedDataSize = i2d_PKCS7 (Pkcs7, (unsigned char **) &P7Data);\r
+  CopyMem (*SignedData, P7Data + 19, *SignedDataSize);\r
+  \r
+  OPENSSL_free (P7Data);\r
 \r
   Status = TRUE;\r
 \r
@@ -253,8 +270,9 @@ _Exit:
 }\r
 \r
 /**\r
-  Verifies the validility of a PKCS#7 signed data as described in "PKCS #7: Cryptographic\r
-  Message Syntax Standard".\r
+  Verifies the validility of a PKCS#7 signed data as described in "PKCS #7:\r
+  Cryptographic Message Syntax Standard". The input signed data could be wrapped\r
+  in a ContentInfo structure.\r
 \r
   If P7Data is NULL, then ASSERT().\r
 \r
@@ -287,11 +305,19 @@ Pkcs7Verify (
   BOOLEAN     Status;\r
   X509        *Cert;\r
   X509_STORE  *CertStore;\r
+  UINT8       *SignedData;\r
+  UINT8       *Temp;\r
+  UINTN       SignedDataSize;\r
+  BOOLEAN     Wrapped;\r
 \r
   //\r
-  // ASSERT if P7Data is NULL\r
+  // ASSERT if P7Data is NULL or P7Length is not larger than 19 bytes.\r
   //\r
-  ASSERT (P7Data != NULL);\r
+  ASSERT ((P7Data != NULL) || (P7Length <= 19));\r
+\r
+  if ((CertLength > INT_MAX) || (DataLength > INT_MAX)) {\r
+    return FALSE;\r
+  }\r
 \r
   Status    = FALSE;\r
   Pkcs7     = NULL;\r
@@ -308,10 +334,81 @@ Pkcs7Verify (
   EVP_add_digest_alias (SN_sha1WithRSAEncryption, SN_sha1WithRSA);\r
   EVP_add_digest (EVP_sha256());\r
 \r
+  //\r
+  // Check whether input P7Data is a wrapped ContentInfo structure or not.\r
+  //\r
+  Wrapped = FALSE;\r
+  if ((P7Data[4] == 0x06) && (P7Data[5] == 0x09)) {\r
+    if (CompareMem (P7Data + 6, mOidValue, sizeof (mOidValue)) == 0) {\r
+      if ((P7Data[15] == 0xA0) && (P7Data[16] == 0x82)) {\r
+        Wrapped = TRUE;\r
+      }\r
+    }\r
+  }\r
+\r
+  if (Wrapped) {\r
+    SignedData     = (UINT8 *) P7Data;\r
+    SignedDataSize = P7Length;\r
+  } else {\r
+    //\r
+    // Wrap PKCS#7 signeddata to a ContentInfo structure - add a header in 19 bytes.\r
+    //\r
+    SignedDataSize = P7Length + 19;\r
+    SignedData     = OPENSSL_malloc (SignedDataSize);\r
+    if (SignedData == NULL) {\r
+      return FALSE;\r
+    }\r
+\r
+    //\r
+    // Part1: 0x30, 0x82.\r
+    //\r
+    SignedData[0] = 0x30;\r
+    SignedData[1] = 0x82;\r
+\r
+    //\r
+    // Part2: Length1 = P7Length + 19 - 4, in big endian.\r
+    //\r
+    SignedData[2] = (UINT8) (((UINT16) (SignedDataSize - 4)) >> 8);\r
+    SignedData[3] = (UINT8) (((UINT16) (SignedDataSize - 4)) & 0xff);\r
+\r
+    //\r
+    // Part3: 0x06, 0x09.\r
+    //\r
+    SignedData[4] = 0x06;\r
+    SignedData[5] = 0x09;\r
+\r
+    //\r
+    // Part4: OID value -- 0x2A 0x86 0x48 0x86 0xF7 0x0D 0x01 0x07 0x02.\r
+    //\r
+    CopyMem (SignedData + 6, mOidValue, sizeof (mOidValue));\r
+\r
+    //\r
+    // Part5: 0xA0, 0x82.\r
+    //\r
+    SignedData[15] = 0xA0;\r
+    SignedData[16] = 0x82;\r
+\r
+    //\r
+    // Part6: Length2 = P7Length, in big endian.\r
+    //\r
+    SignedData[17] = (UINT8) (((UINT16) P7Length) >> 8);\r
+    SignedData[18] = (UINT8) (((UINT16) P7Length) & 0xff);\r
+\r
+    //\r
+    // Part7: P7Data.\r
+    //\r
+    CopyMem (SignedData + 19, P7Data, P7Length);\r
+  }\r
+  \r
   //\r
   // Retrieve PKCS#7 Data (DER encoding)\r
   //\r
-  Pkcs7 = d2i_PKCS7 (NULL, &P7Data, (int)P7Length);\r
+  if (SignedDataSize > INT_MAX) {\r
+    goto _Exit;\r
+  }\r
+\r
+  Temp = SignedData;\r
+  Pkcs7 = d2i_PKCS7 (NULL, &Temp, (int) SignedDataSize);\r
   if (Pkcs7 == NULL) {\r
     goto _Exit;\r
   }\r
@@ -375,5 +472,9 @@ _Exit:
   X509_STORE_free (CertStore);\r
   PKCS7_free (Pkcs7);\r
 \r
+  if (!Wrapped) {\r
+    OPENSSL_free (SignedData);\r
+  }\r
+\r
   return Status;\r
 }\r

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
index 7557399aa4e7a6a0e7ca4c9572c951522af68aab..88c21369b6de0d5481bfbf0300cd167c1a9ffcfe 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
@@ -48,6 +48,10 @@ X509ConstructCertificate (
   ASSERT (Cert != NULL);\r
   ASSERT (SingleX509Cert != NULL);\r
 \r
+  if (CertSize > INT_MAX) {\r
+    return FALSE;\r
+  }\r
+\r
   Status = FALSE;\r
 \r
   //\r
@@ -439,6 +443,7 @@ X509VerifyCert (
   // X509 Certificate Verification.\r
   //\r
   Status = (BOOLEAN) X509_verify_cert (&CertCtx);\r
+  X509_STORE_CTX_cleanup (&CertCtx);\r
 \r
 _Exit:\r
   //\r
@@ -447,7 +452,6 @@ _Exit:
   X509_free (X509Cert);\r
   X509_free (X509CACert);\r
   X509_STORE_free (CertStore);\r
-  X509_STORE_CTX_cleanup (&CertCtx);\r
 \r
   return Status;\r
 }\r

diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index f40f36ece22fafd24213f501932bb91aa3a0042f..a74a0c19ede2579d61062058812de42283084931 100644 (file)
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -597,8 +597,8 @@
    MSFT:RELEASE_*_X64_CC_FLAGS            == /nologo /c /WX /GS- /X /Gs32768 /D UNICODE /O1ib2s /GL /Gy /FIAutoGen.h /EHs-c- /GR- /GF -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /w\r
    MSFT:DEBUG_*_IPF_CC_FLAGS              == /nologo /c /WX /GS- /X /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 /Zi -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /w\r
    MSFT:RELEASE_*_IPF_CC_FLAGS            == /nologo /c /WX /GS- /X /EHs-c- /GR- /Gy /Os /GL /FIAutoGen.h /QIPF_fr32 -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /w\r
-  INTEL:*_*_*_CC_FLAGS                    = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /w\r
-    GCC:*_*_*_CC_FLAGS                    = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w\r
+   MSFT:NOOPT_*_IA32_CC_FLAGS             == /nologo /c /WX /GS- /Gs32768 /D UNICODE /Od /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm -U_WIN32 -U_WIN64 -U_MSC_VER $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /w\r
+   INTEL:*_*_*_CC_FLAGS                   = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /w\r
+   GCC:*_*_*_CC_FLAGS                     = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w\r
    RVCT:DEBUG_*_*_CC_FLAGS                = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) --library_interface=aeabi_clib99 --fpu=vfpv3\r
    RVCT:RELEASE_*_*_CC_FLAGS              = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) --library_interface=aeabi_clib99 --fpu=vfpv3\r
-\r