ShellPkg/reset: Support "-fwui" flag

[mirror_edk2.git] / CryptoPkg / Library / BaseCryptLib / Rand / CryptRand.c

diff --git a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRand.c b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRand.c
index 3ead6d1906fa0142c6865ac7e56122da604e541f..895ce83faedee5ef7d6787a2ea3d2e5d5895d9c0 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRand.c
+++ b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRand.c
@@ -1,7 +1,7 @@
 /** @file\r
   Pseudorandom Number Generator Wrapper Implementation over OpenSSL.\r
 \r
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2010 - 2013, 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
@@ -14,6 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "InternalCryptLib.h"\r
 #include <openssl/rand.h>\r
+#include <openssl/evp.h>\r
 \r
 //\r
 // Default seed for UEFI Crypto Library\r
@@ -43,6 +44,18 @@ RandomSeed (
   IN  UINTN         SeedSize\r
   )\r
 {\r
+  if (SeedSize > INT_MAX) {\r
+    return FALSE;\r
+  }\r
+\r
+  //\r
+  // The software PRNG implementation built in OpenSSL depends on message digest algorithm.\r
+  // Make sure SHA-1 digest algorithm is available here.\r
+  //\r
+  if (EVP_add_digest (EVP_sha1 ()) == 0) {\r
+    return FALSE;\r
+  }\r
+\r
   //\r
   // Seed the pseudorandom number generator with user-supplied value.\r
   // NOTE: A cryptographic PRNG must be seeded with unpredictable data.\r
@@ -53,13 +66,17 @@ RandomSeed (
     RAND_seed (DefaultSeed, sizeof (DefaultSeed));\r
   }\r
 \r
-  return TRUE;\r
+  if (RAND_status () == 1) {\r
+    return TRUE;\r
+  }\r
+\r
+  return FALSE;\r
 }\r
 \r
 /**\r
   Generates a pseudorandom byte stream of the specified size.\r
 \r
-  If Output is NULL, then ASSERT().\r
+  If Output is NULL, then return FALSE.\r
 \r
   @param[out]  Output  Pointer to buffer to receive random value.\r
   @param[in]   Size    Size of randome bytes to generate.\r
@@ -75,7 +92,12 @@ RandomBytes (
   IN   UINTN  Size\r
   )\r
 {\r
-  ASSERT (Output != NULL);\r
+  //\r
+  // Check input parameters.\r
+  //\r
+  if (Output == NULL || Size > INT_MAX) {\r
+    return FALSE;\r
+  }\r
 \r
   //\r
   // Generate random data.\r