From 76f8050ff6003e6048fdc4430d8b503aff934255 Mon Sep 17 00:00:00 2001

From: Gary Ching-Pang Lin <glin@suse.com>

Date: Wed, 9 Jul 2014 15:02:50 +0800

Subject: [PATCH 43/74] Update openssl to 0.9.8za

Also update to Tiano Cryptlib r15638

---

 Cryptlib/Cryptlib.diff                           |   4 +-

 Cryptlib/Include/openssl/bn.h                    |  11 +

 Cryptlib/Include/openssl/crypto.h                |  37 +-

 Cryptlib/Include/openssl/ec.h                    |  10 +-

 Cryptlib/Include/openssl/engine.h                |   8 +-

 Cryptlib/Include/openssl/opensslv.h              |   6 +-

 Cryptlib/Include/openssl/ssl.h                   |  13 +-

 Cryptlib/Include/openssl/ssl3.h                  |  10 +

 Cryptlib/Include/openssl/symhacks.h              |  10 +-

 Cryptlib/Include/openssl/tls1.h                  |  14 +

 Cryptlib/Makefile                                |   6 +-

 Cryptlib/OpenSSL/crypto/asn1/a_int.c             |   2 +-

 Cryptlib/OpenSSL/crypto/asn1/a_strex.c           |   1 +

 Cryptlib/OpenSSL/crypto/asn1/a_strnid.c          |   2 +-

 Cryptlib/OpenSSL/crypto/asn1/a_verify.c          |   6 +

 Cryptlib/OpenSSL/crypto/asn1/t_pkey.c            |   5 -

 Cryptlib/OpenSSL/crypto/asn1/x_pubkey.c          |   5 +-

 Cryptlib/OpenSSL/crypto/bn/bn_lib.c              |  52 ++

 Cryptlib/OpenSSL/crypto/bn/bn_mont.c             |  46 +-

 Cryptlib/OpenSSL/crypto/bn/bn_word.c             |  25 +-

 Cryptlib/OpenSSL/crypto/cryptlib.c               |  16 +

 Cryptlib/OpenSSL/crypto/ec/ec2_mult.c            |  26 +-

 Cryptlib/OpenSSL/crypto/ec/ec_key.c              |  13 +-

 Cryptlib/OpenSSL/crypto/ec/ec_lib.c              |  10 +-

 Cryptlib/OpenSSL/crypto/ecdh/ech_lib.c           |  11 +-

 Cryptlib/OpenSSL/crypto/ecdsa/ecs_lib.c          |  11 +-

 Cryptlib/OpenSSL/crypto/engine/eng_all.c         |   6 +-

 Cryptlib/OpenSSL/crypto/err/err_all.c            |   2 +

 Cryptlib/OpenSSL/crypto/evp/bio_b64.c            |   3 +-

 Cryptlib/OpenSSL/crypto/evp/encode.c             |   1 +

 Cryptlib/OpenSSL/crypto/o_init.c                 |  14 +

 Cryptlib/OpenSSL/crypto/ocsp/ocsp_vfy.c          |  10 +-

 Cryptlib/OpenSSL/crypto/pkcs12/p12_crt.c         |   8 +

 Cryptlib/OpenSSL/crypto/pkcs12/p12_kiss.c        |   2 +-

 Cryptlib/OpenSSL/crypto/pkcs7/pk7_smime.c        |   4 +-

 Cryptlib/OpenSSL/crypto/rsa/rsa_oaep.c           |   2 +-

 Cryptlib/OpenSSL/crypto/x509/x509_vfy.c          |   6 +-

 Cryptlib/OpenSSL/update.sh                       | 998 ++++++++++++-----------

 Cryptlib/Pk/CryptPkcs7Sign.c                     | 207 +++++

 Cryptlib/Pk/CryptPkcs7SignNull.c                 |  59 ++

 Cryptlib/Pk/{CryptPkcs7.c => CryptPkcs7Verify.c} | 306 +++----

 Cryptlib/Pk/CryptPkcs7VerifyNull.c               | 100 +++

 Cryptlib/Pk/CryptRsaExtNull.c                    | 125 +++

 Cryptlib/Rand/CryptRand.c                        |  11 +-

 Cryptlib/update.sh                               |   9 +-

 45 files changed, 1425 insertions(+), 808 deletions(-)

 create mode 100644 Cryptlib/Pk/CryptPkcs7Sign.c

 create mode 100644 Cryptlib/Pk/CryptPkcs7SignNull.c

 rename Cryptlib/Pk/{CryptPkcs7.c => CryptPkcs7Verify.c} (74%)

 create mode 100644 Cryptlib/Pk/CryptPkcs7VerifyNull.c

 create mode 100644 Cryptlib/Pk/CryptRsaExtNull.c

diff --git a/Cryptlib/Cryptlib.diff b/Cryptlib/Cryptlib.diff

index 9663d90..a2f49d6 100644

--- a/Cryptlib/Cryptlib.diff

+++ b/Cryptlib/Cryptlib.diff

@@ -6,8 +6,8 @@ index 68bc25a..1abe78e 100644

    // BUG: hardcode OldSize == size! We have no any knowledge about

    // memory size of original pointer ptr.

    //

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

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

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

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

  }

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

diff --git a/Cryptlib/Include/openssl/bn.h b/Cryptlib/Include/openssl/bn.h

index f1719a5..688a4e7 100644

--- a/Cryptlib/Include/openssl/bn.h

+++ b/Cryptlib/Include/openssl/bn.h

@@ -511,6 +511,8 @@ BIGNUM *BN_mod_inverse(BIGNUM *ret,

 BIGNUM *BN_mod_sqrt(BIGNUM *ret,

 	const BIGNUM *a, const BIGNUM *n,BN_CTX *ctx);

+void	BN_consttime_swap(BN_ULONG swap, BIGNUM *a, BIGNUM *b, int nwords);

+

 /* Deprecated versions */

 #ifndef OPENSSL_NO_DEPRECATED

 BIGNUM *BN_generate_prime(BIGNUM *ret,int bits,int safe,

@@ -740,11 +742,20 @@ int RAND_pseudo_bytes(unsigned char *buf,int num);

 #define bn_fix_top(a)		bn_check_top(a)

+#define bn_check_size(bn, bits) bn_wcheck_size(bn, ((bits+BN_BITS2-1))/BN_BITS2)

+#define bn_wcheck_size(bn, words) \

+	do { \

+		const BIGNUM *_bnum2 = (bn); \

+		assert(words <= (_bnum2)->dmax && words >= (_bnum2)->top); \

+	} while(0)

+

 #else /* !BN_DEBUG */

 #define bn_pollute(a)

 #define bn_check_top(a)

 #define bn_fix_top(a)		bn_correct_top(a)

+#define bn_check_size(bn, bits)

+#define bn_wcheck_size(bn, words)

 #endif

diff --git a/Cryptlib/Include/openssl/crypto.h b/Cryptlib/Include/openssl/crypto.h

index fc1374f..ac0c949 100644

--- a/Cryptlib/Include/openssl/crypto.h

+++ b/Cryptlib/Include/openssl/crypto.h

@@ -235,15 +235,15 @@ typedef struct openssl_item_st

 #ifndef OPENSSL_NO_LOCKING

 #ifndef CRYPTO_w_lock

 #define CRYPTO_w_lock(type)	\

-	CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)

+	CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,NULL,0)

 #define CRYPTO_w_unlock(type)	\

-	CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)

+	CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,NULL,0)

 #define CRYPTO_r_lock(type)	\

-	CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)

+	CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,NULL,0)

 #define CRYPTO_r_unlock(type)	\

-	CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)

+	CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,NULL,0)

 #define CRYPTO_add(addr,amount,type)	\

-	CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)

+	CRYPTO_add_lock(addr,amount,type,NULL,0)

 #endif

 #else

 #define CRYPTO_w_lock(a)

@@ -361,19 +361,19 @@ int CRYPTO_is_mem_check_on(void);

 #define MemCheck_off()	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)

 #define is_MemCheck_on() CRYPTO_is_mem_check_on()

-#define OPENSSL_malloc(num)	CRYPTO_malloc((int)num,__FILE__,__LINE__)

-#define OPENSSL_strdup(str)	CRYPTO_strdup((str),__FILE__,__LINE__)

+#define OPENSSL_malloc(num)	CRYPTO_malloc((int)num,NULL,0)

+#define OPENSSL_strdup(str)	CRYPTO_strdup((str),NULL,0)

 #define OPENSSL_realloc(addr,num) \

-	CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__)

+	CRYPTO_realloc((char *)addr,(int)num,NULL,0)

 #define OPENSSL_realloc_clean(addr,old_num,num) \

-	CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__)

+	CRYPTO_realloc_clean(addr,old_num,num,NULL,0)

 #define OPENSSL_remalloc(addr,num) \

-	CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__)

+	CRYPTO_remalloc((char **)addr,(int)num,NULL,0)

 #define OPENSSL_freeFunc	CRYPTO_free

 #define OPENSSL_free(addr)	CRYPTO_free(addr)

 #define OPENSSL_malloc_locked(num) \

-	CRYPTO_malloc_locked((int)num,__FILE__,__LINE__)

+	CRYPTO_malloc_locked((int)num,NULL,0)

 #define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr)

@@ -487,7 +487,7 @@ void CRYPTO_set_mem_debug_options(long bits);

 long CRYPTO_get_mem_debug_options(void);

 #define CRYPTO_push_info(info) \

-        CRYPTO_push_info_(info, __FILE__, __LINE__);

+        CRYPTO_push_info_(info, NULL, 0);

 int CRYPTO_push_info_(const char *info, const char *file, int line);

 int CRYPTO_pop_info(void);

 int CRYPTO_remove_all_info(void);

@@ -528,17 +528,17 @@ void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);

 /* die if we have to */

 void OpenSSLDie(const char *file,int line,const char *assertion);

-#define OPENSSL_assert(e)       (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))

+#define OPENSSL_assert(e)       (void)((e) ? 0 : (OpenSSLDie(NULL, 0, #e),1))

 unsigned long *OPENSSL_ia32cap_loc(void);

 #define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))

 int OPENSSL_isservice(void);

 #ifdef OPENSSL_FIPS

-#define FIPS_ERROR_IGNORED(alg) OpenSSLDie(__FILE__, __LINE__, \

+#define FIPS_ERROR_IGNORED(alg) OpenSSLDie(NULL, 0, \

 		alg " previous FIPS forbidden algorithm error ignored");

-#define FIPS_BAD_ABORT(alg) OpenSSLDie(__FILE__, __LINE__, \

+#define FIPS_BAD_ABORT(alg) OpenSSLDie(NULL, 0, \

 		#alg " Algorithm forbidden in FIPS mode");

 #ifdef OPENSSL_FIPS_STRICT

@@ -591,6 +591,13 @@ int OPENSSL_isservice(void);

 #define OPENSSL_HAVE_INIT	1

 void OPENSSL_init(void);

+/* CRYPTO_memcmp returns zero iff the |len| bytes at |a| and |b| are equal. It

+ * takes an amount of time dependent on |len|, but independent of the contents

+ * of |a| and |b|. Unlike memcmp, it cannot be used to put elements into a

+ * defined order as the return value when a != b is undefined, other than to be

+ * non-zero. */

+int CRYPTO_memcmp(const void *a, const void *b, size_t len);

+

 /* BEGIN ERROR CODES */

 /* The following lines are auto generated by the script mkerr.pl. Any changes

  * made after this point may be overwritten when the script is next run.

diff --git a/Cryptlib/Include/openssl/ec.h b/Cryptlib/Include/openssl/ec.h

index 8bc2a23..367307f 100644

--- a/Cryptlib/Include/openssl/ec.h

+++ b/Cryptlib/Include/openssl/ec.h

@@ -321,7 +321,15 @@ void EC_KEY_set_conv_form(EC_KEY *, point_conversion_form_t);

 /* functions to set/get method specific data  */

 void *EC_KEY_get_key_method_data(EC_KEY *, 

 	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));

-void EC_KEY_insert_key_method_data(EC_KEY *, void *data,

+/** Sets the key method data of an EC_KEY object, if none has yet been set.

+ *  \param  key              EC_KEY object

+ *  \param  data             opaque data to install.

+ *  \param  dup_func         a function that duplicates |data|.

+ *  \param  free_func        a function that frees |data|.

+ *  \param  clear_free_func  a function that wipes and frees |data|.

+ *  \return the previously set data pointer, or NULL if |data| was inserted.

+ */

+void *EC_KEY_insert_key_method_data(EC_KEY *key, void *data,

 	void *(*dup_func)(void *), void (*free_func)(void *), void (*clear_free_func)(void *));

 /* wrapper functions for the underlying EC_GROUP object */

 void EC_KEY_set_asn1_flag(EC_KEY *, int);

diff --git a/Cryptlib/Include/openssl/engine.h b/Cryptlib/Include/openssl/engine.h

index d4bc1ef..b4e0444 100644

--- a/Cryptlib/Include/openssl/engine.h

+++ b/Cryptlib/Include/openssl/engine.h

@@ -335,15 +335,15 @@ void ENGINE_load_gmp(void);

 void ENGINE_load_nuron(void);

 void ENGINE_load_sureware(void);

 void ENGINE_load_ubsec(void);

-#endif

-void ENGINE_load_cryptodev(void);

-void ENGINE_load_padlock(void);

-void ENGINE_load_builtin_engines(void);

 #ifdef OPENSSL_SYS_WIN32

 #ifndef OPENSSL_NO_CAPIENG

 void ENGINE_load_capi(void);

 #endif

 #endif

+#endif

+void ENGINE_load_cryptodev(void);

+void ENGINE_load_padlock(void);

+void ENGINE_load_builtin_engines(void);

 /* Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation

  * "registry" handling. */

diff --git a/Cryptlib/Include/openssl/opensslv.h b/Cryptlib/Include/openssl/opensslv.h

index 4a5a5ae..e5ab5c4 100644

--- a/Cryptlib/Include/openssl/opensslv.h

+++ b/Cryptlib/Include/openssl/opensslv.h

@@ -25,11 +25,11 @@

  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for

  *  major minor fix final patch/beta)

  */

-#define OPENSSL_VERSION_NUMBER	0x0090817fL

+#define OPENSSL_VERSION_NUMBER	0x009081afL

 #ifdef OPENSSL_FIPS

-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8w-fips 23 Apr 2012"

+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8za-fips 5 Jun 2014"

 #else

-#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8w 23 Apr 2012"

+#define OPENSSL_VERSION_TEXT	"OpenSSL 0.9.8za 5 Jun 2014"

 #endif

 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT

diff --git a/Cryptlib/Include/openssl/ssl.h b/Cryptlib/Include/openssl/ssl.h

index eb50e14..5f2a04e 100644

--- a/Cryptlib/Include/openssl/ssl.h

+++ b/Cryptlib/Include/openssl/ssl.h

@@ -490,11 +490,14 @@ typedef struct ssl_session_st

 #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG		0x00000008L

 #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG		0x00000010L

 #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER		0x00000020L

-#define SSL_OP_MSIE_SSLV2_RSA_PADDING			0x00000040L /* no effect since 0.9.7h and 0.9.8b */

+#define SSL_OP_SAFARI_ECDHE_ECDSA_BUG			0x00000040L

 #define SSL_OP_SSLEAY_080_CLIENT_DH_BUG			0x00000080L

 #define SSL_OP_TLS_D5_BUG				0x00000100L

 #define SSL_OP_TLS_BLOCK_PADDING_BUG			0x00000200L

+/* Hasn't done anything since OpenSSL 0.9.7h, retained for compatibility */

+#define SSL_OP_MSIE_SSLV2_RSA_PADDING			0x0

+

 /* Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added

  * in OpenSSL 0.9.6d.  Usually (depending on the application protocol)

  * the workaround is not needed.  Unfortunately some broken SSL/TLS

@@ -1204,6 +1207,8 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);

 #define SSL_AD_CERTIFICATE_UNOBTAINABLE TLS1_AD_CERTIFICATE_UNOBTAINABLE

 #define SSL_AD_UNRECOGNIZED_NAME	TLS1_AD_UNRECOGNIZED_NAME

 #define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE

+#define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE

+#define SSL_AD_UNKNOWN_PSK_IDENTITY	TLS1_AD_UNKNOWN_PSK_IDENTITY /* fatal */

 #define SSL_ERROR_NONE			0

 #define SSL_ERROR_SSL			1

@@ -1820,6 +1825,7 @@ void ERR_load_SSL_strings(void);

 #define SSL_F_SSL_GET_NEW_SESSION			 181

 #define SSL_F_SSL_GET_PREV_SESSION			 217

 #define SSL_F_SSL_GET_SERVER_SEND_CERT			 182

+#define SSL_F_SSL_GET_SERVER_SEND_PKEY			 317

 #define SSL_F_SSL_GET_SIGN_PKEY				 183

 #define SSL_F_SSL_INIT_WBIO_BUFFER			 184

 #define SSL_F_SSL_LOAD_CLIENT_CA_FILE			 185

@@ -2073,6 +2079,11 @@ void ERR_load_SSL_strings(void);

 #define SSL_R_TLSV1_ALERT_RECORD_OVERFLOW		 1022

 #define SSL_R_TLSV1_ALERT_UNKNOWN_CA			 1048

 #define SSL_R_TLSV1_ALERT_USER_CANCELLED		 1090

+#define SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE		 1114

+#define SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE	 1113

+#define SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE		 1111

+#define SSL_R_TLSV1_UNRECOGNIZED_NAME			 1112

+#define SSL_R_TLSV1_UNSUPPORTED_EXTENSION		 1110

 #define SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER	 232

 #define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST		 227

 #define SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST 233

diff --git a/Cryptlib/Include/openssl/ssl3.h b/Cryptlib/Include/openssl/ssl3.h

index b9a85ef..de5e559 100644

--- a/Cryptlib/Include/openssl/ssl3.h

+++ b/Cryptlib/Include/openssl/ssl3.h

@@ -333,6 +333,7 @@ typedef struct ssl3_buffer_st

 #define SSL3_FLAGS_DELAY_CLIENT_FINISHED	0x0002

 #define SSL3_FLAGS_POP_BUFFER			0x0004

 #define TLS1_FLAGS_TLS_PADDING_BUG		0x0008

+#define SSL3_FLAGS_CCS_OK			0x0080

 /* SSL3_FLAGS_SGC_RESTART_DONE is set when we

  * restart a handshake because of MS SGC and so prevents us

@@ -460,6 +461,15 @@ typedef struct ssl3_state_st

         unsigned char previous_server_finished[EVP_MAX_MD_SIZE];

         unsigned char previous_server_finished_len;

         int send_connection_binding; /* TODOEKR */

+

+#ifndef OPENSSL_NO_TLSEXT

+#ifndef OPENSSL_NO_EC

+	/* This is set to true if we believe that this is a version of Safari

+	 * running on OS X 10.6 or newer. We wish to know this because Safari

+	 * on 10.8 .. 10.8.3 has broken ECDHE-ECDSA support. */

+	char is_probably_safari;

+#endif /* !OPENSSL_NO_EC */

+#endif /* !OPENSSL_NO_TLSEXT */

 	} SSL3_STATE;

diff --git a/Cryptlib/Include/openssl/symhacks.h b/Cryptlib/Include/openssl/symhacks.h

index 0114093..c540771 100644

--- a/Cryptlib/Include/openssl/symhacks.h

+++ b/Cryptlib/Include/openssl/symhacks.h

@@ -252,15 +252,15 @@

 #define EC_POINT_set_compressed_coordinates_GF2m \

                                                 EC_POINT_set_compr_coords_GF2m

 #undef ec_GF2m_simple_group_clear_finish

-#define ec_GF2m_simple_group_clear_finish        ec_GF2m_simple_grp_clr_finish

+#define ec_GF2m_simple_group_clear_finish       ec_GF2m_simple_grp_clr_finish

 #undef ec_GF2m_simple_group_check_discriminant

 #define ec_GF2m_simple_group_check_discriminant	ec_GF2m_simple_grp_chk_discrim

 #undef ec_GF2m_simple_point_clear_finish

-#define ec_GF2m_simple_point_clear_finish        ec_GF2m_simple_pt_clr_finish

+#define ec_GF2m_simple_point_clear_finish       ec_GF2m_simple_pt_clr_finish

 #undef ec_GF2m_simple_point_set_to_infinity

-#define ec_GF2m_simple_point_set_to_infinity     ec_GF2m_simple_pt_set_to_inf

+#define ec_GF2m_simple_point_set_to_infinity    ec_GF2m_simple_pt_set_to_inf

 #undef ec_GF2m_simple_points_make_affine

-#define ec_GF2m_simple_points_make_affine        ec_GF2m_simple_pts_make_affine

+#define ec_GF2m_simple_points_make_affine       ec_GF2m_simple_pts_make_affine

 #undef ec_GF2m_simple_point_set_affine_coordinates

 #define ec_GF2m_simple_point_set_affine_coordinates \

                                                 ec_GF2m_smp_pt_set_af_coords

@@ -288,8 +288,6 @@

 #define ec_GFp_simple_point_set_to_infinity     ec_GFp_simple_pt_set_to_inf

 #undef ec_GFp_simple_points_make_affine

 #define ec_GFp_simple_points_make_affine        ec_GFp_simple_pts_make_affine

-#undef ec_GFp_simple_group_get_curve_GFp

-#define ec_GFp_simple_group_get_curve_GFp       ec_GFp_simple_grp_get_curve_GFp

 #undef ec_GFp_simple_set_Jprojective_coordinates_GFp

 #define ec_GFp_simple_set_Jprojective_coordinates_GFp \

                                                 ec_GFp_smp_set_Jproj_coords_GFp

diff --git a/Cryptlib/Include/openssl/tls1.h b/Cryptlib/Include/openssl/tls1.h

index afe4807..47f25af 100644

--- a/Cryptlib/Include/openssl/tls1.h

+++ b/Cryptlib/Include/openssl/tls1.h

@@ -80,10 +80,24 @@ extern "C" {

 #define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES	0

+#define TLS1_2_VERSION			0x0303

+#define TLS1_2_VERSION_MAJOR		0x03

+#define TLS1_2_VERSION_MINOR		0x03

+

+#define TLS1_1_VERSION			0x0302

+#define TLS1_1_VERSION_MAJOR		0x03

+#define TLS1_1_VERSION_MINOR		0x02

+

 #define TLS1_VERSION			0x0301

 #define TLS1_VERSION_MAJOR		0x03

 #define TLS1_VERSION_MINOR		0x01

+#define TLS1_get_version(s) \

+		((s->version >> 8) == TLS1_VERSION_MAJOR ? s->version : 0)

+

+#define TLS1_get_client_version(s) \

+		((s->client_version >> 8) == TLS1_VERSION_MAJOR ? s->client_version : 0)

+

 #define TLS1_AD_DECRYPTION_FAILED	21

 #define TLS1_AD_RECORD_OVERFLOW		22

 #define TLS1_AD_UNKNOWN_CA		48	/* fatal */

diff --git a/Cryptlib/Makefile b/Cryptlib/Makefile

index d24e59e..678baac 100644

--- a/Cryptlib/Makefile

+++ b/Cryptlib/Makefile

@@ -30,7 +30,11 @@ OBJS		=   Hash/CryptMd4.o \

 		    Rand/CryptRand.o \

 		    Pk/CryptRsaBasic.o \

 		    Pk/CryptRsaExt.o \

-		    Pk/CryptPkcs7.o \

+		    Pk/CryptRsaExtNull.o \

+		    Pk/CryptPkcs7Sign.o \

+		    Pk/CryptPkcs7SignNull.o \

+		    Pk/CryptPkcs7Verify.o \

+		    Pk/CryptPkcs7VerifyNull.o \

 		    Pk/CryptDh.o \

 		    Pk/CryptX509.o \

 		    Pk/CryptAuthenticode.o \

diff --git a/Cryptlib/OpenSSL/crypto/asn1/a_int.c b/Cryptlib/OpenSSL/crypto/asn1/a_int.c

index f551bdb..ee26c31 100755

--- a/Cryptlib/OpenSSL/crypto/asn1/a_int.c

+++ b/Cryptlib/OpenSSL/crypto/asn1/a_int.c

@@ -116,7 +116,7 @@ int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp)

 	int pad=0,ret,i,neg;

 	unsigned char *p,*n,pb=0;

-	if ((a == NULL) || (a->data == NULL)) return(0);

+	if (a == NULL) return(0);

 	neg=a->type & V_ASN1_NEG;

 	if (a->length == 0)

 		ret=1;

diff --git a/Cryptlib/OpenSSL/crypto/asn1/a_strex.c b/Cryptlib/OpenSSL/crypto/asn1/a_strex.c

index 264ebf2..ead37ac 100755

--- a/Cryptlib/OpenSSL/crypto/asn1/a_strex.c

+++ b/Cryptlib/OpenSSL/crypto/asn1/a_strex.c

@@ -567,6 +567,7 @@ int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in)

 	if(mbflag == -1) return -1;

 	mbflag |= MBSTRING_FLAG;

 	stmp.data = NULL;

+	stmp.length = 0;

 	ret = ASN1_mbstring_copy(&str, in->data, in->length, mbflag, B_ASN1_UTF8STRING);

 	if(ret < 0) return ret;

 	*out = stmp.data;

diff --git a/Cryptlib/OpenSSL/crypto/asn1/a_strnid.c b/Cryptlib/OpenSSL/crypto/asn1/a_strnid.c

index b68ae43..9b7d688 100755

--- a/Cryptlib/OpenSSL/crypto/asn1/a_strnid.c

+++ b/Cryptlib/OpenSSL/crypto/asn1/a_strnid.c

@@ -75,7 +75,7 @@ static int table_cmp(const void *a, const void *b);

  * certain software (e.g. Netscape) has problems with them.

  */

-static unsigned long global_mask = 0xFFFFFFFFL;

+static unsigned long global_mask = B_ASN1_UTF8STRING;

 void ASN1_STRING_set_default_mask(unsigned long mask)

 {

diff --git a/Cryptlib/OpenSSL/crypto/asn1/a_verify.c b/Cryptlib/OpenSSL/crypto/asn1/a_verify.c

index da3efaa..7ded69b 100755

--- a/Cryptlib/OpenSSL/crypto/asn1/a_verify.c

+++ b/Cryptlib/OpenSSL/crypto/asn1/a_verify.c

@@ -138,6 +138,12 @@ int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *a, ASN1_BIT_STRING *signat

 	unsigned char *buf_in=NULL;

 	int ret= -1,i,inl;

+	if (!pkey)

+		{

+		ASN1err(ASN1_F_ASN1_ITEM_VERIFY, ERR_R_PASSED_NULL_PARAMETER);

+		return -1;

+		}

+

 	EVP_MD_CTX_init(&ctx;;

 	i=OBJ_obj2nid(a->algorithm);

 	type=EVP_get_digestbyname(OBJ_nid2sn(i));

diff --git a/Cryptlib/OpenSSL/crypto/asn1/t_pkey.c b/Cryptlib/OpenSSL/crypto/asn1/t_pkey.c

index afb95d6..bc23f56 100755

--- a/Cryptlib/OpenSSL/crypto/asn1/t_pkey.c

+++ b/Cryptlib/OpenSSL/crypto/asn1/t_pkey.c

@@ -208,11 +208,6 @@ int DSA_print(BIO *bp, const DSA *x, int off)

 	if (x->p)

 		buf_len = (size_t)BN_num_bytes(x->p);

-	else

-		{

-		DSAerr(DSA_F_DSA_PRINT,DSA_R_MISSING_PARAMETERS);

-		goto err;

-		}

 	if (x->q)

 		if (buf_len < (i = (size_t)BN_num_bytes(x->q)))

 			buf_len = i;

diff --git a/Cryptlib/OpenSSL/crypto/asn1/x_pubkey.c b/Cryptlib/OpenSSL/crypto/asn1/x_pubkey.c

index 94d9f7e..bc8a7bf 100755

--- a/Cryptlib/OpenSSL/crypto/asn1/x_pubkey.c

+++ b/Cryptlib/OpenSSL/crypto/asn1/x_pubkey.c

@@ -371,12 +371,15 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)

 	CRYPTO_w_lock(CRYPTO_LOCK_EVP_PKEY);

 	if (key->pkey)

 		{

+		CRYPTO_w_unlock(CRYPTO_LOCK_EVP_PKEY);

 		EVP_PKEY_free(ret);

 		ret = key->pkey;

 		}

 	else

+		{

 		key->pkey = ret;

-	CRYPTO_w_unlock(CRYPTO_LOCK_EVP_PKEY);

+		CRYPTO_w_unlock(CRYPTO_LOCK_EVP_PKEY);

+		}

 	CRYPTO_add(&ret->references, 1, CRYPTO_LOCK_EVP_PKEY);

 	return(ret);

 err:

diff --git a/Cryptlib/OpenSSL/crypto/bn/bn_lib.c b/Cryptlib/OpenSSL/crypto/bn/bn_lib.c

index 32a8fba..b66f507 100755

--- a/Cryptlib/OpenSSL/crypto/bn/bn_lib.c

+++ b/Cryptlib/OpenSSL/crypto/bn/bn_lib.c

@@ -824,3 +824,55 @@ int bn_cmp_part_words(const BN_ULONG *a, const BN_ULONG *b,

 		}

 	return bn_cmp_words(a,b,cl);

 	}

+

+/* 

+ * Constant-time conditional swap of a and b.  

+ * a and b are swapped if condition is not 0.  The code assumes that at most one bit of condition is set.

+ * nwords is the number of words to swap.  The code assumes that at least nwords are allocated in both a and b,

+ * and that no more than nwords are used by either a or b.

+ * a and b cannot be the same number

+ */

+void BN_consttime_swap(BN_ULONG condition, BIGNUM *a, BIGNUM *b, int nwords)

+	{

+	BN_ULONG t;

+	int i;

+

+	bn_wcheck_size(a, nwords);

+	bn_wcheck_size(b, nwords);

+

+	assert(a != b);

+	assert((condition & (condition - 1)) == 0);

+	assert(sizeof(BN_ULONG) >= sizeof(int));

+

+	condition = ((condition - 1) >> (BN_BITS2 - 1)) - 1;

+

+	t = (a->top^b->top) & condition;

+	a->top ^= t;

+	b->top ^= t;

+

+#define BN_CONSTTIME_SWAP(ind) \

+	do { \

+		t = (a->d[ind] ^ b->d[ind]) & condition; \

+		a->d[ind] ^= t; \

+		b->d[ind] ^= t; \

+	} while (0)

+

+

+	switch (nwords) {

+	default:

+		for (i = 10; i < nwords; i++) 

+			BN_CONSTTIME_SWAP(i);

+		/* Fallthrough */

+	case 10: BN_CONSTTIME_SWAP(9); /* Fallthrough */

+	case 9: BN_CONSTTIME_SWAP(8); /* Fallthrough */

+	case 8: BN_CONSTTIME_SWAP(7); /* Fallthrough */

+	case 7: BN_CONSTTIME_SWAP(6); /* Fallthrough */

+	case 6: BN_CONSTTIME_SWAP(5); /* Fallthrough */

+	case 5: BN_CONSTTIME_SWAP(4); /* Fallthrough */

+	case 4: BN_CONSTTIME_SWAP(3); /* Fallthrough */

+	case 3: BN_CONSTTIME_SWAP(2); /* Fallthrough */

+	case 2: BN_CONSTTIME_SWAP(1); /* Fallthrough */

+	case 1: BN_CONSTTIME_SWAP(0);

+	}

+#undef BN_CONSTTIME_SWAP

+}

diff --git a/Cryptlib/OpenSSL/crypto/bn/bn_mont.c b/Cryptlib/OpenSSL/crypto/bn/bn_mont.c

index 4799b15..27cafb1 100755

--- a/Cryptlib/OpenSSL/crypto/bn/bn_mont.c

+++ b/Cryptlib/OpenSSL/crypto/bn/bn_mont.c

@@ -701,32 +701,38 @@ BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to, BN_MONT_CTX *from)

 BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, int lock,

 					const BIGNUM *mod, BN_CTX *ctx)

 	{

-	int got_write_lock = 0;

 	BN_MONT_CTX *ret;

 	CRYPTO_r_lock(lock);

-	if (!*pmont)

+	ret = *pmont;

+	CRYPTO_r_unlock(lock);

+	if (ret)

+		return ret;

+

+	/* We don't want to serialise globally while doing our lazy-init math in

+	 * BN_MONT_CTX_set. That punishes threads that are doing independent

+	 * things. Instead, punish the case where more than one thread tries to

+	 * lazy-init the same 'pmont', by having each do the lazy-init math work

+	 * independently and only use the one from the thread that wins the race

+	 * (the losers throw away the work they've done). */

+	ret = BN_MONT_CTX_new();

+	if (!ret)

+		return NULL;

+	if (!BN_MONT_CTX_set(ret, mod, ctx))

 		{

-		CRYPTO_r_unlock(lock);

-		CRYPTO_w_lock(lock);

-		got_write_lock = 1;

+		BN_MONT_CTX_free(ret);

+		return NULL;

+		}

-		if (!*pmont)

-			{

-			ret = BN_MONT_CTX_new();

-			if (ret && !BN_MONT_CTX_set(ret, mod, ctx))

-				BN_MONT_CTX_free(ret);

-			else

-				*pmont = ret;

-			}

+	/* The locked compare-and-set, after the local work is done. */

+	CRYPTO_w_lock(lock);

+	if (*pmont)

+		{

+		BN_MONT_CTX_free(ret);

+		ret = *pmont;

 		}

-	

-	ret = *pmont;

-	

-	if (got_write_lock)

-		CRYPTO_w_unlock(lock);

 	else

-		CRYPTO_r_unlock(lock);

-		

+		*pmont = ret;

+	CRYPTO_w_unlock(lock);

 	return ret;

 	}

diff --git a/Cryptlib/OpenSSL/crypto/bn/bn_word.c b/Cryptlib/OpenSSL/crypto/bn/bn_word.c

index ee7b87c..de83a15 100755

--- a/Cryptlib/OpenSSL/crypto/bn/bn_word.c

+++ b/Cryptlib/OpenSSL/crypto/bn/bn_word.c

@@ -144,26 +144,17 @@ int BN_add_word(BIGNUM *a, BN_ULONG w)

 			a->neg=!(a->neg);

 		return(i);

 		}

-	/* Only expand (and risk failing) if it's possibly necessary */

-	if (((BN_ULONG)(a->d[a->top - 1] + 1) == 0) &&

-			(bn_wexpand(a,a->top+1) == NULL))

-		return(0);

-	i=0;

-	for (;;)

+	for (i=0;w!=0 && i<a->top;i++)

 		{

-		if (i >= a->top)

-			l=w;

-		else

-			l=(a->d[i]+w)&BN_MASK2;

-		a->d[i]=l;

-		if (w > l)

-			w=1;

-		else

-			break;

-		i++;

+		a->d[i] = l = (a->d[i]+w)&BN_MASK2;

+		w = (w>l)?1:0;

 		}

-	if (i >= a->top)

+	if (w && i==a->top)

+		{

+		if (bn_wexpand(a,a->top+1) == NULL) return 0;

 		a->top++;

+		a->d[i]=w;

+		}

 	bn_check_top(a);

 	return(1);

 	}

diff --git a/Cryptlib/OpenSSL/crypto/cryptlib.c b/Cryptlib/OpenSSL/crypto/cryptlib.c

index dd74ea8..dec3286 100755

--- a/Cryptlib/OpenSSL/crypto/cryptlib.c

+++ b/Cryptlib/OpenSSL/crypto/cryptlib.c

@@ -542,3 +542,19 @@ void OpenSSLDie(const char *file,int line,const char *assertion)

 	}

 void *OPENSSL_stderr(void)	{ return stderr; }

+

+#ifndef OPENSSL_FIPS

+

+int CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len)

+	{

+	size_t i;

+	const unsigned char *a = in_a;

+	const unsigned char *b = in_b;

+	unsigned char x = 0;

+

+	for (i = 0; i < len; i++)

+		x |= a[i] ^ b[i];

+

+	return x;

+	}

+#endif

diff --git a/Cryptlib/OpenSSL/crypto/ec/ec2_mult.c b/Cryptlib/OpenSSL/crypto/ec/ec2_mult.c

index 7dca5e4..6b570a3 100755

--- a/Cryptlib/OpenSSL/crypto/ec/ec2_mult.c

+++ b/Cryptlib/OpenSSL/crypto/ec/ec2_mult.c

@@ -208,9 +208,12 @@ static int gf2m_Mxy(const EC_GROUP *group, const BIGNUM *x, const BIGNUM *y, BIG

 /* Computes scalar*point and stores the result in r.

  * point can not equal r.

- * Uses algorithm 2P of

+ * Uses a modified algorithm 2P of

  *     Lopex, J. and Dahab, R.  "Fast multiplication on elliptic curves over 

  *     GF(2^m) without precomputation".

+ *

+ * To protect against side-channel attack the function uses constant time

+ * swap avoiding conditional branches.

  */

 static int ec_GF2m_montgomery_point_multiply(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,

 	const EC_POINT *point, BN_CTX *ctx)