X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=CryptoPkg%2FLibrary%2FBaseCryptLib%2FPk%2FCryptX509.c;h=153e7106171eeaa83cce35e4814d6c054645deb6;hp=3a5485e002c7c4e60d1a8539359d2cd87fe458c8;hb=16d2c32c4dff7fd8b0ee19e3ba908c0121f6636e;hpb=bd0de3963b8e09ccded4b6922d5e6f0146a2f63f

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
index 3a5485e002..153e710617 100644
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptX509.c
@@ -1,7 +1,7 @@
 /** @file
   X.509 Certificate Handler Wrapper Implementation over OpenSSL.
 
-Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2012, 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
@@ -19,8 +19,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**
   Construct a X509 object from DER-encoded certificate data.
 
-  If Cert is NULL, then ASSERT().
-  If SingleX509Cert is NULL, then ASSERT().
+  If Cert is NULL, then return FALSE.
+  If SingleX509Cert is NULL, then return FALSE.
 
   @param[in]  Cert            Pointer to the DER-encoded certificate data.
   @param[in]  CertSize        The size of certificate data in bytes.
@@ -43,11 +43,11 @@ X509ConstructCertificate (
   BOOLEAN  Status;
 
   //
-  // ASSERT if Cert is NULL or SingleX509Cert is NULL.
+  // Check input parameters.
   //
-  ASSERT (Cert           != NULL);
-  ASSERT (SingleX509Cert != NULL);
-  ASSERT (CertSize       <= INT_MAX);
+  if (Cert == NULL || SingleX509Cert == NULL || CertSize > INT_MAX) {
+    return FALSE;
+  }
 
   Status = FALSE;
 
@@ -79,7 +79,7 @@ _Exit:
 /**
   Construct a X509 stack object from a list of DER-encoded certificate data.
 
-  If X509Stack is NULL, then ASSERT().
+  If X509Stack is NULL, then return FALSE.
 
   @param[in, out]  X509Stack  On input, pointer to an existing X509 stack object.
                               On output, pointer to the X509 stack object with new
@@ -108,9 +108,11 @@ X509ConstructCertificateStack (
   UINTN           Index;
 
   //
-  // ASSERT if input X509Stack is NULL.
+  // Check input parameters.
   //
-  ASSERT (X509Stack != NULL);
+  if (X509Stack == NULL) {
+    return FALSE;
+  }
 
   Status = FALSE;
 
@@ -171,7 +173,7 @@ X509ConstructCertificateStack (
 /**
   Release the specified X509 object.
 
-  If X509Cert is NULL, then ASSERT().
+  If X509Cert is NULL, then return FALSE.
 
   @param[in]  X509Cert  Pointer to the X509 object to be released.
 
@@ -181,9 +183,14 @@ EFIAPI
 X509Free (
   IN  VOID  *X509Cert
   )
-{
-  ASSERT (X509Cert != NULL);
-
+{ 
+  //
+  // Check input parameters.
+  //
+  if (X509Cert == NULL) {
+    return;
+  }
+  
   //
   // Free OpenSSL X509 object.
   //
@@ -193,7 +200,7 @@ X509Free (
 /**
   Release the specified X509 stack object.
 
-  If X509Stack is NULL, then ASSERT().
+  If X509Stack is NULL, then return FALSE.
 
   @param[in]  X509Stack  Pointer to the X509 stack object to be released.
 
@@ -204,8 +211,13 @@ X509StackFree (
   IN  VOID  *X509Stack
   )
 {
-  ASSERT (X509Stack != NULL);
-
+  //
+  // Check input parameters.
+  //
+  if (X509Stack == NULL) {
+    return;
+  }
+  
   //
   // Free OpenSSL X509 stack object.
   //
@@ -221,8 +233,8 @@ X509StackFree (
   @param[in, out] SubjectSize  The size in bytes of the CertSubject buffer on input,
                                and the size of buffer returned CertSubject on output.
 
-  If Cert is NULL, then ASSERT().
-  If SubjectSize is NULL, then ASSERT().
+  If Cert is NULL, then return FALSE.
+  If SubjectSize is NULL, then return FALSE.
 
   @retval  TRUE   The certificate subject retrieved successfully.
   @retval  FALSE  Invalid certificate, or the SubjectSize is too small for the result.
@@ -243,10 +255,11 @@ X509GetSubjectName (
   X509_NAME  *X509Name;
 
   //
-  // ASSERT if Cert is NULL or SubjectSize is NULL.
+  // Check input parameters.
   //
-  ASSERT (Cert        != NULL);
-  ASSERT (SubjectSize != NULL);
+  if (Cert == NULL || SubjectSize == NULL) {
+    return FALSE;
+  }
 
   Status   = FALSE;
   X509Cert = NULL;
@@ -291,8 +304,8 @@ _Exit:
                            RSA public key component. Use RsaFree() function to free the
                            resource.
 
-  If Cert is NULL, then ASSERT().
-  If RsaContext is NULL, then ASSERT().
+  If Cert is NULL, then return FALSE.
+  If RsaContext is NULL, then return FALSE.
 
   @retval  TRUE   RSA Public Key was retrieved successfully.
   @retval  FALSE  Fail to retrieve RSA public key from X509 certificate.
@@ -309,12 +322,13 @@ RsaGetPublicKeyFromX509 (
   BOOLEAN   Status;
   EVP_PKEY  *Pkey;
   X509      *X509Cert;
-
+  
   //
-  // ASSERT if Cert is NULL or RsaContext is NULL.
+  // Check input parameters.
   //
-  ASSERT (Cert       != NULL);
-  ASSERT (RsaContext != NULL);
+  if (Cert == NULL || RsaContext == NULL) {
+    return FALSE;
+  }
 
   Status   = FALSE;
   Pkey     = NULL;
@@ -361,8 +375,8 @@ _Exit:
   @param[in]      CACert       Pointer to the DER-encoded trusted CA certificate.
   @param[in]      CACertSize   Size of the CA Certificate in bytes.
 
-  If Cert is NULL, then ASSERT().
-  If CACert is NULL, then ASSERT().
+  If Cert is NULL, then return FALSE.
+  If CACert is NULL, then return FALSE.
 
   @retval  TRUE   The certificate was issued by the trusted CA.
   @retval  FALSE  Invalid certificate or the certificate was not issued by the given
@@ -383,12 +397,13 @@ X509VerifyCert (
   X509            *X509CACert;
   X509_STORE      *CertStore;
   X509_STORE_CTX  CertCtx;
-
+  
   //
-  // ASSERT if Cert is NULL or CACert is NULL.
+  // Check input parameters.
   //
-  ASSERT (Cert   != NULL);
-  ASSERT (CACert != NULL);
+  if (Cert == NULL || CACert == NULL) {
+    return FALSE;
+  }
 
   Status     = FALSE;
   X509Cert   = NULL;