Fixed one typo in MathRShiftU64.S stub implementation; Add one digest algorithm regis...

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

diff --git a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandItc.c b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandItc.c
index 881141cd087a4ebfc736d82bd278b7766a8d932e..9f87087445fe2622a6b7cbfef91489138533bcb4 100644 (file)
--- a/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandItc.c
+++ b/CryptoPkg/Library/BaseCryptLib/Rand/CryptRandItc.c
@@ -1,7 +1,7 @@
 /** @file\r
   Pseudorandom Number Generator Wrapper Implementation over OpenSSL.\r
 \r
-Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2012 - 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
 #include <Library/PrintLib.h>\r
 \r
 /**\r
@@ -41,6 +42,18 @@ RandomSeed (
 {\r
   CHAR8  DefaultSeed[128];\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
@@ -61,7 +74,11 @@ 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
@@ -86,7 +103,7 @@ RandomBytes (
   //\r
   // Check input parameters.\r
   //\r
-  if (Output == NULL) {\r
+  if (Output == NULL || Size > INT_MAX) {\r
     return FALSE;\r
   }\r
 \r