CryptoPkg: Wrapper files updates to support openssl-1.0.2c

[mirror_edk2.git] / CryptoPkg / Library / BaseCryptLib / Pk / CryptTs.c

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c
index e4b5a8497fdefc5debe3c7ab0beb2e5f0ca1d020..7d269b04588f6d193ce1193f7ffd15d03f4c2f47 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptTs.c
@@ -5,7 +5,7 @@
   the lifetime of the signature when a signing certificate expires or is later\r
   revoked.\r
 \r
-Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2014 - 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
@@ -441,11 +441,12 @@ TimestampTokenVerify (
   CONST UINT8  *TokenTemp;\r
   PKCS7        *Pkcs7;\r
   X509         *Cert;\r
+  CONST UINT8  *CertTemp;\r
   X509_STORE   *CertStore;\r
   BIO          *OutBio;\r
   UINT8        *TstData;\r
   UINTN        TstSize;\r
-  UINT8        *TstTemp;\r
+  CONST UINT8  *TstTemp;\r
   TS_TST_INFO  *TstInfo;\r
 \r
   Status = FALSE;\r
@@ -490,7 +491,8 @@ TimestampTokenVerify (
   //\r
   // Read the trusted TSA certificate (DER-encoded), and Construct X509 Certificate.\r
   //\r
-  Cert = d2i_X509 (NULL, &TsaCert, (long) CertSize);\r
+  CertTemp = TsaCert;\r
+  Cert = d2i_X509 (NULL, &CertTemp, (long) CertSize);\r
   if (Cert == NULL) {\r
     goto _Exit;\r
   }\r
@@ -605,6 +607,7 @@ ImageTimestampVerify (
 {\r
   BOOLEAN                      Status;\r
   PKCS7                        *Pkcs7;\r
+  CONST UINT8                  *Temp;\r
   STACK_OF(PKCS7_SIGNER_INFO)  *SignerInfos;\r
   PKCS7_SIGNER_INFO            *SignInfo;\r
   UINTN                        Index;\r
@@ -644,7 +647,8 @@ ImageTimestampVerify (
   //\r
   // Decode ASN.1-encoded Authenticode data into PKCS7 structure.\r
   //\r
-  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **) &AuthData, (int) DataSize);\r
+  Temp  = AuthData;\r
+  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **) &Temp, (int) DataSize);\r
   if (Pkcs7 == NULL) {\r
     goto _Exit;\r
   }\r