Add new interfaces to support PKCS7#7 signed data and authenticode signature. Update Cryptest to validate functionality of new interfaces.

Signed-off-by: tye1
Reviewed-by: hhuan13
Reviewed-by: qlong


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12142 6f19259b-4bc3-4df7-8a09-765794883524

CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c

@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 int errno = 0;
 
 FILE  *stderr = NULL;
-FILE  *stdin = NULL;
+FILE  *stdin  = NULL;
 FILE  *stdout = NULL;
 
 typedef
@@ -244,7 +244,10 @@ void qsort (void *base, size_t num, size_t width, int (*compare)(const void *, c
   ASSERT (base    != NULL);
   ASSERT (compare != NULL);
 
-  Buffer = AllocatePool (width);
+  //
+  // Use CRT-style malloc to cover BS and RT memory allocation.
+  //
+  Buffer = malloc (width);
   ASSERT (Buffer != NULL);
 
   //
@@ -252,7 +255,7 @@ void qsort (void *base, size_t num, size_t width, int (*compare)(const void *, c
   //
   QuickSortWorker (base, (UINTN)num, (UINTN)width, (SORT_COMPARE)compare, Buffer);
 
-  FreePool (Buffer);
+  free (Buffer);
   return;
 }
 

CryptoPkg/Library/BaseCryptLib/SysCall/RealTimeClock.c

@@ -2,7 +2,7 @@
   C Run-Time Libraries (CRT) Time Management Routines Wrapper Implementation
   for OpenSSL-based Cryptographic Library (used in SMM).
 
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2011, 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
@@ -74,6 +74,7 @@ typedef union {
 //
 
 #define IsLeap(y)   (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
+#define SECSPERMIN  (60)
 #define SECSPERHOUR (60 * 60)
 #define SECSPERDAY  (24 * SECSPERHOUR)
 
@@ -220,3 +221,66 @@ time_t time (time_t *timer)
 
   return *timer;
 }
+
+//
+// Convert a time value from type time_t to struct tm.
+//
+struct tm * gmtime (const time_t *timer)
+{
+  struct tm      *GmTime;
+  UINT16         DayNo;
+  UINT16         DayRemainder;
+  time_t         Year;
+  time_t         YearNo;
+  UINT16         TotalDays;
+  UINT16         MonthNo;
+
+  if (timer == NULL) {
+    return NULL;
+  }
+
+  GmTime = malloc (sizeof (struct tm));
+  if (GmTime == NULL) {
+    return NULL;
+  }
+
+  ZeroMem ((VOID *) GmTime, (UINTN) sizeof (struct tm));
+
+  DayNo        = (UINT16) (*timer / SECSPERDAY);
+  DayRemainder = (UINT16) (*timer % SECSPERDAY);
+
+  GmTime->tm_sec = (int) (DayRemainder % SECSPERMIN);
+  GmTime->tm_min = (int) ((DayRemainder % SECSPERHOUR) / SECSPERMIN);
+  GmTime->tm_hour = (int) (DayRemainder / SECSPERHOUR);
+  GmTime->tm_wday = (int) ((DayNo + 4) % 7);
+
+  for (Year = 1970, YearNo = 0; DayNo > 0; Year++) {  
+    TotalDays = (UINT16) (IsLeap (Year) ? 366 : 365);
+    if (DayNo >= TotalDays) {
+      DayNo = (UINT16) (DayNo - TotalDays);
+      YearNo++;
+    } else {
+      break;
+    }
+  }
+
+  GmTime->tm_year = (int) (YearNo + (1970 - 1900));
+  GmTime->tm_yday = (int) DayNo;
+
+  for (MonthNo = 12; MonthNo > 1; MonthNo--) {
+    if (DayNo > CumulativeDays[IsLeap(Year)][MonthNo]) {
+      DayNo = (UINT16) (DayNo - (UINT16) (CumulativeDays[IsLeap(Year)][MonthNo]));
+      break;
+    }
+  }
+
+  GmTime->tm_mon  = (int) MonthNo;
+  GmTime->tm_mday = (int) DayNo;
+
+  GmTime->tm_isdst  = 0;
+  GmTime->tm_gmtoff = 0;
+  GmTime->tm_zone   = NULL;
+
+  return GmTime;
+}
+

CryptoPkg/Library/BaseCryptLib/SysCall/RuntimeMemAllocation.c

@@ -2,7 +2,7 @@
   Light-weight Memory Management Routines for OpenSSL-based Crypto
   Library at Runtime Phase.
 
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2011, 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
@@ -38,7 +38,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define RT_PAGE_FREE                0x00000000
 #define RT_PAGE_USED                0x00000001
 
-#define MIN_REQUIRED_BLOCKS         24
+#define MIN_REQUIRED_BLOCKS         600
 
 //
 // Memory Page Table

CryptoPkg/Library/BaseCryptLib/SysCall/TimerWrapper.c

@@ -2,7 +2,7 @@
   C Run-Time Libraries (CRT) Time Management Routines Wrapper Implementation
   for OpenSSL-based Cryptographic Library (used in DXE & RUNTIME).
 
-Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2011, 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
@@ -22,6 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //
 
 #define IsLeap(y)   (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
+#define SECSPERMIN  (60)
 #define SECSPERHOUR (60 * 60)
 #define SECSPERDAY  (24 * SECSPERHOUR)
 
@@ -100,3 +101,65 @@ time_t time (time_t *timer)
 
   return *timer;
 }
+
+//
+// Convert a time value from type time_t to struct tm.
+//
+struct tm * gmtime (const time_t *timer)
+{
+  struct tm  *GmTime;
+  UINT16     DayNo;
+  UINT16     DayRemainder;
+  time_t     Year;
+  time_t     YearNo;
+  UINT16     TotalDays;
+  UINT16     MonthNo;
+
+  if (timer == NULL) {
+    return NULL;
+  }
+
+  GmTime = malloc (sizeof (struct tm));
+  if (GmTime == NULL) {
+    return NULL;
+  }
+
+  ZeroMem ((VOID *) GmTime, (UINTN) sizeof (struct tm));
+
+  DayNo        = (UINT16) (*timer / SECSPERDAY);
+  DayRemainder = (UINT16) (*timer % SECSPERDAY);
+
+  GmTime->tm_sec  = (int) (DayRemainder % SECSPERMIN);
+  GmTime->tm_min  = (int) ((DayRemainder % SECSPERHOUR) / SECSPERMIN);
+  GmTime->tm_hour = (int) (DayRemainder / SECSPERHOUR);
+  GmTime->tm_wday = (int) ((DayNo + 4) % 7);
+
+  for (Year = 1970, YearNo = 0; DayNo > 0; Year++) {
+    TotalDays = (UINT16) (IsLeap (Year) ? 366 : 365);
+    if (DayNo >= TotalDays) {
+      DayNo = (UINT16) (DayNo - TotalDays);
+      YearNo++;
+    } else {
+      break;
+    }
+  }
+
+  GmTime->tm_year = (int) (YearNo + (1970 - 1900));
+  GmTime->tm_yday = (int) DayNo;
+
+  for (MonthNo = 12; MonthNo > 1; MonthNo--) {
+    if (DayNo > CumulativeDays[IsLeap(Year)][MonthNo]) {
+      DayNo = (UINT16) (DayNo - (UINT16) (CumulativeDays[IsLeap(Year)][MonthNo]));
+      break;
+    }
+  }
+
+  GmTime->tm_mon  = (int) MonthNo;
+  GmTime->tm_mday = (int) DayNo;
+
+  GmTime->tm_isdst  = 0;
+  GmTime->tm_gmtoff = 0;
+  GmTime->tm_zone   = NULL;
+
+  return GmTime;
+}