Import upstream version 0.7

27 files changed, 1830 insertions, 944 deletions

diff --git a/Cryptlib/Cipher/CryptAes.c b/Cryptlib/Cipher/CryptAes.c
index 45e4a439..753d7981 100644
--- a/Cryptlib/Cipher/CryptAes.c
+++ b/Cryptlib/Cipher/CryptAes.c
@@ -38,7 +38,7 @@ AesGetContextSize (
   Initializes user-supplied memory as AES context for subsequent use.

 

   This function initializes user-supplied memory pointed by AesContext as AES context.

-  In addtion, it sets up all AES key materials for subsequent encryption and decryption

+  In addition, it sets up all AES key materials for subsequent encryption and decryption

   operations.

   There are 3 options for key length, 128 bits, 192 bits, and 256 bits.

 

@@ -241,7 +241,11 @@ AesCbcEncrypt (
   //

   // Check input parameters.

   //

-  if (AesContext == NULL || Input == NULL || (InputSize % AES_BLOCK_SIZE) != 0 || Ivec == NULL || Output == NULL) {

+  if (AesContext == NULL || Input == NULL || (InputSize % AES_BLOCK_SIZE) != 0) {

+    return FALSE;

+  }

+

+  if (Ivec == NULL || Output == NULL || InputSize > INT_MAX) {

     return FALSE;

   }

 

@@ -299,7 +303,11 @@ AesCbcDecrypt (
   //

   // Check input parameters.

   //

-  if (AesContext == NULL || Input == NULL || (InputSize % AES_BLOCK_SIZE) != 0 || Ivec == NULL || Output == NULL) {

+  if (AesContext == NULL || Input == NULL || (InputSize % AES_BLOCK_SIZE) != 0) {

+    return FALSE;

+  }

+

+  if (Ivec == NULL || Output == NULL || InputSize > INT_MAX) {

     return FALSE;

   }

 

diff --git a/Cryptlib/Cipher/CryptArc4.c b/Cryptlib/Cipher/CryptArc4.c
index 69214181..f3c4d31a 100644
--- a/Cryptlib/Cipher/CryptArc4.c
+++ b/Cryptlib/Cipher/CryptArc4.c
@@ -32,14 +32,14 @@ Arc4GetContextSize (
   // for backup copy. When Arc4Reset() is called, we can use the backup copy to restore

   // the working copy to the initial state.

   //

-  return (UINTN) (2 * sizeof(RC4_KEY));

+  return (UINTN) (2 * sizeof (RC4_KEY));

 }

 

 /**

   Initializes user-supplied memory as ARC4 context for subsequent use.

 

   This function initializes user-supplied memory pointed by Arc4Context as ARC4 context.

-  In addtion, it sets up all ARC4 key materials for subsequent encryption and decryption

+  In addition, it sets up all ARC4 key materials for subsequent encryption and decryption

   operations.

 

   If Arc4Context is NULL, then return FALSE.

@@ -75,7 +75,7 @@ Arc4Init (
 

   RC4_set_key (Rc4Key, (UINT32) KeySize, Key);

 

-  CopyMem (Rc4Key +  1, Rc4Key, sizeof(RC4_KEY));

+  CopyMem (Rc4Key +  1, Rc4Key, sizeof (RC4_KEY));

 

   return TRUE;

 }

@@ -115,7 +115,7 @@ Arc4Encrypt (
   //

   // Check input parameters.

   //

-  if (Arc4Context == NULL || Input == NULL || Output == NULL) {

+  if (Arc4Context == NULL || Input == NULL || Output == NULL || InputSize > INT_MAX) {

     return FALSE;

   }

 

@@ -161,7 +161,7 @@ Arc4Decrypt (
   //

   // Check input parameters.

   //

-  if (Arc4Context == NULL || Input == NULL || Output == NULL) {

+  if (Arc4Context == NULL || Input == NULL || Output == NULL || InputSize > INT_MAX) {

     return FALSE;

   }

 

@@ -205,7 +205,7 @@ Arc4Reset (
   

   Rc4Key = (RC4_KEY *) Arc4Context;

 

-  CopyMem (Rc4Key, Rc4Key + 1, sizeof(RC4_KEY));

+  CopyMem (Rc4Key, Rc4Key + 1, sizeof (RC4_KEY));

 

   return TRUE;

 }

diff --git a/Cryptlib/Cipher/CryptTdes.c b/Cryptlib/Cipher/CryptTdes.c
index 8213718b..f89094a5 100644
--- a/Cryptlib/Cipher/CryptTdes.c
+++ b/Cryptlib/Cipher/CryptTdes.c
@@ -37,7 +37,7 @@ TdesGetContextSize (
   Initializes user-supplied memory as TDES context for subsequent use.

 

   This function initializes user-supplied memory pointed by TdesContext as TDES context.

-  In addtion, it sets up all TDES key materials for subsequent encryption and decryption

+  In addition, it sets up all TDES key materials for subsequent encryption and decryption

   operations.

   There are 3 key options as follows:

   KeyLength = 64,  Keying option 1: K1 == K2 == K3 (Backward compatibility with DES)

@@ -76,9 +76,9 @@ TdesInit (
   KeySchedule = (DES_key_schedule *) TdesContext;

 

   //

-  // 

+  // If input Key is a weak key, return error.

   //

-  if (DES_is_weak_key ((const_DES_cblock *) Key)) {

+  if (DES_is_weak_key ((const_DES_cblock *) Key) == 1) {

     return FALSE;

   }

 

@@ -90,7 +90,7 @@ TdesInit (
     return TRUE;

   }

 

-  if (DES_is_weak_key ((const_DES_cblock *) Key + 8)) {

+  if (DES_is_weak_key ((const_DES_cblock *) Key + 8) == 1) {

     return FALSE;

   }

 

@@ -101,7 +101,7 @@ TdesInit (
     return TRUE;

   }

 

-  if (DES_is_weak_key ((const_DES_cblock *) Key + 16)) {

+  if (DES_is_weak_key ((const_DES_cblock *) Key + 16) == 1) {

     return FALSE;

   }

 

@@ -275,7 +275,11 @@ TdesCbcEncrypt (
   //

   // Check input parameters.

   //

-  if (TdesContext == NULL || Input == NULL || (InputSize % TDES_BLOCK_SIZE) != 0 || Ivec == NULL || Output == NULL) {

+  if (TdesContext == NULL || Input == NULL || (InputSize % TDES_BLOCK_SIZE) != 0) {

+    return FALSE;

+  }

+

+  if (Ivec == NULL || Output == NULL || InputSize > INT_MAX) {

     return FALSE;

   }

 

@@ -339,7 +343,11 @@ TdesCbcDecrypt (
   //

   // Check input parameters.

   //

-  if (TdesContext == NULL || Input == NULL || (InputSize % TDES_BLOCK_SIZE) != 0 || Ivec == NULL || Output == NULL) {

+  if (TdesContext == NULL || Input == NULL || (InputSize % TDES_BLOCK_SIZE) != 0) {

+    return FALSE;

+  }

+

+  if (Ivec == NULL || Output == NULL || InputSize > INT_MAX) {

     return FALSE;

   }

 

diff --git a/Cryptlib/Cryptlib.diff b/Cryptlib/Cryptlib.diff
index d30743f1..9663d90a 100644
--- a/Cryptlib/Cryptlib.diff
+++ b/Cryptlib/Cryptlib.diff
@@ -34,3 +34,24 @@ index 805e6b4..bb7bcba 100644
  

    //

    // Years Handling

+diff --git a/Cryptlib/SysCall/CrtWrapper.c b/Cryptlib/SysCall/CrtWrapper.c
+index fb446b6..5a8322d 100644
+--- a/Cryptlib/SysCall/CrtWrapper.c
++++ b/Cryptlib/SysCall/CrtWrapper.c
+@@ -293,16 +293,6 @@ size_t fwrite (const void *buffer, size_t size, size_t count, FILE *stream)
+ //  -- Dummy OpenSSL Support Routines --

+ //

+ 

+-int BIO_printf (void *bio, const char *format, ...)

+-{

+-  return 0;

+-}

+-

+-int BIO_snprintf(char *buf, size_t n, const char *format, ...)

+-{

+-  return 0;

+-}

+-

+ void *UI_OpenSSL(void)

+ {

+   return NULL;

diff --git a/Cryptlib/Hash/CryptMd4.c b/Cryptlib/Hash/CryptMd4.c
index 31fc4dce..633d3437 100644
--- a/Cryptlib/Hash/CryptMd4.c
+++ b/Cryptlib/Hash/CryptMd4.c
@@ -30,7 +30,7 @@ Md4GetContextSize (
   //

   // Retrieves the OpenSSL MD4 Context Size

   //

-  return (UINTN)(sizeof (MD4_CTX));

+  return (UINTN) (sizeof (MD4_CTX));

 }

 

 /**

@@ -61,7 +61,7 @@ Md4Init (
   //

   // OpenSSL MD4 Context Initialization

   //

-  return (BOOLEAN) (MD4_Init ((MD4_CTX *)Md4Context));

+  return (BOOLEAN) (MD4_Init ((MD4_CTX *) Md4Context));

 }

 

 /**

@@ -139,7 +139,7 @@ Md4Update (
   //

   // OpenSSL MD4 Hash Update

   //

-  return (BOOLEAN) (MD4_Update ((MD4_CTX *)Md4Context, Data, DataSize));

+  return (BOOLEAN) (MD4_Update ((MD4_CTX *) Md4Context, Data, DataSize));

 }

 

 /**

@@ -179,5 +179,5 @@ Md4Final (
   //

   // OpenSSL MD4 Hash Finalization

   //

-  return (BOOLEAN) (MD4_Final (HashValue, (MD4_CTX *)Md4Context));

+  return (BOOLEAN) (MD4_Final (HashValue, (MD4_CTX *) Md4Context));

 }

diff --git a/Cryptlib/Hash/CryptMd5.c b/Cryptlib/Hash/CryptMd5.c
index 1d852c74..dcf76913 100644
--- a/Cryptlib/Hash/CryptMd5.c
+++ b/Cryptlib/Hash/CryptMd5.c
@@ -31,7 +31,7 @@ Md5GetContextSize (
   //

   // Retrieves the OpenSSL MD5 Context Size

   //

-  return (UINTN)(sizeof (MD5_CTX));

+  return (UINTN) (sizeof (MD5_CTX));

 }

 

 

@@ -63,7 +63,7 @@ Md5Init (
   //

   // OpenSSL MD5 Context Initialization

   //

-  return (BOOLEAN) (MD5_Init ((MD5_CTX *)Md5Context));

+  return (BOOLEAN) (MD5_Init ((MD5_CTX *) Md5Context));

 }

 

 /**

@@ -141,7 +141,7 @@ Md5Update (
   //

   // OpenSSL MD5 Hash Update

   //

-  return (BOOLEAN) (MD5_Update ((MD5_CTX *)Md5Context, Data, DataSize));

+  return (BOOLEAN) (MD5_Update ((MD5_CTX *) Md5Context, Data, DataSize));

 }

 

 /**

@@ -181,5 +181,5 @@ Md5Final (
   //

   // OpenSSL MD5 Hash Finalization

   //

-  return (BOOLEAN) (MD5_Final (HashValue, (MD5_CTX *)Md5Context));

+  return (BOOLEAN) (MD5_Final (HashValue, (MD5_CTX *) Md5Context));

 }

diff --git a/Cryptlib/Hash/CryptSha1.c b/Cryptlib/Hash/CryptSha1.c
index 633028b6..78c29c1b 100644
--- a/Cryptlib/Hash/CryptSha1.c
+++ b/Cryptlib/Hash/CryptSha1.c
@@ -31,7 +31,7 @@ Sha1GetContextSize (
   //

   // Retrieves OpenSSL SHA Context Size

   //

-  return (UINTN)(sizeof (SHA_CTX));

+  return (UINTN) (sizeof (SHA_CTX));

 }

 

 /**

@@ -62,7 +62,7 @@ Sha1Init (
   //

   // OpenSSL SHA-1 Context Initialization

   //

-  return (BOOLEAN) (SHA1_Init ((SHA_CTX *)Sha1Context));

+  return (BOOLEAN) (SHA1_Init ((SHA_CTX *) Sha1Context));

 }

 

 /**

@@ -140,7 +140,7 @@ Sha1Update (
   //

   // OpenSSL SHA-1 Hash Update

   //

-  return (BOOLEAN) (SHA1_Update ((SHA_CTX *)Sha1Context, Data, DataSize));

+  return (BOOLEAN) (SHA1_Update ((SHA_CTX *) Sha1Context, Data, DataSize));

 }

 

 /**

@@ -180,5 +180,5 @@ Sha1Final (
   //

   // OpenSSL SHA-1 Hash Finalization

   //

-  return (BOOLEAN) (SHA1_Final (HashValue, (SHA_CTX *)Sha1Context));

+  return (BOOLEAN) (SHA1_Final (HashValue, (SHA_CTX *) Sha1Context));

 }

diff --git a/Cryptlib/Hash/CryptSha256.c b/Cryptlib/Hash/CryptSha256.c
index ca0cb1aa..56894aca 100644
--- a/Cryptlib/Hash/CryptSha256.c
+++ b/Cryptlib/Hash/CryptSha256.c
@@ -30,7 +30,7 @@ Sha256GetContextSize (
   //

   // Retrieves OpenSSL SHA-256 Context Size

   //

-  return (UINTN)(sizeof (SHA256_CTX));

+  return (UINTN) (sizeof (SHA256_CTX));

 }

 

 /**

@@ -61,7 +61,7 @@ Sha256Init (
   //

   // OpenSSL SHA-256 Context Initialization

   //

-  return (BOOLEAN) (SHA256_Init ((SHA256_CTX *)Sha256Context));

+  return (BOOLEAN) (SHA256_Init ((SHA256_CTX *) Sha256Context));

 }

 

 /**

@@ -139,7 +139,7 @@ Sha256Update (
   //

   // OpenSSL SHA-256 Hash Update

   //

-  return (BOOLEAN) (SHA256_Update ((SHA256_CTX *)Sha256Context, Data, DataSize));

+  return (BOOLEAN) (SHA256_Update ((SHA256_CTX *) Sha256Context, Data, DataSize));

 }

 

 /**

@@ -179,5 +179,5 @@ Sha256Final (
   //

   // OpenSSL SHA-256 Hash Finalization

   //

-  return (BOOLEAN) (SHA256_Final (HashValue, (SHA256_CTX *)Sha256Context));

+  return (BOOLEAN) (SHA256_Final (HashValue, (SHA256_CTX *) Sha256Context));

 }

diff --git a/Cryptlib/Hmac/CryptHmacMd5.c b/Cryptlib/Hmac/CryptHmacMd5.c
index 0cdab7ac..693cd322 100644
--- a/Cryptlib/Hmac/CryptHmacMd5.c
+++ b/Cryptlib/Hmac/CryptHmacMd5.c
@@ -30,7 +30,7 @@ HmacMd5GetContextSize (
   //

   // Retrieves the OpenSSL HMAC-MD5 Context Size

   //

-  return (UINTN)(sizeof (HMAC_CTX));

+  return (UINTN) (sizeof (HMAC_CTX));

 }

 

 /**

@@ -58,7 +58,7 @@ HmacMd5Init (
   //

   // Check input parameters.

   //

-  if (HmacMd5Context == NULL) {

+  if (HmacMd5Context == NULL || KeySize > INT_MAX) {

     return FALSE;

   }

 

diff --git a/Cryptlib/Hmac/CryptHmacSha1.c b/Cryptlib/Hmac/CryptHmacSha1.c
index 58da2f3a..881d26cf 100644
--- a/Cryptlib/Hmac/CryptHmacSha1.c
+++ b/Cryptlib/Hmac/CryptHmacSha1.c
@@ -30,7 +30,7 @@ HmacSha1GetContextSize (
   //

   // Retrieves the OpenSSL HMAC-SHA1 Context Size

   //

-  return (UINTN)(sizeof (HMAC_CTX));

+  return (UINTN) (sizeof (HMAC_CTX));

 }

 

 /**

@@ -58,7 +58,7 @@ HmacSha1Init (
   //

   // Check input parameters.

   //

-  if (HmacSha1Context == NULL) {

+  if (HmacSha1Context == NULL || KeySize > INT_MAX) {

     return FALSE;

   }

 

diff --git a/Cryptlib/InternalCryptLib.h b/Cryptlib/InternalCryptLib.h
index b0476269..35a8eb1c 100644
--- a/Cryptlib/InternalCryptLib.h
+++ b/Cryptlib/InternalCryptLib.h
@@ -21,6 +21,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/DebugLib.h>

 #include <Library/BaseCryptLib.h>

 

+#include "OpenSslSupport.h"

+

 //

 // Environment Setting for OpenSSL-based UEFI Crypto Library.

 //

@@ -28,25 +30,5 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define OPENSSL_SYSNAME_UWIN

 #endif

 

-/**

-  Pop single certificate from STACK_OF(X509).

-

-  If X509Stack, Cert, or CertSize is NULL, then return FALSE.

-

-  @param[in]  X509Stack       Pointer to a X509 stack object.

-  @param[out] Cert            Pointer to a X509 certificate.

-  @param[out] CertSize        Length of output X509 certificate in bytes.

-                                 

-  @retval     TRUE            The X509 stack pop succeeded.

-  @retval     FALSE           The pop operation failed.

-

-**/

-BOOLEAN

-X509PopCertificate (

-  IN  VOID  *X509Stack,

-  OUT UINT8 **Cert,

-  OUT UINTN *CertSize

-  );

-

 #endif

 

diff --git a/Cryptlib/Library/BaseCryptLib.h b/Cryptlib/Library/BaseCryptLib.h
index 0f4b026c..715a8e2f 100644
--- a/Cryptlib/Library/BaseCryptLib.h
+++ b/Cryptlib/Library/BaseCryptLib.h
@@ -1400,7 +1400,7 @@ RsaPkcs1Verify (
   IN  VOID         *RsaContext,

   IN  CONST UINT8  *MessageHash,

   IN  UINTN        HashSize,

-  IN  UINT8        *Signature,

+  IN  CONST UINT8  *Signature,

   IN  UINTN        SigSize

   );

 

diff --git a/Cryptlib/Makefile b/Cryptlib/Makefile
index 08908389..a05a4db0 100644
--- a/Cryptlib/Makefile
+++ b/Cryptlib/Makefile
@@ -27,7 +27,8 @@ OBJS		=   Hash/CryptMd4.o \
 		    Cipher/CryptTdes.o \
 		    Cipher/CryptArc4.o \
 		    Rand/CryptRand.o \
-		    Pk/CryptRsa.o \
+		    Pk/CryptRsaBasic.o \
+		    Pk/CryptRsaExt.o \
 		    Pk/CryptPkcs7.o \
 		    Pk/CryptDh.o \
 		    Pk/CryptX509.o \
diff --git a/Cryptlib/OpenSSL/Makefile b/Cryptlib/OpenSSL/Makefile
index 1960b6b3..c93d5afb 100644
--- a/Cryptlib/OpenSSL/Makefile
+++ b/Cryptlib/OpenSSL/Makefile
@@ -10,7 +10,7 @@ LIB_GCC		= $(shell $(CC) -print-libgcc-file-name)
 EFI_LIBS	= -lefi -lgnuefi $(LIB_GCC)
 
 CFLAGS		= -ggdb -O0 -I. -I.. -I../Include/ -Icrypto -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar -nostdinc -mno-mmx -mno-sse -mno-red-zone -maccumulate-outgoing-args \
-		  -Wall $(EFI_INCLUDES) -DOPENSSL_SYSNAME_UWIN -DOPENSSL_SYS_UEFI -DL_ENDIAN -DSIXTY_FOUR_BIT_LONG -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_SOCK -DOPENSSL_NO_CMS -DOPENSSL_NO_JPAKE -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_ERR -DOPENSSL_NO_KRB5 -DOPENSSL_NO_DYNAMIC_ENGINE -DGETPID_IS_MEANINGLESS -DOPENSSL_NO_STDIO -DOPENSSL_NO_FP_API -DOPENSSL_NO_DGRAM -DOPENSSL_NO_SHA0 -DOPENSSL_NO_SHA512 -DOPENSSL_NO_LHASH -DOPENSSL_NO_HW -DOPENSSL_NO_OCSP -DOPENSSL_NO_LOCKING -DOPENSSL_NO_DEPRECATED -DOPENSSL_SMALL_FOOTPRINT -DPEDANTIC
+		  -Wall $(EFI_INCLUDES) -DOPENSSL_SYSNAME_UWIN -DOPENSSL_SYS_UEFI -DL_ENDIAN -DSIXTY_FOUR_BIT_LONG -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DOPENSSL_NO_SOCK -DOPENSSL_NO_CMS -DOPENSSL_NO_JPAKE -DOPENSSL_NO_CAPIENG -DOPENSSL_NO_ERR -DOPENSSL_NO_KRB5 -DOPENSSL_NO_DYNAMIC_ENGINE -DGETPID_IS_MEANINGLESS -DOPENSSL_NO_STDIO -DOPENSSL_NO_FP_API -DOPENSSL_NO_DGRAM -DOPENSSL_NO_SHA0 -DOPENSSL_NO_LHASH -DOPENSSL_NO_HW -DOPENSSL_NO_OCSP -DOPENSSL_NO_LOCKING -DOPENSSL_NO_DEPRECATED -DOPENSSL_SMALL_FOOTPRINT -DPEDANTIC
 ifeq ($(ARCH),x86_64)
 	CFLAGS	+= -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI
 endif
@@ -215,6 +215,7 @@ OBJS		=   crypto/cryptlib.o \
   crypto/bio/bf_null.o \
   crypto/bio/bf_buff.o \
   crypto/bio/b_dump.o \
+  crypto/bio/b_print.o \
   crypto/bio/bf_nbio.o \
   crypto/bio/bss_log.o \
   crypto/bio/bss_bio.o \
diff --git a/Cryptlib/OpenSSL/crypto/bio/b_print.c b/Cryptlib/OpenSSL/crypto/bio/b_print.c
new file mode 100644
index 00000000..b8b630c3
--- /dev/null
+++ b/Cryptlib/OpenSSL/crypto/bio/b_print.c
@@ -0,0 +1,850 @@
+/* crypto/bio/b_print.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+/* disable assert() unless BIO_DEBUG has been defined */
+#ifndef BIO_DEBUG
+# ifndef NDEBUG
+#  define NDEBUG
+# endif
+#endif
+
+/* 
+ * Stolen from tjh's ssl/ssl_trc.c stuff.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <assert.h>
+#include <limits.h>
+#include "cryptlib.h"
+#ifndef NO_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#include <openssl/bn.h>         /* To get BN_LLONG properly defined */
+#include <openssl/bio.h>
+
+#if defined(BN_LLONG) || defined(SIXTY_FOUR_BIT)
+# ifndef HAVE_LONG_LONG
+#  define HAVE_LONG_LONG 1
+# endif
+#endif
+
+/***************************************************************************/
+
+/*
+ * Copyright Patrick Powell 1995
+ * This code is based on code written by Patrick Powell <papowell@astart.com>
+ * It may be used for any purpose as long as this notice remains intact
+ * on all source code distributions.
+ */
+
+/*
+ * This code contains numerious changes and enhancements which were
+ * made by lots of contributors over the last years to Patrick Powell's
+ * original code:
+ *
+ * o Patrick Powell <papowell@astart.com>      (1995)
+ * o Brandon Long <blong@fiction.net>          (1996, for Mutt)
+ * o Thomas Roessler <roessler@guug.de>        (1998, for Mutt)
+ * o Michael Elkins <me@cs.hmc.edu>            (1998, for Mutt)
+ * o Andrew Tridgell <tridge@samba.org>        (1998, for Samba)
+ * o Luke Mewburn <lukem@netbsd.org>           (1999, for LukemFTP)
+ * o Ralf S. Engelschall <rse@engelschall.com> (1999, for Pth)
+ * o ...                                       (for OpenSSL)
+ */
+
+#ifdef HAVE_LONG_DOUBLE
+#define LDOUBLE long double
+#else
+#define LDOUBLE double
+#endif
+
+#if HAVE_LONG_LONG
+# if defined(OPENSSL_SYS_WIN32) && !defined(__GNUC__)
+# define LLONG __int64
+# else
+# define LLONG long long
+# endif
+#else
+#define LLONG long
+#endif
+
+static void fmtstr     (char **, char **, size_t *, size_t *,
+			const char *, int, int, int);
+static void fmtint     (char **, char **, size_t *, size_t *,
+			LLONG, int, int, int, int);
+#ifndef OPENSSL_SYS_UEFI
+static void fmtfp      (char **, char **, size_t *, size_t *,
+			LDOUBLE, int, int, int);
+#endif
+static void doapr_outch (char **, char **, size_t *, size_t *, int);
+static void _dopr(char **sbuffer, char **buffer,
+		  size_t *maxlen, size_t *retlen, int *truncated,
+		  const char *format, va_list args);
+
+/* format read states */
+#define DP_S_DEFAULT    0
+#define DP_S_FLAGS      1
+#define DP_S_MIN        2
+#define DP_S_DOT        3
+#define DP_S_MAX        4
+#define DP_S_MOD        5
+#define DP_S_CONV       6
+#define DP_S_DONE       7
+
+/* format flags - Bits */
+#define DP_F_MINUS      (1 << 0)
+#define DP_F_PLUS       (1 << 1)
+#define DP_F_SPACE      (1 << 2)
+#define DP_F_NUM        (1 << 3)
+#define DP_F_ZERO       (1 << 4)
+#define DP_F_UP         (1 << 5)
+#define DP_F_UNSIGNED   (1 << 6)
+
+/* conversion flags */
+#define DP_C_SHORT      1
+#define DP_C_LONG       2
+#define DP_C_LDOUBLE    3
+#define DP_C_LLONG      4
+
+/* some handy macros */
+#define char_to_int(p) (p - '0')
+#define OSSL_MAX(p,q) ((p >= q) ? p : q)
+
+static void
+_dopr(
+    char **sbuffer,
+    char **buffer,
+    size_t *maxlen,
+    size_t *retlen,
+    int *truncated,
+    const char *format,
+    va_list args)
+{
+    char ch;
+    LLONG value;
+#ifndef OPENSSL_SYS_UEFI
+    LDOUBLE fvalue;
+#endif
+    char *strvalue;
+    int min;
+    int max;
+    int state;
+    int flags;
+    int cflags;
+    size_t currlen;
+
+    state = DP_S_DEFAULT;
+    flags = currlen = cflags = min = 0;
+    max = -1;
+    ch = *format++;
+
+    while (state != DP_S_DONE) {
+        if (ch == '\0' || (buffer == NULL && currlen >= *maxlen))
+            state = DP_S_DONE;
+
+        switch (state) {
+        case DP_S_DEFAULT:
+            if (ch == '%')
+                state = DP_S_FLAGS;
+            else
+                doapr_outch(sbuffer,buffer, &currlen, maxlen, ch);
+            ch = *format++;
+            break;
+        case DP_S_FLAGS:
+            switch (ch) {
+            case '-':
+                flags |= DP_F_MINUS;
+                ch = *format++;
+                break;
+            case '+':
+                flags |= DP_F_PLUS;
+                ch = *format++;
+                break;
+            case ' ':
+                flags |= DP_F_SPACE;
+                ch = *format++;
+                break;
+            case '#':
+                flags |= DP_F_NUM;
+                ch = *format++;
+                break;
+            case '0':
+                flags |= DP_F_ZERO;
+                ch = *format++;
+                break;
+            default:
+                state = DP_S_MIN;
+                break;
+            }
+            break;
+        case DP_S_MIN:
+            if (isdigit((unsigned char)ch)) {
+                min = 10 * min + char_to_int(ch);
+                ch = *format++;
+            } else if (ch == '*') {
+                min = va_arg(args, int);
+                ch = *format++;
+                state = DP_S_DOT;
+            } else
+                state = DP_S_DOT;
+            break;
+        case DP_S_DOT:
+            if (ch == '.') {
+                state = DP_S_MAX;
+                ch = *format++;
+            } else
+                state = DP_S_MOD;
+            break;
+        case DP_S_MAX:
+            if (isdigit((unsigned char)ch)) {
+                if (max < 0)
+                    max = 0;
+                max = 10 * max + char_to_int(ch);
+                ch = *format++;
+            } else if (ch == '*') {
+                max = va_arg(args, int);
+                ch = *format++;
+                state = DP_S_MOD;
+            } else
+                state = DP_S_MOD;
+            break;
+        case DP_S_MOD:
+            switch (ch) {
+            case 'h':
+                cflags = DP_C_SHORT;
+                ch = *format++;
+                break;
+            case 'l':
+                if (*format == 'l') {
+                    cflags = DP_C_LLONG;
+                    format++;
+                } else
+                    cflags = DP_C_LONG;
+                ch = *format++;
+                break;
+            case 'q':
+                cflags = DP_C_LLONG;
+                ch = *format++;
+                break;
+            case 'L':
+                cflags = DP_C_LDOUBLE;
+                ch = *format++;
+                break;
+            default:
+                break;
+            }
+            state = DP_S_CONV;
+            break;
+        case DP_S_CONV:
+            switch (ch) {
+            case 'd':
+            case 'i':
+                switch (cflags) {
+                case DP_C_SHORT:
+                    value = (short int)va_arg(args, int);
+                    break;
+                case DP_C_LONG:
+                    value = va_arg(args, long int);
+                    break;
+                case DP_C_LLONG:
+                    value = va_arg(args, LLONG);
+                    break;
+                default:
+                    value = va_arg(args, int);
+                    break;
+                }
+                fmtint(sbuffer, buffer, &currlen, maxlen,
+                       value, 10, min, max, flags);
+                break;
+            case 'X':
+                flags |= DP_F_UP;
+                /* FALLTHROUGH */
+            case 'x':
+            case 'o':
+            case 'u':
+                flags |= DP_F_UNSIGNED;
+                switch (cflags) {
+                case DP_C_SHORT:
+                    value = (unsigned short int)va_arg(args, unsigned int);
+                    break;
+                case DP_C_LONG:
+                    value = (LLONG) va_arg(args,
+                        unsigned long int);
+                    break;
+                case DP_C_LLONG:
+                    value = va_arg(args, unsigned LLONG);
+                    break;
+                default:
+                    value = (LLONG) va_arg(args,
+                        unsigned int);
+                    break;
+                }
+                fmtint(sbuffer, buffer, &currlen, maxlen, value,
+                       ch == 'o' ? 8 : (ch == 'u' ? 10 : 16),
+                       min, max, flags);
+                break;
+#ifndef OPENSSL_SYS_UEFI
+            case 'f':
+                if (cflags == DP_C_LDOUBLE)
+                    fvalue = va_arg(args, LDOUBLE);
+                else
+                    fvalue = va_arg(args, double);
+                fmtfp(sbuffer, buffer, &currlen, maxlen,
+                      fvalue, min, max, flags);
+                break;
+            case 'E':
+                flags |= DP_F_UP;
+            case 'e':
+                if (cflags == DP_C_LDOUBLE)
+                    fvalue = va_arg(args, LDOUBLE);
+                else
+                    fvalue = va_arg(args, double);
+                break;
+            case 'G':
+                flags |= DP_F_UP;
+            case 'g':
+                if (cflags == DP_C_LDOUBLE)
+                    fvalue = va_arg(args, LDOUBLE);
+                else
+                    fvalue = va_arg(args, double);
+                break;
+#endif
+            case 'c':
+                doapr_outch(sbuffer, buffer, &currlen, maxlen,
+                    va_arg(args, int));
+                break;
+            case 's':
+                strvalue = va_arg(args, char *);
+                if (max < 0) {
+		    if (buffer)
+			max = INT_MAX;
+		    else
+			max = *maxlen;
+		}
+                fmtstr(sbuffer, buffer, &currlen, maxlen, strvalue,
+                       flags, min, max);
+                break;
+            case 'p':
+                value = (long)va_arg(args, void *);
+                fmtint(sbuffer, buffer, &currlen, maxlen,
+                    value, 16, min, max, flags|DP_F_NUM);
+                break;
+            case 'n': /* XXX */
+                if (cflags == DP_C_SHORT) {
+                    short int *num;
+                    num = va_arg(args, short int *);
+                    *num = currlen;
+                } else if (cflags == DP_C_LONG) { /* XXX */
+                    long int *num;
+                    num = va_arg(args, long int *);
+                    *num = (long int) currlen;
+                } else if (cflags == DP_C_LLONG) { /* XXX */
+                    LLONG *num;
+                    num = va_arg(args, LLONG *);
+                    *num = (LLONG) currlen;
+                } else {
+                    int    *num;
+                    num = va_arg(args, int *);
+                    *num = currlen;
+                }
+                break;
+            case '%':
+                doapr_outch(sbuffer, buffer, &currlen, maxlen, ch);
+                break;
+            case 'w':
+                /* not supported yet, treat as next char */
+                ch = *format++;
+                break;
+            default:
+                /* unknown, skip */
+                break;
+            }
+            ch = *format++;
+            state = DP_S_DEFAULT;
+            flags = cflags = min = 0;
+            max = -1;
+            break;
+        case DP_S_DONE:
+            break;
+        default:
+            break;
+        }
+    }
+    *truncated = (currlen > *maxlen - 1);
+    if (*truncated)
+        currlen = *maxlen - 1;
+    doapr_outch(sbuffer, buffer, &currlen, maxlen, '\0');
+    *retlen = currlen - 1;
+    return;
+}
+
+static void
+fmtstr(
+    char **sbuffer,
+    char **buffer,
+    size_t *currlen,
+    size_t *maxlen,
+    const char *value,
+    int flags,
+    int min,
+    int max)
+{
+    int padlen, strln;
+    int cnt = 0;
+
+    if (value == 0)
+        value = "<NULL>";
+    for (strln = 0; value[strln]; ++strln)
+        ;
+    padlen = min - strln;
+    if (padlen < 0)
+        padlen = 0;
+    if (flags & DP_F_MINUS)
+        padlen = -padlen;
+
+    while ((padlen > 0) && (cnt < max)) {
+        doapr_outch(sbuffer, buffer, currlen, maxlen, ' ');
+        --padlen;
+        ++cnt;
+    }
+    while (*value && (cnt < max)) {
+        doapr_outch(sbuffer, buffer, currlen, maxlen, *value++);
+        ++cnt;
+    }
+    while ((padlen < 0) && (cnt < max)) {
+        doapr_outch(sbuffer, buffer, currlen, maxlen, ' ');
+        ++padlen;
+        ++cnt;
+    }
+}
+
+static void
+fmtint(
+    char **sbuffer,
+    char **buffer,
+    size_t *currlen,
+    size_t *maxlen,
+    LLONG value,
+    int base,
+    int min,
+    int max,
+    int flags)
+{
+    int signvalue = 0;
+    const char *prefix = "";
+    unsigned LLONG uvalue;
+    char convert[DECIMAL_SIZE(value)+3];
+    int place = 0;
+    int spadlen = 0;
+    int zpadlen = 0;
+    int caps = 0;
+
+    if (max < 0)
+        max = 0;
+    uvalue = value;
+    if (!(flags & DP_F_UNSIGNED)) {
+        if (value < 0) {
+            signvalue = '-';
+            uvalue = -value;
+        } else if (flags & DP_F_PLUS)
+            signvalue = '+';
+        else if (flags & DP_F_SPACE)
+            signvalue = ' ';
+    }
+    if (flags & DP_F_NUM) {
+	if (base == 8) prefix = "0";
+	if (base == 16) prefix = "0x";
+    }
+    if (flags & DP_F_UP)
+        caps = 1;
+    do {
+        convert[place++] =
+            (caps ? "0123456789ABCDEF" : "0123456789abcdef")
+            [uvalue % (unsigned) base];
+        uvalue = (uvalue / (unsigned) base);
+    } while (uvalue && (place < (int)sizeof(convert)));
+    if (place == sizeof(convert))
+        place--;
+    convert[place] = 0;
+
+    zpadlen = max - place;
+    spadlen = min - OSSL_MAX(max, place) - (signvalue ? 1 : 0) - strlen(prefix);
+    if (zpadlen < 0)
+        zpadlen = 0;
+    if (spadlen < 0)
+        spadlen = 0;
+    if (flags & DP_F_ZERO) {
+        zpadlen = OSSL_MAX(zpadlen, spadlen);
+        spadlen = 0;
+    }
+    if (flags & DP_F_MINUS)
+        spadlen = -spadlen;
+
+    /* spaces */
+    while (spadlen > 0) {
+        doapr_outch(sbuffer, buffer, currlen, maxlen, ' ');
+        --spadlen;
+    }
+
+    /* sign */
+    if (signvalue)
+        doapr_outch(sbuffer, buffer, currlen, maxlen, signvalue);
+
+    /* prefix */
+    while (*prefix) {
+	doapr_outch(sbuffer, buffer, currlen, maxlen, *prefix);
+	prefix++;
+    }
+
+    /* zeros */
+    if (zpadlen > 0) {
+        while (zpadlen > 0) {
+            doapr_outch(sbuffer, buffer, currlen, maxlen, '0');
+            --zpadlen;
+        }
+    }
+    /* digits */
+    while (place > 0)
+        doapr_outch(sbuffer, buffer, currlen, maxlen, convert[--place]);
+
+    /* left justified spaces */
+    while (spadlen < 0) {
+        doapr_outch(sbuffer, buffer, currlen, maxlen, ' ');
+        ++spadlen;
+    }
+    return;
+}
+
+#ifndef OPENSSL_SYS_UEFI
+static LDOUBLE
+abs_val(LDOUBLE value)
+{
+    LDOUBLE result = value;
+    if (value < 0)
+        result = -value;
+    return result;
+}
+
+static LDOUBLE
+pow_10(int in_exp)
+{
+    LDOUBLE result = 1;
+    while (in_exp) {
+        result *= 10;
+        in_exp--;
+    }
+    return result;
+}
+
+static long
+roundv(LDOUBLE value)
+{
+    long intpart;
+    intpart = (long) value;
+    value = value - intpart;
+    if (value >= 0.5)
+        intpart++;
+    return intpart;
+}
+
+static void
+fmtfp(
+    char **sbuffer,
+    char **buffer,
+    size_t *currlen,
+    size_t *maxlen,
+    LDOUBLE fvalue,
+    int min,
+    int max,
+    int flags)
+{
+    int signvalue = 0;
+    LDOUBLE ufvalue;
+    char iconvert[20];
+    char fconvert[20];
+    int iplace = 0;
+    int fplace = 0;
+    int padlen = 0;
+    int zpadlen = 0;
+    int caps = 0;
+    long intpart;
+    long fracpart;
+    long max10;
+
+    if (max < 0)
+        max = 6;
+    ufvalue = abs_val(fvalue);
+    if (fvalue < 0)
+        signvalue = '-';
+    else if (flags & DP_F_PLUS)
+        signvalue = '+';
+    else if (flags & DP_F_SPACE)
+        signvalue = ' ';
+
+    intpart = (long)ufvalue;
+
+    /* sorry, we only support 9 digits past the decimal because of our
+       conversion method */
+    if (max > 9)
+        max = 9;
+
+    /* we "cheat" by converting the fractional part to integer by
+       multiplying by a factor of 10 */
+    max10 = roundv(pow_10(max));
+    fracpart = roundv(pow_10(max) * (ufvalue - intpart));
+
+    if (fracpart >= max10) {
+        intpart++;
+        fracpart -= max10;
+    }
+
+    /* convert integer part */
+    do {
+        iconvert[iplace++] =
+            (caps ? "0123456789ABCDEF"
+              : "0123456789abcdef")[intpart % 10];
+        intpart = (intpart / 10);
+    } while (intpart && (iplace < (int)sizeof(iconvert)));
+    if (iplace == sizeof iconvert)
+        iplace--;
+    iconvert[iplace] = 0;
+
+    /* convert fractional part */
+    do {
+        fconvert[fplace++] =
+            (caps ? "0123456789ABCDEF"
+              : "0123456789abcdef")[fracpart % 10];
+        fracpart = (fracpart / 10);
+    } while (fplace < max);
+    if (fplace == sizeof fconvert)
+        fplace--;
+    fconvert[fplace] = 0;
+
+    /* -1 for decimal point, another -1 if we are printing a sign */
+    padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0);
+    zpadlen = max - fplace;
+    if (zpadlen < 0)
+        zpadlen = 0;
+    if (padlen < 0)
+        padlen = 0;
+    if (flags & DP_F_MINUS)
+        padlen = -padlen;
+
+    if ((flags & DP_F_ZERO) && (padlen > 0)) {
+        if (signvalue) {
+            doapr_outch(sbuffer, buffer, currlen, maxlen, signvalue);
+            --padlen;
+            signvalue = 0;
+        }
+        while (padlen > 0) {
+            doapr_outch(sbuffer, buffer, currlen, maxlen, '0');
+            --padlen;
+        }
+    }
+    while (padlen > 0) {
+        doapr_outch(sbuffer, buffer, currlen, maxlen, ' ');
+        --padlen;
+    }
+    if (signvalue)
+        doapr_outch(sbuffer, buffer, currlen, maxlen, signvalue);
+
+    while (iplace > 0)
+        doapr_outch(sbuffer, buffer, currlen, maxlen, iconvert[--iplace]);
+
+    /*
+     * Decimal point. This should probably use locale to find the correct
+     * char to print out.
+     */
+    if (max > 0 || (flags & DP_F_NUM)) {
+        doapr_outch(sbuffer, buffer, currlen, maxlen, '.');
+
+        while (fplace > 0)
+            doapr_outch(sbuffer, buffer, currlen, maxlen, fconvert[--fplace]);
+    }
+    while (zpadlen > 0) {
+        doapr_outch(sbuffer, buffer, currlen, maxlen, '0');
+        --zpadlen;
+    }
+
+    while (padlen < 0) {
+        doapr_outch(sbuffer, buffer, currlen, maxlen, ' ');
+        ++padlen;
+    }
+}
+#endif
+
+static void
+doapr_outch(
+    char **sbuffer,
+    char **buffer,
+    size_t *currlen,
+    size_t *maxlen,
+    int c)
+{
+    /* If we haven't at least one buffer, someone has doe a big booboo */
+    assert(*sbuffer != NULL || buffer != NULL);
+
+    if (buffer) {
+	while (*currlen >= *maxlen) {
+	    if (*buffer == NULL) {
+		if (*maxlen == 0)
+		    *maxlen = 1024;
+		*buffer = OPENSSL_malloc(*maxlen);
+		if (*currlen > 0) {
+		    assert(*sbuffer != NULL);
+		    memcpy(*buffer, *sbuffer, *currlen);
+		}
+		*sbuffer = NULL;
+	    } else {
+		*maxlen += 1024;
+		*buffer = OPENSSL_realloc(*buffer, *maxlen);
+	    }
+	}
+	/* What to do if *buffer is NULL? */
+	assert(*sbuffer != NULL || *buffer != NULL);
+    }
+
+    if (*currlen < *maxlen) {
+	if (*sbuffer)
+	    (*sbuffer)[(*currlen)++] = (char)c;
+	else
+	    (*buffer)[(*currlen)++] = (char)c;
+    }
+
+    return;
+}
+
+/***************************************************************************/
+
+int BIO_printf (BIO *bio, const char *format, ...)
+	{
+	va_list args;
+	int ret;
+
+	va_start(args, format);
+
+	ret = BIO_vprintf(bio, format, args);
+
+	va_end(args);
+	return(ret);
+	}
+
+int BIO_vprintf (BIO *bio, const char *format, va_list args)
+	{
+	int ret;
+	size_t retlen;
+	char hugebuf[1024*2];	/* Was previously 10k, which is unreasonable
+				   in small-stack environments, like threads
+				   or DOS programs. */
+	char *hugebufp = hugebuf;
+	size_t hugebufsize = sizeof(hugebuf);
+	char *dynbuf = NULL;
+	int ignored;
+
+	dynbuf = NULL;
+	CRYPTO_push_info("doapr()");
+	_dopr(&hugebufp, &dynbuf, &hugebufsize,
+		&retlen, &ignored, format, args);
+	if (dynbuf)
+		{
+		ret=BIO_write(bio, dynbuf, (int)retlen);
+		OPENSSL_free(dynbuf);
+		}
+	else
+		{
+		ret=BIO_write(bio, hugebuf, (int)retlen);
+		}
+	CRYPTO_pop_info();
+	return(ret);
+	}
+
+/* As snprintf is not available everywhere, we provide our own implementation.
+ * This function has nothing to do with BIOs, but it's closely related
+ * to BIO_printf, and we need *some* name prefix ...
+ * (XXX  the function should be renamed, but to what?) */
+int BIO_snprintf(char *buf, size_t n, const char *format, ...)
+	{
+	va_list args;
+	int ret;
+
+	va_start(args, format);
+
+	ret = BIO_vsnprintf(buf, n, format, args);
+
+	va_end(args);
+	return(ret);
+	}
+
+int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
+	{
+	size_t retlen;
+	int truncated;
+
+	_dopr(&buf, NULL, &n, &retlen, &truncated, format, args);
+
+	if (truncated)
+		/* In case of truncation, return -1 like traditional snprintf.
+		 * (Current drafts for ISO/IEC 9899 say snprintf should return
+		 * the number of characters that would have been written,
+		 * had the buffer been large enough.) */
+		return -1;
+	else
+		return (retlen <= INT_MAX) ? (int)retlen : -1;
+	}
diff --git a/Cryptlib/OpenSSL/crypto/pkcs7/pk7_smime.c b/Cryptlib/OpenSSL/crypto/pkcs7/pk7_smime.c
index d6db27c6..b0ff89aa 100755
--- a/Cryptlib/OpenSSL/crypto/pkcs7/pk7_smime.c
+++ b/Cryptlib/OpenSSL/crypto/pkcs7/pk7_smime.c
@@ -176,7 +176,8 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
 	STACK_OF(PKCS7_SIGNER_INFO) *sinfos;
 	PKCS7_SIGNER_INFO *si;
 	X509_STORE_CTX cert_ctx;
-	char buf[4096];
+	char *buf = NULL;
+	int bufsiz;
 	int i, j=0, k, ret = 0;
 	BIO *p7bio;
 	BIO *tmpin, *tmpout;
@@ -287,10 +288,16 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
 		BIO_set_mem_eof_return(tmpout, 0);
 	} else tmpout = out;
 
+	bufsiz = 4096;
+	buf = OPENSSL_malloc (bufsiz);
+	if (buf == NULL) {
+		goto err;
+	}
+
 	/* We now have to 'read' from p7bio to calculate digests etc. */
 	for (;;)
 	{
-		i=BIO_read(p7bio,buf,sizeof(buf));
+		i=BIO_read(p7bio,buf,bufsiz);
 		if (i <= 0) break;
 		if (tmpout) BIO_write(tmpout, buf, i);
 	}
@@ -329,6 +336,10 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
 
 	sk_X509_free(signers);
 
+	if (buf != NULL) {
+		OPENSSL_free (buf);
+	}
+
 	return ret;
 }
 
diff --git a/Cryptlib/Pem/CryptPem.c b/Cryptlib/Pem/CryptPem.c
index 2c3a97b2..51e648b7 100644
--- a/Cryptlib/Pem/CryptPem.c
+++ b/Cryptlib/Pem/CryptPem.c
@@ -1,7 +1,7 @@
 /** @file

   PEM (Privacy Enhanced Mail) Format Handler Wrapper Implementation over OpenSSL.

 

-Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2010 - 2013, 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

@@ -36,7 +36,7 @@ PasswordCallback (
 {

   INTN  KeyLength;

 

-  ZeroMem ((VOID *)Buf, (UINTN)Size);

+  ZeroMem ((VOID *) Buf, (UINTN) Size);

   if (Key != NULL) {

     //

     // Duplicate key phrase directly.

@@ -86,31 +86,41 @@ RsaGetPrivateKeyFromPem (
     return FALSE;

   }

 

-  Status = FALSE;

-  PemBio = NULL;

-

   //

   // Add possible block-cipher descriptor for PEM data decryption.

   // NOTE: Only support most popular ciphers (3DES, AES) for the encrypted PEM.

   //

-  EVP_add_cipher (EVP_des_ede3_cbc());

-  EVP_add_cipher (EVP_aes_128_cbc());

-  EVP_add_cipher (EVP_aes_192_cbc());

-  EVP_add_cipher (EVP_aes_256_cbc());

+  if (EVP_add_cipher (EVP_des_ede3_cbc ()) == 0) {

+    return FALSE;

+  }

+  if (EVP_add_cipher (EVP_aes_128_cbc ()) == 0) {

+    return FALSE;

+  }

+  if (EVP_add_cipher (EVP_aes_192_cbc ()) == 0) {

+    return FALSE;

+  }

+  if (EVP_add_cipher (EVP_aes_256_cbc ()) == 0) {

+    return FALSE;

+  }

+

+  Status = FALSE;

 

   //

   // Read encrypted PEM Data.

   //

   PemBio = BIO_new (BIO_s_mem ());

-  BIO_write (PemBio, PemData, (int)PemSize);

   if (PemBio == NULL) {

     goto _Exit;

   }

 

+  if (BIO_write (PemBio, PemData, (int) PemSize) <= 0) {

+    goto _Exit;

+  }

+

   //

   // Retrieve RSA Private Key from encrypted PEM data.

   //

-  *RsaContext = PEM_read_bio_RSAPrivateKey (PemBio, NULL, (pem_password_cb *)&PasswordCallback, (void *)Password);

+  *RsaContext = PEM_read_bio_RSAPrivateKey (PemBio, NULL, (pem_password_cb *) &PasswordCallback, (void *) Password);

   if (*RsaContext != NULL) {

     Status = TRUE;

   }

diff --git a/Cryptlib/Pk/CryptAuthenticode.c b/Cryptlib/Pk/CryptAuthenticode.c
index a4f62b22..bb5f6d4b 100644
--- a/Cryptlib/Pk/CryptAuthenticode.c
+++ b/Cryptlib/Pk/CryptAuthenticode.c
@@ -26,6 +26,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <openssl/x509.h>

 #include <openssl/pkcs7.h>

 

+//

+// OID ASN.1 Value for SPC_INDIRECT_DATA_OBJID

+//

+UINT8 mSpcIndirectOidValue[] = {

+  0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0x37, 0x02, 0x01, 0x04

+  };

 

 /**

   Verifies the validility of a PE/COFF Authenticode Signature as described in "Windows

@@ -70,6 +76,7 @@ AuthenticodeVerify (
   UINT8        *SpcIndirectDataContent;

   UINT8        Asn1Byte;

   UINTN        ContentSize;

+  UINT8        *SpcIndirectDataOid;

 

   //

   // Check input parameters.

@@ -106,6 +113,19 @@ AuthenticodeVerify (
   //       some authenticode-specific structure. Use opaque ASN.1 string to retrieve

   //       PKCS#7 ContentInfo here.

   //

+  SpcIndirectDataOid = (UINT8 *)(Pkcs7->d.sign->contents->type->data);

+  if (CompareMem (

+        SpcIndirectDataOid,

+        mSpcIndirectOidValue,

+        sizeof (mSpcIndirectOidValue)

+        ) != 0) {

+    //

+    // Un-matched SPC_INDIRECT_DATA_OBJID.

+    //

+    goto _Exit;

+  }  

+

+

   SpcIndirectDataContent = (UINT8 *)(Pkcs7->d.sign->contents->d.other->value.asn1_string->data);

 

   //

diff --git a/Cryptlib/Pk/CryptDh.c b/Cryptlib/Pk/CryptDh.c
index 20f13469..942b3d10 100644
--- a/Cryptlib/Pk/CryptDh.c
+++ b/Cryptlib/Pk/CryptDh.c
@@ -32,7 +32,7 @@ DhNew (
   //

   // Allocates & Initializes DH Context by OpenSSL DH_new()

   //

-  return (VOID *)DH_new ();

+  return (VOID *) DH_new ();

 }

 

 /**

@@ -52,7 +52,7 @@ DhFree (
   //

   // Free OpenSSL DH Context

   //

-  DH_free ((DH *)DhContext);

+  DH_free ((DH *) DhContext);

 }

 

 /**

@@ -91,7 +91,7 @@ DhGenerateParameter (
   //

   // Check input parameters.

   //

-  if (DhContext == NULL || Prime == NULL) {

+  if (DhContext == NULL || Prime == NULL || PrimeLength > INT_MAX) {

     return FALSE;

   }

 

@@ -139,12 +139,13 @@ DhSetParameter (
   IN      CONST UINT8  *Prime

   )

 {

-  DH  *Dh;

+  DH      *Dh;

+  BIGNUM  *Bn;

 

   //

   // Check input parameters.

   //

-  if (DhContext == NULL || Prime == NULL) {

+  if (DhContext == NULL || Prime == NULL || PrimeLength > INT_MAX) {

     return FALSE;

   }

   

@@ -152,14 +153,46 @@ DhSetParameter (
     return FALSE;

   }

 

+  Bn = NULL;

+

   Dh = (DH *) DhContext;

-  Dh->p = BN_new();

-  Dh->g = BN_new();

+  Dh->g = NULL;

+  Dh->p = BN_new ();

+  if (Dh->p == NULL) {

+    goto Error;

+  }

+  

+  Dh->g = BN_new ();

+  if (Dh->g == NULL) {

+    goto Error;

+  }

 

-  BN_bin2bn (Prime, (UINT32) (PrimeLength / 8), Dh->p);

-  BN_set_word (Dh->g, (UINT32) Generator);

+  Bn = BN_bin2bn (Prime, (UINT32) (PrimeLength / 8), Dh->p);

+  if (Bn == NULL) {

+    goto Error;

+  }

+

+  if (BN_set_word (Dh->g, (UINT32) Generator) == 0) {

+    goto Error;

+  }

 

   return TRUE;

+

+Error:

+

+  if (Dh->p != NULL) {

+    BN_free (Dh->p);

+  }

+

+  if (Dh->g != NULL) {

+    BN_free (Dh->g);

+  }

+

+  if (Bn != NULL) {

+    BN_free (Bn);

+  }

+  

+  return FALSE;

 }

 

 /**

@@ -194,6 +227,7 @@ DhGenerateKey (
 {

   BOOLEAN RetVal;

   DH      *Dh;

+  INTN    Size;

 

   //

   // Check input parameters.

@@ -207,12 +241,17 @@ DhGenerateKey (
   }

   

   Dh = (DH *) DhContext;

-  *PublicKeySize = 0;

 

   RetVal = (BOOLEAN) DH_generate_key (DhContext);

   if (RetVal) {

+    Size = BN_num_bytes (Dh->pub_key);

+    if ((Size > 0) && (*PublicKeySize < (UINTN) Size)) {

+      *PublicKeySize = Size;

+      return FALSE;

+    }

+    

     BN_bn2bin (Dh->pub_key, PublicKey);

-    *PublicKeySize  = BN_num_bytes (Dh->pub_key);

+    *PublicKeySize = Size;

   }

 

   return RetVal;

@@ -227,7 +266,8 @@ DhGenerateKey (
   If DhContext is NULL, then return FALSE.

   If PeerPublicKey is NULL, then return FALSE.

   If KeySize is NULL, then return FALSE.

-  If KeySize is large enough but Key is NULL, then return FALSE.

+  If Key is NULL, then return FALSE.

+  If KeySize is not large enough, then return FALSE.

 

   @param[in, out]  DhContext          Pointer to the DH context.

   @param[in]       PeerPublicKey      Pointer to the peer's public key.

@@ -252,23 +292,37 @@ DhComputeKey (
   )

 {

   BIGNUM  *Bn;

+  INTN    Size;

 

   //

   // Check input parameters.

   //

-  if (DhContext == NULL || PeerPublicKey == NULL || KeySize == NULL) {

+  if (DhContext == NULL || PeerPublicKey == NULL || KeySize == NULL || Key == NULL) {

     return FALSE;

   }

 

-  if (Key == NULL && *KeySize != 0) {

+  if (PeerPublicKeySize > INT_MAX) {

     return FALSE;

   }

   

   Bn = BN_bin2bn (PeerPublicKey, (UINT32) PeerPublicKeySize, NULL);

+  if (Bn == NULL) {

+    return FALSE;

+  }

 

-  *KeySize = (BOOLEAN) DH_compute_key (Key, Bn, DhContext);

+  Size = DH_compute_key (Key, Bn, DhContext);

+  if (Size < 0) {

+    BN_free (Bn);

+    return FALSE;

+  }

 

-  BN_free (Bn);

+  if (*KeySize < (UINTN) Size) {

+    *KeySize = Size;

+    BN_free (Bn);

+    return FALSE;

+  }

 

+  *KeySize = Size;

+  BN_free (Bn);

   return TRUE;

 }

diff --git a/Cryptlib/Pk/CryptRsa.c b/Cryptlib/Pk/CryptRsa.c
deleted file mode 100644
index 04833531..00000000
--- a/Cryptlib/Pk/CryptRsa.c
+++ /dev/null
@@ -1,722 +0,0 @@
-/** @file

-  RSA Asymmetric Cipher Wrapper Implementation over OpenSSL.

-

-Copyright (c) 2009 - 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

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-**/

-

-#include "InternalCryptLib.h"

-

-#include <openssl/rsa.h>

-#include <openssl/err.h>

-

-//

-// ASN.1 value for Hash Algorithm ID with the Distringuished Encoding Rules (DER)

-// Refer to Section 9.2 of PKCS#1 v2.1

-//                           

-CONST UINT8  Asn1IdMd5[] = {

-  0x30, 0x20, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86,

-  0xf7, 0x0d, 0x02, 0x05, 0x05, 0x00, 0x04, 0x10

-  };

-

-CONST UINT8  Asn1IdSha1[] = {

-  0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e,

-  0x03, 0x02, 0x1a, 0x05, 0x00, 0x04, 0x14

-  };

-

-CONST UINT8  Asn1IdSha256[] = {

-  0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86,

-  0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05,

-  0x00, 0x04, 0x20

-  };

-

-

-/**

-  Allocates and initializes one RSA context for subsequent use.

-

-  @return  Pointer to the RSA context that has been initialized.

-           If the allocations fails, RsaNew() returns NULL.

-

-**/

-VOID *

-EFIAPI

-RsaNew (

-  VOID

-  )

-{

-  //

-  // Allocates & Initializes RSA Context by OpenSSL RSA_new()

-  //

-  return (VOID *)RSA_new ();

-}

-

-/**

-  Release the specified RSA context.

-

-  If RsaContext is NULL, then return FALSE.

-

-  @param[in]  RsaContext  Pointer to the RSA context to be released.

-

-**/

-VOID

-EFIAPI

-RsaFree (

-  IN  VOID  *RsaContext

-  )

-{

-  //

-  // Free OpenSSL RSA Context

-  //

-  RSA_free ((RSA *)RsaContext);

-}

-

-/**

-  Sets the tag-designated key component into the established RSA context.

-

-  This function sets the tag-designated RSA key component into the established

-  RSA context from the user-specified non-negative integer (octet string format

-  represented in RSA PKCS#1).

-  If BigNumber is NULL, then the specified key componenet in RSA context is cleared.

-

-  If RsaContext is NULL, then return FALSE.

-

-  @param[in, out]  RsaContext  Pointer to RSA context being set.

-  @param[in]       KeyTag      Tag of RSA key component being set.

-  @param[in]       BigNumber   Pointer to octet integer buffer.

-                               If NULL, then the specified key componenet in RSA

-                               context is cleared.

-  @param[in]       BnSize      Size of big number buffer in bytes.

-                               If BigNumber is NULL, then it is ignored.

-

-  @retval  TRUE   RSA key component was set successfully.

-  @retval  FALSE  Invalid RSA key component tag.

-

-**/

-BOOLEAN

-EFIAPI

-RsaSetKey (

-  IN OUT  VOID         *RsaContext,

-  IN      RSA_KEY_TAG  KeyTag,

-  IN      CONST UINT8  *BigNumber,

-  IN      UINTN        BnSize

-  )

-{

-  RSA  *RsaKey;

-

-  //

-  // Check input parameters.

-  //

-  if (RsaContext == NULL) {

-    return FALSE;

-  }

-

-  RsaKey = (RSA *)RsaContext;

-  //

-  // Set RSA Key Components by converting octet string to OpenSSL BN representation.

-  // NOTE: For RSA public key (used in signature verification), only public components

-  //       (N, e) are needed.

-  //

-  switch (KeyTag) {

-

-  //

-  // RSA Public Modulus (N)

-  //

-  case RsaKeyN:

-    if (RsaKey->n != NULL) {

-      BN_free (RsaKey->n);

-    }

-    RsaKey->n = NULL;

-    if (BigNumber == NULL) {

-      break;

-    }

-    RsaKey->n = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->n);

-    break;

-

-  //

-  // RSA Public Exponent (e)

-  //

-  case RsaKeyE:

-    if (RsaKey->e != NULL) {

-      BN_free (RsaKey->e);

-    }

-    RsaKey->e = NULL;

-    if (BigNumber == NULL) {

-      break;

-    }

-    RsaKey->e = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->e);

-    break;

-

-  //

-  // RSA Private Exponent (d)

-  //

-  case RsaKeyD:

-    if (RsaKey->d != NULL) {

-      BN_free (RsaKey->d);

-    }

-    RsaKey->d = NULL;

-    if (BigNumber == NULL) {

-      break;

-    }

-    RsaKey->d = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->d);

-    break;

-

-  //

-  // RSA Secret Prime Factor of Modulus (p)

-  //

-  case RsaKeyP:

-    if (RsaKey->p != NULL) {

-      BN_free (RsaKey->p);

-    }

-    RsaKey->p = NULL;

-    if (BigNumber == NULL) {

-      break;

-    }

-    RsaKey->p = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->p);

-    break;

-

-  //

-  // RSA Secret Prime Factor of Modules (q)

-  //

-  case RsaKeyQ:

-    if (RsaKey->q != NULL) {

-      BN_free (RsaKey->q);

-    }

-    RsaKey->q = NULL;

-    if (BigNumber == NULL) {

-      break;

-    }

-    RsaKey->q = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->q);

-    break;

-

-  //

-  // p's CRT Exponent (== d mod (p - 1))

-  //

-  case RsaKeyDp:

-    if (RsaKey->dmp1 != NULL) {

-      BN_free (RsaKey->dmp1);

-    }

-    RsaKey->dmp1 = NULL;

-    if (BigNumber == NULL) {

-      break;

-    }

-    RsaKey->dmp1 = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->dmp1);

-    break;

-

-  //

-  // q's CRT Exponent (== d mod (q - 1))

-  //

-  case RsaKeyDq:

-    if (RsaKey->dmq1 != NULL) {

-      BN_free (RsaKey->dmq1);

-    }

-    RsaKey->dmq1 = NULL;

-    if (BigNumber == NULL) {

-      break;

-    }

-    RsaKey->dmq1 = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->dmq1);

-    break;

-

-  //

-  // The CRT Coefficient (== 1/q mod p)

-  //

-  case RsaKeyQInv:

-    if (RsaKey->iqmp != NULL) {

-      BN_free (RsaKey->iqmp);

-    }

-    RsaKey->iqmp = NULL;

-    if (BigNumber == NULL) {

-      break;

-    }

-    RsaKey->iqmp = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->iqmp);

-    break;

-

-  default:

-    return FALSE;

-  }

-

-  return TRUE;

-}

-

-/**

-  Gets the tag-designated RSA key component from the established RSA context.

-

-  This function retrieves the tag-designated RSA key component from the

-  established RSA context as a non-negative integer (octet string format

-  represented in RSA PKCS#1).

-  If specified key component has not been set or has been cleared, then returned

-  BnSize is set to 0.

-  If the BigNumber buffer is too small to hold the contents of the key, FALSE

-  is returned and BnSize is set to the required buffer size to obtain the key.

-

-  If RsaContext is NULL, then return FALSE.

-  If BnSize is NULL, then return FALSE.

-  If BnSize is large enough but BigNumber is NULL, then return FALSE.

-

-  @param[in, out]  RsaContext  Pointer to RSA context being set.

-  @param[in]       KeyTag      Tag of RSA key component being set.

-  @param[out]      BigNumber   Pointer to octet integer buffer.

-  @param[in, out]  BnSize      On input, the size of big number buffer in bytes.

-                               On output, the size of data returned in big number buffer in bytes.

-

-  @retval  TRUE   RSA key component was retrieved successfully.

-  @retval  FALSE  Invalid RSA key component tag.

-  @retval  FALSE  BnSize is too small.

-

-**/

-BOOLEAN

-EFIAPI

-RsaGetKey (

-  IN OUT  VOID         *RsaContext,

-  IN      RSA_KEY_TAG  KeyTag,

-  OUT     UINT8        *BigNumber,

-  IN OUT  UINTN        *BnSize

-  )

-{

-  RSA    *RsaKey;

-  BIGNUM *BnKey;

-  UINTN  Size;

-

-  //

-  // Check input parameters.

-  //

-  if (RsaContext == NULL || BnSize == NULL) {

-    return FALSE;

-  }

-

-  RsaKey  = (RSA *) RsaContext;

-  Size    = *BnSize;

-  *BnSize = 0;

-

-  switch (KeyTag) {

-

-  //

-  // RSA Public Modulus (N)

-  //

-  case RsaKeyN:

-    if (RsaKey->n == NULL) {

-      return TRUE;

-    }

-    BnKey = RsaKey->n;

-    break;

-

-  //

-  // RSA Public Exponent (e)

-  //

-  case RsaKeyE:

-    if (RsaKey->e == NULL) {

-      return TRUE;

-    }

-    BnKey = RsaKey->e;

-    break;

-

-  //

-  // RSA Private Exponent (d)

-  //

-  case RsaKeyD:

-    if (RsaKey->d == NULL) {

-      return TRUE;

-    }

-    BnKey = RsaKey->d;

-    break;

-

-  //

-  // RSA Secret Prime Factor of Modulus (p)

-  //

-  case RsaKeyP:

-    if (RsaKey->p == NULL) {

-      return TRUE;

-    }

-    BnKey = RsaKey->p;

-    break;

-

-  //

-  // RSA Secret Prime Factor of Modules (q)

-  //

-  case RsaKeyQ:

-    if (RsaKey->q == NULL) {

-      return TRUE;

-    }

-    BnKey = RsaKey->q;

-    break;

-

-  //

-  // p's CRT Exponent (== d mod (p - 1))

-  //

-  case RsaKeyDp:

-    if (RsaKey->dmp1 == NULL) {

-      return TRUE;

-    }

-    BnKey = RsaKey->dmp1;

-    break;

-

-  //

-  // q's CRT Exponent (== d mod (q - 1))

-  //

-  case RsaKeyDq:

-    if (RsaKey->dmq1 == NULL) {

-      return TRUE;

-    }

-    BnKey = RsaKey->dmq1;

-    break;

-

-  //

-  // The CRT Coefficient (== 1/q mod p)

-  //

-  case RsaKeyQInv:

-    if (RsaKey->iqmp == NULL) {

-      return TRUE;

-    }

-    BnKey = RsaKey->iqmp;

-    break;

-

-  default:

-    return FALSE;

-  }

-

-  *BnSize = Size;

-  Size    = BN_num_bytes (BnKey);

-

-  if (*BnSize < Size) {

-    *BnSize = Size;

-    return FALSE;

-  }

-

-  if (BigNumber == NULL) {

-    return FALSE;

-  }

-  *BnSize = BN_bn2bin (BnKey, BigNumber) ;

-  

-  return TRUE;

-}

-

-/**

-  Generates RSA key components.

-

-  This function generates RSA key components. It takes RSA public exponent E and

-  length in bits of RSA modulus N as input, and generates all key components.

-  If PublicExponent is NULL, the default RSA public exponent (0x10001) will be used.

-

-  Before this function can be invoked, pseudorandom number generator must be correctly

-  initialized by RandomSeed().

-

-  If RsaContext is NULL, then return FALSE.

-

-  @param[in, out]  RsaContext           Pointer to RSA context being set.

-  @param[in]       ModulusLength        Length of RSA modulus N in bits.

-  @param[in]       PublicExponent       Pointer to RSA public exponent.

-  @param[in]       PublicExponentSize   Size of RSA public exponent buffer in bytes. 

-

-  @retval  TRUE   RSA key component was generated successfully.

-  @retval  FALSE  Invalid RSA key component tag.

-

-**/

-BOOLEAN

-EFIAPI

-RsaGenerateKey (

-  IN OUT  VOID         *RsaContext,

-  IN      UINTN        ModulusLength,

-  IN      CONST UINT8  *PublicExponent,

-  IN      UINTN        PublicExponentSize

-  )

-{

-  BIGNUM   *KeyE;

-  BOOLEAN  RetVal;

-

-  //

-  // Check input parameters.

-  //

-  if (RsaContext == NULL) {

-    return FALSE;

-  }

-  

-  KeyE = BN_new ();

-  if (PublicExponent == NULL) {

-    BN_set_word (KeyE, 0x10001);

-  } else {

-    BN_bin2bn (PublicExponent, (UINT32) PublicExponentSize, KeyE);

-  }

-

-  RetVal = FALSE;

-  if (RSA_generate_key_ex ((RSA *) RsaContext, (UINT32) ModulusLength, KeyE, NULL) == 1) {

-   RetVal = TRUE;

-  }

-

-  BN_free (KeyE);

-  return RetVal;

-}

-

-/**

-  Validates key components of RSA context.

-

-  This function validates key compoents of RSA context in following aspects:

-  - Whether p is a prime

-  - Whether q is a prime

-  - Whether n = p * q

-  - Whether d*e = 1  mod lcm(p-1,q-1)

-

-  If RsaContext is NULL, then return FALSE.

-

-  @param[in]  RsaContext  Pointer to RSA context to check.

-

-  @retval  TRUE   RSA key components are valid.

-  @retval  FALSE  RSA key components are not valid.

-

-**/

-BOOLEAN

-EFIAPI

-RsaCheckKey (

-  IN  VOID  *RsaContext

-  )

-{

-  UINTN  Reason;

-

-  //

-  // Check input parameters.

-  //

-  if (RsaContext == NULL) {

-    return FALSE;

-  }

-  

-  if  (RSA_check_key ((RSA *) RsaContext) != 1) {

-    Reason = ERR_GET_REASON (ERR_peek_last_error ());

-    if (Reason == RSA_R_P_NOT_PRIME ||

-        Reason == RSA_R_Q_NOT_PRIME ||

-        Reason == RSA_R_N_DOES_NOT_EQUAL_P_Q ||

-        Reason == RSA_R_D_E_NOT_CONGRUENT_TO_1) {

-      return FALSE;

-    }

-  }

-

-  return TRUE;

-}

-

-/**

-  Performs the PKCS1-v1_5 encoding methods defined in RSA PKCS #1.

-

-  @param  Message      Message buffer to be encoded.

-  @param  MessageSize  Size of message buffer in bytes.

-  @param  DigestInfo   Pointer to buffer of digest info for output.

-

-  @return  Size of DigestInfo in bytes.

-

-**/  

-UINTN

-DigestInfoEncoding (

-  IN   CONST UINT8  *Message,

-  IN   UINTN        MessageSize,

-  OUT  UINT8        *DigestInfo

-  )

-{

-  CONST UINT8  *HashDer;

-  UINTN        DerSize;

-

-  //

-  // Check input parameters.

-  //

-  if (Message == NULL || DigestInfo == NULL) {

-    return FALSE;

-  }

-

-  //

-  // The original message length is used to determine the hash algorithm since

-  // message is digest value hashed by the specified algorithm.

-  //

-  switch (MessageSize) {

-  case MD5_DIGEST_SIZE:

-    HashDer = Asn1IdMd5;

-    DerSize = sizeof (Asn1IdMd5);

-    break;

-  

-  case SHA1_DIGEST_SIZE:

-    HashDer = Asn1IdSha1;

-    DerSize = sizeof (Asn1IdSha1);

-    break;

-   

-  case SHA256_DIGEST_SIZE:

-    HashDer = Asn1IdSha256;

-    DerSize = sizeof (Asn1IdSha256);

-    break;

-  

-  default:

-    return FALSE;

-  }

-

-  CopyMem (DigestInfo, HashDer, DerSize);

-  CopyMem (DigestInfo + DerSize, Message, MessageSize);

-

-  return (DerSize + MessageSize);

-}

-

-/**

-  Carries out the RSA-SSA signature generation with EMSA-PKCS1-v1_5 encoding scheme.

-

-  This function carries out the RSA-SSA signature generation with EMSA-PKCS1-v1_5 encoding scheme defined in

-  RSA PKCS#1.

-  If the Signature buffer is too small to hold the contents of signature, FALSE

-  is returned and SigSize is set to the required buffer size to obtain the signature.

-

-  If RsaContext is NULL, then return FALSE.

-  If MessageHash is NULL, then return FALSE.

-  If HashSize is not equal to the size of MD5, SHA-1 or SHA-256 digest, then return FALSE.

-  If SigSize is large enough but Signature is NULL, then return FALSE.

-

-  @param[in]       RsaContext   Pointer to RSA context for signature generation.

-  @param[in]       MessageHash  Pointer to octet message hash to be signed.

-  @param[in]       HashSize     Size of the message hash in bytes.

-  @param[out]      Signature    Pointer to buffer to receive RSA PKCS1-v1_5 signature.

-  @param[in, out]  SigSize      On input, the size of Signature buffer in bytes.

-                                On output, the size of data returned in Signature buffer in bytes.

-

-  @retval  TRUE   Signature successfully generated in PKCS1-v1_5.

-  @retval  FALSE  Signature generation failed.

-  @retval  FALSE  SigSize is too small.

-

-**/

-BOOLEAN

-EFIAPI

-RsaPkcs1Sign (

-  IN      VOID         *RsaContext,

-  IN      CONST UINT8  *MessageHash,

-  IN      UINTN        HashSize,

-  OUT     UINT8        *Signature,

-  IN OUT  UINTN        *SigSize

-  )

-{

-  RSA      *Rsa;

-  UINTN    Size;

-  INTN     ReturnVal;

-

-  //

-  // Check input parameters.

-  //

-  if (RsaContext == NULL || MessageHash == NULL ||

-    (HashSize != MD5_DIGEST_SIZE && HashSize != SHA1_DIGEST_SIZE && HashSize != SHA256_DIGEST_SIZE)) {

-    return FALSE;

-  }

-

-  Rsa = (RSA *) RsaContext;

-  Size = BN_num_bytes (Rsa->n);

-

-  if (*SigSize < Size) {

-    *SigSize = Size;

-    return FALSE;

-  }

-

-  if (Signature == NULL) {

-    return FALSE;

-  }

-

-  Size = DigestInfoEncoding (MessageHash, HashSize, Signature);

-

-  ReturnVal = RSA_private_encrypt (

-                (UINT32) Size,

-                Signature,

-                Signature,

-                Rsa,

-                RSA_PKCS1_PADDING

-                );

-

-  if (ReturnVal < (INTN) Size) {

-    return FALSE;

-  }

-

-  *SigSize = (UINTN)ReturnVal;

-  return TRUE;

-}

-

-/**

-  Verifies the RSA-SSA signature with EMSA-PKCS1-v1_5 encoding scheme defined in

-  RSA PKCS#1.

-

-  If RsaContext is NULL, then return FALSE.

-  If MessageHash is NULL, then return FALSE.

-  If Signature is NULL, then return FALSE.

-  If HashSize is not equal to the size of MD5, SHA-1 or SHA-256 digest, then return FALSE.

-

-  @param[in]  RsaContext   Pointer to RSA context for signature verification.

-  @param[in]  MessageHash  Pointer to octet message hash to be checked.

-  @param[in]  HashSize     Size of the message hash in bytes.

-  @param[in]  Signature    Pointer to RSA PKCS1-v1_5 signature to be verified.

-  @param[in]  SigSize      Size of signature in bytes.

-

-  @retval  TRUE   Valid signature encoded in PKCS1-v1_5.

-  @retval  FALSE  Invalid signature or invalid RSA context.

-

-**/

-BOOLEAN

-EFIAPI

-RsaPkcs1Verify (

-  IN  VOID         *RsaContext,

-  IN  CONST UINT8  *MessageHash,

-  IN  UINTN        HashSize,

-  IN  UINT8        *Signature,

-  IN  UINTN        SigSize

-  )

-{

-  INTN     Length;

-

-  //

-  // Check input parameters.

-  //

-  if (RsaContext == NULL || MessageHash == NULL || Signature == NULL) {

-    return FALSE;

-  }

-

-  

-  //

-  // Check for unsupported hash size:

-  //    Only MD5, SHA-1 or SHA-256 digest size is supported

-  //

-  if (HashSize != MD5_DIGEST_SIZE && HashSize != SHA1_DIGEST_SIZE && HashSize != SHA256_DIGEST_SIZE) {

-    return FALSE;

-  }

-  

-  //

-  // RSA PKCS#1 Signature Decoding using OpenSSL RSA Decryption with Public Key

-  //

-  Length = RSA_public_decrypt (

-             (UINT32) SigSize,

-             Signature,

-             Signature,

-             RsaContext,

-             RSA_PKCS1_PADDING

-             );

-

-  //

-  // Invalid RSA Key or PKCS#1 Padding Checking Failed (if Length < 0)

-  // NOTE: Length should be the addition of HashSize and some DER value.

-  //       Ignore more strict length checking here.

-  //

-  if (Length < (INTN) HashSize) {

-    return FALSE;

-  }

-

-  //

-  // Validate the MessageHash and Decoded Signature

-  // NOTE: The decoded Signature should be the DER encoding of the DigestInfo value

-  //       DigestInfo ::= SEQUENCE {

-  //           digestAlgorithm AlgorithmIdentifier

-  //           digest OCTET STRING

-  //       }

-  //       Then Memory Comparing should skip the DER value of the underlying SEQUENCE

-  //       type and AlgorithmIdentifier.

-  //

-  if (CompareMem (MessageHash, Signature + Length - HashSize, HashSize) == 0) {

-    //

-    // Valid RSA PKCS#1 Signature

-    //

-    return TRUE;

-  } else {

-    //

-    // Failed to verification

-    //

-    return FALSE;

-  }

-}

diff --git a/Cryptlib/Pk/CryptRsaBasic.c b/Cryptlib/Pk/CryptRsaBasic.c
new file mode 100644
index 00000000..3e430989
--- /dev/null
+++ b/Cryptlib/Pk/CryptRsaBasic.c
@@ -0,0 +1,335 @@
+/** @file

+  RSA Asymmetric Cipher Wrapper Implementation over OpenSSL.

+

+  This file implements following APIs which provide basic capabilities for RSA:

+  1) RsaNew

+  2) RsaFree

+  3) RsaSetKey

+  4) RsaPkcs1Verify

+

+Copyright (c) 2009 - 2013, 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

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+**/

+

+#include "InternalCryptLib.h"

+

+#include <openssl/rsa.h>

+#include <openssl/objects.h>

+

+/**

+  Allocates and initializes one RSA context for subsequent use.

+

+  @return  Pointer to the RSA context that has been initialized.

+           If the allocations fails, RsaNew() returns NULL.

+

+**/

+VOID *

+EFIAPI

+RsaNew (

+  VOID

+  )

+{

+  //

+  // Allocates & Initializes RSA Context by OpenSSL RSA_new()

+  //

+  return (VOID *) RSA_new ();

+}

+

+/**

+  Release the specified RSA context.

+

+  @param[in]  RsaContext  Pointer to the RSA context to be released.

+

+**/

+VOID

+EFIAPI

+RsaFree (

+  IN  VOID  *RsaContext

+  )

+{

+  //

+  // Free OpenSSL RSA Context

+  //

+  RSA_free ((RSA *) RsaContext);

+}

+

+/**

+  Sets the tag-designated key component into the established RSA context.

+

+  This function sets the tag-designated RSA key component into the established

+  RSA context from the user-specified non-negative integer (octet string format

+  represented in RSA PKCS#1).

+  If BigNumber is NULL, then the specified key componenet in RSA context is cleared.

+

+  If RsaContext is NULL, then return FALSE.

+

+  @param[in, out]  RsaContext  Pointer to RSA context being set.

+  @param[in]       KeyTag      Tag of RSA key component being set.

+  @param[in]       BigNumber   Pointer to octet integer buffer.

+                               If NULL, then the specified key componenet in RSA

+                               context is cleared.

+  @param[in]       BnSize      Size of big number buffer in bytes.

+                               If BigNumber is NULL, then it is ignored.

+

+  @retval  TRUE   RSA key component was set successfully.

+  @retval  FALSE  Invalid RSA key component tag.

+

+**/

+BOOLEAN

+EFIAPI

+RsaSetKey (

+  IN OUT  VOID         *RsaContext,

+  IN      RSA_KEY_TAG  KeyTag,

+  IN      CONST UINT8  *BigNumber,

+  IN      UINTN        BnSize

+  )

+{

+  RSA  *RsaKey;

+

+  //

+  // Check input parameters.

+  //

+  if (RsaContext == NULL || BnSize > INT_MAX) {

+    return FALSE;

+  }

+

+  RsaKey = (RSA *) RsaContext;

+  //

+  // Set RSA Key Components by converting octet string to OpenSSL BN representation.

+  // NOTE: For RSA public key (used in signature verification), only public components

+  //       (N, e) are needed.

+  //

+  switch (KeyTag) {

+

+  //

+  // RSA Public Modulus (N)

+  //

+  case RsaKeyN:

+    if (RsaKey->n != NULL) {

+      BN_free (RsaKey->n);

+    }

+    RsaKey->n = NULL;

+    if (BigNumber == NULL) {

+      break;

+    }

+    RsaKey->n = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->n);

+    if (RsaKey->n == NULL) {

+      return FALSE;

+    }

+

+    break;

+

+  //

+  // RSA Public Exponent (e)

+  //

+  case RsaKeyE:

+    if (RsaKey->e != NULL) {

+      BN_free (RsaKey->e);

+    }

+    RsaKey->e = NULL;

+    if (BigNumber == NULL) {

+      break;

+    }

+    RsaKey->e = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->e);

+    if (RsaKey->e == NULL) {

+      return FALSE;

+    }

+

+    break;

+

+  //

+  // RSA Private Exponent (d)

+  //

+  case RsaKeyD:

+    if (RsaKey->d != NULL) {

+      BN_free (RsaKey->d);

+    }

+    RsaKey->d = NULL;

+    if (BigNumber == NULL) {

+      break;

+    }

+    RsaKey->d = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->d);

+    if (RsaKey->d == NULL) {

+      return FALSE;

+    }

+

+    break;

+

+  //

+  // RSA Secret Prime Factor of Modulus (p)

+  //

+  case RsaKeyP:

+    if (RsaKey->p != NULL) {

+      BN_free (RsaKey->p);

+    }

+    RsaKey->p = NULL;

+    if (BigNumber == NULL) {

+      break;

+    }

+    RsaKey->p = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->p);

+    if (RsaKey->p == NULL) {

+      return FALSE;

+    }

+

+    break;

+

+  //

+  // RSA Secret Prime Factor of Modules (q)

+  //

+  case RsaKeyQ:

+    if (RsaKey->q != NULL) {

+      BN_free (RsaKey->q);

+    }

+    RsaKey->q = NULL;

+    if (BigNumber == NULL) {

+      break;

+    }

+    RsaKey->q = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->q);

+    if (RsaKey->q == NULL) {

+      return FALSE;

+    }

+

+    break;

+

+  //

+  // p's CRT Exponent (== d mod (p - 1))

+  //

+  case RsaKeyDp:

+    if (RsaKey->dmp1 != NULL) {

+      BN_free (RsaKey->dmp1);

+    }

+    RsaKey->dmp1 = NULL;

+    if (BigNumber == NULL) {

+      break;

+    }

+    RsaKey->dmp1 = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->dmp1);

+    if (RsaKey->dmp1 == NULL) {

+      return FALSE;

+    }

+

+    break;

+

+  //

+  // q's CRT Exponent (== d mod (q - 1))

+  //

+  case RsaKeyDq:

+    if (RsaKey->dmq1 != NULL) {

+      BN_free (RsaKey->dmq1);

+    }

+    RsaKey->dmq1 = NULL;

+    if (BigNumber == NULL) {

+      break;

+    }

+    RsaKey->dmq1 = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->dmq1);

+    if (RsaKey->dmq1 == NULL) {

+      return FALSE;

+    }

+

+    break;

+

+  //

+  // The CRT Coefficient (== 1/q mod p)

+  //

+  case RsaKeyQInv:

+    if (RsaKey->iqmp != NULL) {

+      BN_free (RsaKey->iqmp);

+    }

+    RsaKey->iqmp = NULL;

+    if (BigNumber == NULL) {

+      break;

+    }

+    RsaKey->iqmp = BN_bin2bn (BigNumber, (UINT32) BnSize, RsaKey->iqmp);

+    if (RsaKey->iqmp == NULL) {

+      return FALSE;

+    }

+

+    break;

+

+  default:

+    return FALSE;

+  }

+

+  return TRUE;

+}

+

+/**

+  Verifies the RSA-SSA signature with EMSA-PKCS1-v1_5 encoding scheme defined in

+  RSA PKCS#1.

+

+  If RsaContext is NULL, then return FALSE.

+  If MessageHash is NULL, then return FALSE.

+  If Signature is NULL, then return FALSE.

+  If HashSize is not equal to the size of MD5, SHA-1 or SHA-256 digest, then return FALSE.

+

+  @param[in]  RsaContext   Pointer to RSA context for signature verification.

+  @param[in]  MessageHash  Pointer to octet message hash to be checked.

+  @param[in]  HashSize     Size of the message hash in bytes.

+  @param[in]  Signature    Pointer to RSA PKCS1-v1_5 signature to be verified.

+  @param[in]  SigSize      Size of signature in bytes.

+

+  @retval  TRUE   Valid signature encoded in PKCS1-v1_5.

+  @retval  FALSE  Invalid signature or invalid RSA context.

+

+**/

+BOOLEAN

+EFIAPI

+RsaPkcs1Verify (

+  IN  VOID         *RsaContext,

+  IN  CONST UINT8  *MessageHash,

+  IN  UINTN        HashSize,

+  IN  CONST UINT8  *Signature,

+  IN  UINTN        SigSize

+  )

+{

+  INT32    DigestType;

+  UINT8    *SigBuf;

+

+  //

+  // Check input parameters.

+  //

+  if (RsaContext == NULL || MessageHash == NULL || Signature == NULL) {

+    return FALSE;

+  }

+

+  if (SigSize > INT_MAX || SigSize == 0) {

+    return FALSE;

+  }

+

+  //

+  // Determine the message digest algorithm according to digest size.

+  //   Only MD5, SHA-1 or SHA-256 algorithm is supported. 

+  //

+  switch (HashSize) {

+  case MD5_DIGEST_SIZE:

+    DigestType = NID_md5;

+    break;

+    

+  case SHA1_DIGEST_SIZE:

+    DigestType = NID_sha1;

+    break;

+    

+  case SHA256_DIGEST_SIZE:

+    DigestType = NID_sha256;

+    break;

+

+  default:

+    return FALSE;

+  }

+

+  SigBuf = (UINT8 *) Signature;

+  return (BOOLEAN) RSA_verify (

+                     DigestType,

+                     MessageHash,

+                     (UINT32) HashSize,

+                     SigBuf,

+                     (UINT32) SigSize,

+                     (RSA *) RsaContext

+                     );

+}

diff --git a/Cryptlib/Pk/CryptRsaExt.c b/Cryptlib/Pk/CryptRsaExt.c
new file mode 100644
index 00000000..5c21d121
--- /dev/null
+++ b/Cryptlib/Pk/CryptRsaExt.c
@@ -0,0 +1,377 @@
+/** @file

+  RSA Asymmetric Cipher Wrapper Implementation over OpenSSL.

+

+  This file implements following APIs which provide more capabilities for RSA:

+  1) RsaGetKey

+  2) RsaGenerateKey

+  3) RsaCheckKey

+  4) RsaPkcs1Sign

+

+Copyright (c) 2009 - 2013, 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

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+**/

+

+#include "InternalCryptLib.h"

+

+#include <openssl/rsa.h>

+#include <openssl/err.h>

+#include <openssl/objects.h>

+

+/**

+  Gets the tag-designated RSA key component from the established RSA context.

+

+  This function retrieves the tag-designated RSA key component from the

+  established RSA context as a non-negative integer (octet string format

+  represented in RSA PKCS#1).

+  If specified key component has not been set or has been cleared, then returned

+  BnSize is set to 0.

+  If the BigNumber buffer is too small to hold the contents of the key, FALSE

+  is returned and BnSize is set to the required buffer size to obtain the key.

+

+  If RsaContext is NULL, then return FALSE.

+  If BnSize is NULL, then return FALSE.

+  If BnSize is large enough but BigNumber is NULL, then return FALSE.

+

+  @param[in, out]  RsaContext  Pointer to RSA context being set.

+  @param[in]       KeyTag      Tag of RSA key component being set.

+  @param[out]      BigNumber   Pointer to octet integer buffer.

+  @param[in, out]  BnSize      On input, the size of big number buffer in bytes.

+                               On output, the size of data returned in big number buffer in bytes.

+

+  @retval  TRUE   RSA key component was retrieved successfully.

+  @retval  FALSE  Invalid RSA key component tag.

+  @retval  FALSE  BnSize is too small.

+

+**/

+BOOLEAN

+EFIAPI

+RsaGetKey (

+  IN OUT  VOID         *RsaContext,

+  IN      RSA_KEY_TAG  KeyTag,

+  OUT     UINT8        *BigNumber,

+  IN OUT  UINTN        *BnSize

+  )

+{

+  RSA    *RsaKey;

+  BIGNUM *BnKey;

+  UINTN  Size;

+

+  //

+  // Check input parameters.

+  //

+  if (RsaContext == NULL || BnSize == NULL) {

+    return FALSE;

+  }

+

+  RsaKey  = (RSA *) RsaContext;

+  Size    = *BnSize;

+  *BnSize = 0;

+

+  switch (KeyTag) {

+

+  //

+  // RSA Public Modulus (N)

+  //

+  case RsaKeyN:

+    if (RsaKey->n == NULL) {

+      return TRUE;

+    }

+    BnKey = RsaKey->n;

+    break;

+

+  //

+  // RSA Public Exponent (e)

+  //

+  case RsaKeyE:

+    if (RsaKey->e == NULL) {

+      return TRUE;

+    }

+    BnKey = RsaKey->e;

+    break;

+

+  //

+  // RSA Private Exponent (d)

+  //

+  case RsaKeyD:

+    if (RsaKey->d == NULL) {

+      return TRUE;

+    }

+    BnKey = RsaKey->d;

+    break;

+

+  //

+  // RSA Secret Prime Factor of Modulus (p)

+  //

+  case RsaKeyP:

+    if (RsaKey->p == NULL) {

+      return TRUE;

+    }

+    BnKey = RsaKey->p;

+    break;

+

+  //

+  // RSA Secret Prime Factor of Modules (q)

+  //

+  case RsaKeyQ:

+    if (RsaKey->q == NULL) {

+      return TRUE;

+    }

+    BnKey = RsaKey->q;

+    break;

+

+  //

+  // p's CRT Exponent (== d mod (p - 1))

+  //

+  case RsaKeyDp:

+    if (RsaKey->dmp1 == NULL) {

+      return TRUE;

+    }

+    BnKey = RsaKey->dmp1;

+    break;

+

+  //

+  // q's CRT Exponent (== d mod (q - 1))

+  //

+  case RsaKeyDq:

+    if (RsaKey->dmq1 == NULL) {

+      return TRUE;

+    }

+    BnKey = RsaKey->dmq1;

+    break;

+

+  //

+  // The CRT Coefficient (== 1/q mod p)

+  //

+  case RsaKeyQInv:

+    if (RsaKey->iqmp == NULL) {

+      return TRUE;

+    }

+    BnKey = RsaKey->iqmp;

+    break;

+

+  default:

+    return FALSE;

+  }

+

+  *BnSize = Size;

+  Size    = BN_num_bytes (BnKey);

+

+  if (*BnSize < Size) {

+    *BnSize = Size;

+    return FALSE;

+  }

+

+  if (BigNumber == NULL) {

+    return FALSE;

+  }

+  *BnSize = BN_bn2bin (BnKey, BigNumber) ;

+  

+  return TRUE;

+}

+

+/**

+  Generates RSA key components.

+

+  This function generates RSA key components. It takes RSA public exponent E and

+  length in bits of RSA modulus N as input, and generates all key components.

+  If PublicExponent is NULL, the default RSA public exponent (0x10001) will be used.

+

+  Before this function can be invoked, pseudorandom number generator must be correctly

+  initialized by RandomSeed().

+

+  If RsaContext is NULL, then return FALSE.

+

+  @param[in, out]  RsaContext           Pointer to RSA context being set.

+  @param[in]       ModulusLength        Length of RSA modulus N in bits.

+  @param[in]       PublicExponent       Pointer to RSA public exponent.

+  @param[in]       PublicExponentSize   Size of RSA public exponent buffer in bytes. 

+

+  @retval  TRUE   RSA key component was generated successfully.

+  @retval  FALSE  Invalid RSA key component tag.

+

+**/

+BOOLEAN

+EFIAPI

+RsaGenerateKey (

+  IN OUT  VOID         *RsaContext,

+  IN      UINTN        ModulusLength,

+  IN      CONST UINT8  *PublicExponent,

+  IN      UINTN        PublicExponentSize

+  )

+{

+  BIGNUM   *KeyE;

+  BOOLEAN  RetVal;

+

+  //

+  // Check input parameters.

+  //

+  if (RsaContext == NULL || ModulusLength > INT_MAX || PublicExponentSize > INT_MAX) {

+    return FALSE;

+  }

+  

+  KeyE = BN_new ();

+  if (KeyE == NULL) {

+    return FALSE;

+  }

+

+  RetVal = FALSE;

+  

+  if (PublicExponent == NULL) {

+    if (BN_set_word (KeyE, 0x10001) == 0) {

+      goto _Exit;

+    }

+  } else {

+    if (BN_bin2bn (PublicExponent, (UINT32) PublicExponentSize, KeyE) == NULL) {

+      goto _Exit;

+    }

+  }

+

+  if (RSA_generate_key_ex ((RSA *) RsaContext, (UINT32) ModulusLength, KeyE, NULL) == 1) {

+   RetVal = TRUE;

+  }

+

+_Exit:

+  BN_free (KeyE);

+  return RetVal;

+}

+

+/**

+  Validates key components of RSA context.

+

+  This function validates key compoents of RSA context in following aspects:

+  - Whether p is a prime

+  - Whether q is a prime

+  - Whether n = p * q

+  - Whether d*e = 1  mod lcm(p-1,q-1)

+

+  If RsaContext is NULL, then return FALSE.

+

+  @param[in]  RsaContext  Pointer to RSA context to check.

+

+  @retval  TRUE   RSA key components are valid.

+  @retval  FALSE  RSA key components are not valid.

+

+**/

+BOOLEAN

+EFIAPI

+RsaCheckKey (

+  IN  VOID  *RsaContext

+  )

+{

+  UINTN  Reason;

+

+  //

+  // Check input parameters.

+  //

+  if (RsaContext == NULL) {

+    return FALSE;

+  }

+  

+  if  (RSA_check_key ((RSA *) RsaContext) != 1) {

+    Reason = ERR_GET_REASON (ERR_peek_last_error ());

+    if (Reason == RSA_R_P_NOT_PRIME ||

+        Reason == RSA_R_Q_NOT_PRIME ||

+        Reason == RSA_R_N_DOES_NOT_EQUAL_P_Q ||

+        Reason == RSA_R_D_E_NOT_CONGRUENT_TO_1) {

+      return FALSE;

+    }

+  }

+

+  return TRUE;

+}

+

+/**

+  Carries out the RSA-SSA signature generation with EMSA-PKCS1-v1_5 encoding scheme.

+

+  This function carries out the RSA-SSA signature generation with EMSA-PKCS1-v1_5 encoding scheme defined in

+  RSA PKCS#1.

+  If the Signature buffer is too small to hold the contents of signature, FALSE

+  is returned and SigSize is set to the required buffer size to obtain the signature.

+

+  If RsaContext is NULL, then return FALSE.

+  If MessageHash is NULL, then return FALSE.

+  If HashSize is not equal to the size of MD5, SHA-1 or SHA-256 digest, then return FALSE.

+  If SigSize is large enough but Signature is NULL, then return FALSE.

+

+  @param[in]       RsaContext   Pointer to RSA context for signature generation.

+  @param[in]       MessageHash  Pointer to octet message hash to be signed.

+  @param[in]       HashSize     Size of the message hash in bytes.

+  @param[out]      Signature    Pointer to buffer to receive RSA PKCS1-v1_5 signature.

+  @param[in, out]  SigSize      On input, the size of Signature buffer in bytes.

+                                On output, the size of data returned in Signature buffer in bytes.

+

+  @retval  TRUE   Signature successfully generated in PKCS1-v1_5.

+  @retval  FALSE  Signature generation failed.

+  @retval  FALSE  SigSize is too small.

+

+**/

+BOOLEAN

+EFIAPI

+RsaPkcs1Sign (

+  IN      VOID         *RsaContext,

+  IN      CONST UINT8  *MessageHash,

+  IN      UINTN        HashSize,

+  OUT     UINT8        *Signature,

+  IN OUT  UINTN        *SigSize

+  )

+{

+  RSA      *Rsa;

+  UINTN    Size;

+  INT32    DigestType;

+

+  //

+  // Check input parameters.

+  //

+  if (RsaContext == NULL || MessageHash == NULL) {

+    return FALSE;

+  }

+

+  Rsa = (RSA *) RsaContext;

+  Size = BN_num_bytes (Rsa->n);

+

+  if (*SigSize < Size) {

+    *SigSize = Size;

+    return FALSE;

+  }

+  

+  if (Signature == NULL) {

+    return FALSE;

+  }

+  

+  //

+  // Determine the message digest algorithm according to digest size.

+  //   Only MD5, SHA-1 or SHA-256 algorithm is supported. 

+  //

+  switch (HashSize) {

+  case MD5_DIGEST_SIZE:

+    DigestType = NID_md5;

+    break;

+    

+  case SHA1_DIGEST_SIZE:

+    DigestType = NID_sha1;

+    break;

+    

+  case SHA256_DIGEST_SIZE:

+    DigestType = NID_sha256;

+    break;

+

+  default:

+    return FALSE;

+  }  

+

+  return (BOOLEAN) RSA_sign (

+                     DigestType,

+                     MessageHash,

+                     (UINT32) HashSize,

+                     Signature,

+                     (UINT32 *) SigSize,

+                     (RSA *) RsaContext

+                     );

+}

diff --git a/Cryptlib/Pk/CryptX509.c b/Cryptlib/Pk/CryptX509.c
index a0c5a2a7..5abe970c 100644
--- a/Cryptlib/Pk/CryptX509.c
+++ b/Cryptlib/Pk/CryptX509.c
@@ -38,9 +38,7 @@ X509ConstructCertificate (
   OUT  UINT8        **SingleX509Cert

   )

 {

-  BIO      *CertBio;

   X509     *X509Cert;

-  BOOLEAN  Status;

 

   //

   // Check input parameters.

@@ -49,31 +47,17 @@ X509ConstructCertificate (
     return FALSE;

   }

 

-  Status = FALSE;

-

   //

   // Read DER-encoded X509 Certificate and Construct X509 object.

   //

-  CertBio = BIO_new (BIO_s_mem ());

-  BIO_write (CertBio, Cert, (int) CertSize);

-  if (CertBio == NULL) {

-    goto _Exit;

-  }

-  X509Cert = d2i_X509_bio (CertBio, NULL);

+  X509Cert = d2i_X509 (NULL, &Cert, (long) CertSize);

   if (X509Cert == NULL) {

-    goto _Exit;

+    return FALSE;

   }

 

   *SingleX509Cert = (UINT8 *) X509Cert;

-  Status = TRUE;

-

-_Exit:

-  //

-  // Release Resources.

-  //

-  BIO_free (CertBio);

 

-  return Status;

+  return TRUE;

 }

 

 /**

@@ -225,91 +209,6 @@ X509StackFree (
 }

 

 /**

-  Pop single certificate from STACK_OF(X509).

-

-  If X509Stack, Cert, or CertSize is NULL, then return FALSE.

-

-  @param[in]  X509Stack       Pointer to a X509 stack object.

-  @param[out] Cert            Pointer to a X509 certificate.

-  @param[out] CertSize        Length of output X509 certificate in bytes.

-                                 

-  @retval     TRUE            The X509 stack pop succeeded.

-  @retval     FALSE           The pop operation failed.

-

-**/

-BOOLEAN

-X509PopCertificate (

-  IN  VOID  *X509Stack,

-  OUT UINT8 **Cert,

-  OUT UINTN *CertSize

-  )

-{

-  BIO             *CertBio;

-  X509            *X509Cert;

-  STACK_OF(X509)  *CertStack;

-  BOOLEAN         Status;

-  int             Result;

-  int             Length;

-  VOID            *Buffer;

-

-  Status = FALSE;

-

-  if ((X509Stack == NULL) || (Cert == NULL) || (CertSize == NULL)) {

-    return Status;

-  }

-

-  CertStack = (STACK_OF(X509) *) X509Stack;

-

-  X509Cert = sk_X509_pop (CertStack);

-

-  if (X509Cert == NULL) {

-    return Status;

-  }

-

-  Buffer = NULL;

-

-  CertBio = BIO_new (BIO_s_mem ());

-  if (CertBio == NULL) {

-    return Status;

-  }

-

-  Result = i2d_X509_bio (CertBio, X509Cert);

-  if (Result == 0) {

-    goto _Exit;

-  }

-

-  Length = ((BUF_MEM *) CertBio->ptr)->length;

-  if (Length <= 0) {

-    goto _Exit;

-  }

-

-  Buffer = malloc (Length);

-  if (Buffer == NULL) {

-    goto _Exit;

-  }

-

-  Result = BIO_read (CertBio, Buffer, Length);

-  if (Result != Length) {

-    goto _Exit;

-  }

-

-  *Cert     = Buffer;

-  *CertSize = Length;

-

-  Status = TRUE;

-

-_Exit:

-

-  BIO_free (CertBio);

-

-  if (!Status && (Buffer != NULL)) {

-    free (Buffer);

-  }

-

-  return Status;

-}

-

-/**

   Retrieve the subject bytes from one X.509 certificate.

 

   @param[in]      Cert         Pointer to the DER-encoded X509 certificate.

@@ -346,7 +245,6 @@ X509GetSubjectName (
     return FALSE;

   }

 

-  Status   = FALSE;

   X509Cert = NULL;

 

   //

@@ -354,20 +252,27 @@ X509GetSubjectName (
   //

   Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **) &X509Cert);

   if ((X509Cert == NULL) || (!Status)) {

+    Status = FALSE;

     goto _Exit;

   }

 

+  Status = FALSE;

+

   //

   // Retrieve subject name from certificate object.

   //

   X509Name = X509_get_subject_name (X509Cert);

+  if (X509Name == NULL) {

+    goto _Exit;

+  }

+

   if (*SubjectSize < (UINTN) X509Name->bytes->length) {

     *SubjectSize = (UINTN) X509Name->bytes->length;

     goto _Exit;

   }

   *SubjectSize = (UINTN) X509Name->bytes->length;

   if (CertSubject != NULL) {

-    CopyMem (CertSubject, (UINT8 *)X509Name->bytes->data, *SubjectSize);

+    CopyMem (CertSubject, (UINT8 *) X509Name->bytes->data, *SubjectSize);

     Status = TRUE;

   }

 

@@ -375,7 +280,9 @@ _Exit:
   //

   // Release Resources.

   //

-  X509_free (X509Cert);

+  if (X509Cert != NULL) {

+    X509_free (X509Cert);

+  }

 

   return Status;

 }

@@ -415,7 +322,6 @@ RsaGetPublicKeyFromX509 (
     return FALSE;

   }

 

-  Status   = FALSE;

   Pkey     = NULL;

   X509Cert = NULL;

 

@@ -424,9 +330,12 @@ RsaGetPublicKeyFromX509 (
   //

   Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **) &X509Cert);

   if ((X509Cert == NULL) || (!Status)) {

+    Status = FALSE;

     goto _Exit;

   }

 

+  Status = FALSE;

+

   //

   // Retrieve and check EVP_PKEY data from X509 Certificate.

   //

@@ -446,8 +355,13 @@ _Exit:
   //

   // Release Resources.

   //

-  X509_free (X509Cert);

-  EVP_PKEY_free (Pkey);

+  if (X509Cert != NULL) {

+    X509_free (X509Cert);

+  }

+

+  if (Pkey != NULL) {

+    EVP_PKEY_free (Pkey);

+  }  

 

   return Status;

 }

@@ -498,15 +412,22 @@ X509VerifyCert (
   //

   // Register & Initialize necessary digest algorithms for certificate verification.

   //

-  EVP_add_digest (EVP_md5());

-  EVP_add_digest (EVP_sha1());

-  EVP_add_digest (EVP_sha256());

+  if (EVP_add_digest (EVP_md5 ()) == 0) {

+    goto _Exit;

+  }

+  if (EVP_add_digest (EVP_sha1 ()) == 0) {

+    goto _Exit;

+  }

+  if (EVP_add_digest (EVP_sha256 ()) == 0) {

+    goto _Exit;

+  }

 

   //

   // Read DER-encoded certificate to be verified and Construct X509 object.

   //

   Status = X509ConstructCertificate (Cert, CertSize, (UINT8 **) &X509Cert);

   if ((X509Cert == NULL) || (!Status)) {

+    Status = FALSE;

     goto _Exit;

   }

 

@@ -515,9 +436,12 @@ X509VerifyCert (
   //

   Status = X509ConstructCertificate (CACert, CACertSize, (UINT8 **) &X509CACert);

   if ((X509CACert == NULL) || (!Status)) {

+    Status = FALSE;

     goto _Exit;

   }

 

+  Status = FALSE;

+

   //

   // Set up X509 Store for trusted certificate.

   //

@@ -546,9 +470,17 @@ _Exit:
   //

   // Release Resources.

   //

-  X509_free (X509Cert);

-  X509_free (X509CACert);

-  X509_STORE_free (CertStore);

+  if (X509Cert != NULL) {

+    X509_free (X509Cert);

+  }

+

+  if (X509CACert != NULL) {

+    X509_free (X509CACert);

+  }

 

+  if (CertStore != NULL) {

+    X509_STORE_free (CertStore);

+  }

+  

   return Status;

 }

diff --git a/Cryptlib/Rand/CryptRand.c b/Cryptlib/Rand/CryptRand.c
index 4b275951..dc3ab992 100644
--- a/Cryptlib/Rand/CryptRand.c
+++ b/Cryptlib/Rand/CryptRand.c
@@ -43,6 +43,10 @@ RandomSeed (
   IN  UINTN         SeedSize

   )

 {

+  if (SeedSize > INT_MAX) {

+    return FALSE;

+  }

+

   //

   // Seed the pseudorandom number generator with user-supplied value.

   // NOTE: A cryptographic PRNG must be seeded with unpredictable data.

@@ -53,7 +57,11 @@ RandomSeed (
     RAND_seed (DefaultSeed, sizeof (DefaultSeed));

   }

 

-  return TRUE;

+  if (RAND_status () == 1) {

+    return TRUE;

+  }

+

+  return FALSE;

 }

 

 /**

@@ -78,7 +86,7 @@ RandomBytes (
   //

   // Check input parameters.

   //

-  if (Output == NULL) {

+  if (Output == NULL || Size > INT_MAX) {

     return FALSE;

   }

 

diff --git a/Cryptlib/SysCall/BaseMemAllocation.c b/Cryptlib/SysCall/BaseMemAllocation.c
index 1abe78e3..75da1dd2 100644
--- a/Cryptlib/SysCall/BaseMemAllocation.c
+++ b/Cryptlib/SysCall/BaseMemAllocation.c
@@ -2,7 +2,7 @@
   Base Memory Allocation Routines Wrapper for Crypto library over OpenSSL

   during PEI & DXE phases.

 

-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2009 - 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

@@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /* Allocates memory blocks */

 void *malloc (size_t size)

 {

-  return AllocatePool ((UINTN)size);

+  return AllocatePool ((UINTN) size);

 }

 

 /* Reallocate memory blocks */

@@ -32,7 +32,7 @@ void *realloc (void *ptr, size_t size)
   // BUG: hardcode OldSize == size! We have no any knowledge about

   // memory size of original pointer ptr.

   //

-	return ReallocatePool (ptr, (UINTN)size, (UINTN)size);

+  return ReallocatePool (ptr, (UINTN) size, (UINTN) size);

 }

 

 /* De-allocates or frees a memory block */

diff --git a/Cryptlib/SysCall/CrtWrapper.c b/Cryptlib/SysCall/CrtWrapper.c
index fb446b67..5a8322d7 100644
--- a/Cryptlib/SysCall/CrtWrapper.c
+++ b/Cryptlib/SysCall/CrtWrapper.c
@@ -293,16 +293,6 @@ size_t fwrite (const void *buffer, size_t size, size_t count, FILE *stream)
 //  -- Dummy OpenSSL Support Routines --

 //

 

-int BIO_printf (void *bio, const char *format, ...)

-{

-  return 0;

-}

-

-int BIO_snprintf(char *buf, size_t n, const char *format, ...)

-{

-  return 0;

-}

-

 void *UI_OpenSSL(void)

 {

   return NULL;

diff --git a/Cryptlib/SysCall/TimerWrapper.c b/Cryptlib/SysCall/TimerWrapper.c
index bb7bcba7..cee72ba5 100644
--- a/Cryptlib/SysCall/TimerWrapper.c
+++ b/Cryptlib/SysCall/TimerWrapper.c
@@ -146,14 +146,14 @@ struct tm * gmtime (const time_t *timer)
   GmTime->tm_yday = (int) DayNo;

 

   for (MonthNo = 12; MonthNo > 1; MonthNo--) {

-    if (DayNo > CumulativeDays[IsLeap(Year)][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_mon  = (int) MonthNo - 1;

+  GmTime->tm_mday = (int) DayNo + 1;

 

   GmTime->tm_isdst  = 0;

   GmTime->tm_gmtoff = 0;