From 031e5cce385d3f96b1caa1d53495332a7eb03749 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Tue, 23 Mar 2021 23:49:46 +0000
Subject: New upstream version 15.3

---
 Cryptlib/Pk/CryptTs.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'Cryptlib/Pk/CryptTs.c')

diff --git a/Cryptlib/Pk/CryptTs.c b/Cryptlib/Pk/CryptTs.c
index d63c23df..1b78472f 100644
--- a/Cryptlib/Pk/CryptTs.c
+++ b/Cryptlib/Pk/CryptTs.c
@@ -5,7 +5,7 @@
   the lifetime of the signature when a signing certificate expires or is later
   revoked.
 
-Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -239,7 +239,7 @@ CheckTSTInfo (
   TS_MESSAGE_IMPRINT  *Imprint;
   X509_ALGOR          *HashAlgo;
   CONST EVP_MD        *Md;
-  EVP_MD_CTX          *MdCtx;
+  EVP_MD_CTX          MdCtx;
   UINTN               MdSize;
   UINT8               *HashedMsg;
 
@@ -249,7 +249,6 @@ CheckTSTInfo (
   Status    = FALSE;
   HashAlgo  = NULL;
   HashedMsg = NULL;
-  MdCtx     = NULL;
 
   //
   // -- Check version number of Timestamp:
@@ -286,17 +285,11 @@ CheckTSTInfo (
   if (HashedMsg == NULL) {
     goto _Exit;
   }
-  MdCtx = EVP_MD_CTX_new ();
-  if (MdCtx == NULL) {
-    goto _Exit;
-  }
-  if ((EVP_DigestInit_ex (MdCtx, Md, NULL) != 1) ||
-      (EVP_DigestUpdate (MdCtx, TimestampedData, DataSize) != 1) ||
-      (EVP_DigestFinal (MdCtx, HashedMsg, NULL) != 1)) {
-    goto _Exit;
-  }
+  EVP_DigestInit (&MdCtx, Md);
+  EVP_DigestUpdate (&MdCtx, TimestampedData, DataSize);
+  EVP_DigestFinal (&MdCtx, HashedMsg, NULL);
   if ((MdSize == (UINTN)ASN1_STRING_length (Imprint->HashedMessage)) &&
-      (CompareMem (HashedMsg, ASN1_STRING_get0_data (Imprint->HashedMessage), MdSize) != 0)) {
+      (CompareMem (HashedMsg, ASN1_STRING_data (Imprint->HashedMessage), MdSize) != 0)) {
     goto _Exit;
   }
 
@@ -322,7 +315,6 @@ CheckTSTInfo (
 
 _Exit:
   X509_ALGOR_free (HashAlgo);
-  EVP_MD_CTX_free (MdCtx);
   if (HashedMsg != NULL) {
     FreePool (HashedMsg);
   }
-- 
cgit v1.2.3