1. Remove conducting ASSERT in BaseCryptLib.

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

diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c
index b7e164cf43770dc8a38bf4aca58bd25148ee0db8..20f13469b30f407367557e01e4f1fac16cbf967e 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c
+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptDh.c
@@ -1,7 +1,7 @@
 /** @file\r
   Diffie-Hellman Wrapper Implementation over OpenSSL.\r
 \r
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2012, 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
@@ -38,7 +38,7 @@ DhNew (
 /**\r
   Release the specified DH context.\r
 \r
-  If DhContext is NULL, then ASSERT().\r
+  If DhContext is NULL, then return FALSE.\r
 \r
   @param[in]  DhContext  Pointer to the DH context to be released.\r
 \r
@@ -64,8 +64,8 @@ DhFree (
   Before this function can be invoked, pseudorandom number generator must be correctly\r
   initialized by RandomSeed().\r
 \r
-  If DhContext is NULL, then ASSERT().\r
-  If Prime is NULL, then ASSERT().\r
+  If DhContext is NULL, then return FALSE.\r
+  If Prime is NULL, then return FALSE.\r
 \r
   @param[in, out]  DhContext    Pointer to the DH context.\r
   @param[in]       Generator    Value of generator.\r
@@ -88,6 +88,13 @@ DhGenerateParameter (
 {\r
   BOOLEAN RetVal;\r
 \r
+  //\r
+  // Check input parameters.\r
+  //\r
+  if (DhContext == NULL || Prime == NULL) {\r
+    return FALSE;\r
+  }\r
+\r
   if (Generator != DH_GENERATOR_2 && Generator != DH_GENERATOR_5) {\r
     return FALSE;\r
   }\r
@@ -108,8 +115,8 @@ DhGenerateParameter (
   Given generator g, and prime number p, this function and sets DH\r
   context accordingly.\r
 \r
-  If DhContext is NULL, then ASSERT().\r
-  If Prime is NULL, then ASSERT().\r
+  If DhContext is NULL, then return FALSE.\r
+  If Prime is NULL, then return FALSE.\r
 \r
   @param[in, out]  DhContext    Pointer to the DH context.\r
   @param[in]       Generator    Value of generator.\r
@@ -134,6 +141,13 @@ DhSetParameter (
 {\r
   DH  *Dh;\r
 \r
+  //\r
+  // Check input parameters.\r
+  //\r
+  if (DhContext == NULL || Prime == NULL) {\r
+    return FALSE;\r
+  }\r
+  \r
   if (Generator != DH_GENERATOR_2 && Generator != DH_GENERATOR_5) {\r
     return FALSE;\r
   }\r
@@ -156,9 +170,9 @@ DhSetParameter (
   If the PublicKey buffer is too small to hold the public key, FALSE is returned and\r
   PublicKeySize is set to the required buffer size to obtain the public key.\r
 \r
-  If DhContext is NULL, then ASSERT().\r
-  If PublicKeySize is NULL, then ASSERT().\r
-  If PublicKeySize is large enough but PublicKey is NULL, then ASSERT().\r
+  If DhContext is NULL, then return FALSE.\r
+  If PublicKeySize is NULL, then return FALSE.\r
+  If PublicKeySize is large enough but PublicKey is NULL, then return FALSE.\r
 \r
   @param[in, out]  DhContext      Pointer to the DH context.\r
   @param[out]      PublicKey      Pointer to the buffer to receive generated public key.\r
@@ -181,6 +195,17 @@ DhGenerateKey (
   BOOLEAN RetVal;\r
   DH      *Dh;\r
 \r
+  //\r
+  // Check input parameters.\r
+  //\r
+  if (DhContext == NULL || PublicKeySize == NULL) {\r
+    return FALSE;\r
+  }\r
+\r
+  if (PublicKey == NULL && *PublicKeySize != 0) {\r
+    return FALSE;\r
+  }\r
+  \r
   Dh = (DH *) DhContext;\r
   *PublicKeySize = 0;\r
 \r
@@ -199,10 +224,10 @@ DhGenerateKey (
   Given peer's public key, this function computes the exchanged common key, based on its own\r
   context including value of prime modulus and random secret exponent. \r
 \r
-  If DhContext is NULL, then ASSERT().\r
-  If PeerPublicKey is NULL, then ASSERT().\r
-  If KeySize is NULL, then ASSERT().\r
-  If KeySize is large enough but Key is NULL, then ASSERT().\r
+  If DhContext is NULL, then return FALSE.\r
+  If PeerPublicKey is NULL, then return FALSE.\r
+  If KeySize is NULL, then return FALSE.\r
+  If KeySize is large enough but Key is NULL, then return FALSE.\r
 \r
   @param[in, out]  DhContext          Pointer to the DH context.\r
   @param[in]       PeerPublicKey      Pointer to the peer's public key.\r
@@ -228,6 +253,17 @@ DhComputeKey (
 {\r
   BIGNUM  *Bn;\r
 \r
+  //\r
+  // Check input parameters.\r
+  //\r
+  if (DhContext == NULL || PeerPublicKey == NULL || KeySize == NULL) {\r
+    return FALSE;\r
+  }\r
+\r
+  if (Key == NULL && *KeySize != 0) {\r
+    return FALSE;\r
+  }\r
+  \r
   Bn = BN_bin2bn (PeerPublicKey, (UINT32) PeerPublicKeySize, NULL);\r
 \r
   *KeySize = (BOOLEAN) DH_compute_key (Key, Bn, DhContext);\r