Updated OpenSSL lib. Thanks to Neo2003. Author: tomrus88

--HG--
branch : trunk

1 files changed, 121 insertions, 110 deletions

diff --git a/dep/include/openssl/err.h b/dep/include/openssl/err.h
index b0329919484..dcac4152310 100644
--- a/dep/include/openssl/err.h
+++ b/dep/include/openssl/err.h
@@ -5,21 +5,21 @@
  * 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:
@@ -34,10 +34,10 @@
  *     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
+ * 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
@@ -49,7 +49,7 @@
  * 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
@@ -74,74 +74,77 @@
 #include <openssl/lhash.h>
 #endif
 
-#ifdef  __cplusplus
+#ifdef	__cplusplus
 extern "C" {
 #endif
 
 #ifndef OPENSSL_NO_ERR
-#define ERR_PUT_error(a,b,c,d,e)    ERR_put_error(a,b,c,d,e)
+#define ERR_PUT_error(a,b,c,d,e)	ERR_put_error(a,b,c,d,e)
 #else
-#define ERR_PUT_error(a,b,c,d,e)    ERR_put_error(a,b,c,NULL,0)
+#define ERR_PUT_error(a,b,c,d,e)	ERR_put_error(a,b,c,NULL,0)
 #endif
 
 #include <errno.h>
 
-#define ERR_TXT_MALLOCED    0x01
-#define ERR_TXT_STRING      0x02
+#define ERR_TXT_MALLOCED	0x01
+#define ERR_TXT_STRING		0x02
 
-#define ERR_FLAG_MARK       0x01
+#define ERR_FLAG_MARK		0x01
 
-#define ERR_NUM_ERRORS  16
+#define ERR_NUM_ERRORS	16
 typedef struct err_state_st
-    {
-    unsigned long pid;
-    int err_flags[ERR_NUM_ERRORS];
-    unsigned long err_buffer[ERR_NUM_ERRORS];
-    char *err_data[ERR_NUM_ERRORS];
-    int err_data_flags[ERR_NUM_ERRORS];
-    const char *err_file[ERR_NUM_ERRORS];
-    int err_line[ERR_NUM_ERRORS];
-    int top,bottom;
-    } ERR_STATE;
+	{
+	unsigned long pid;
+	int err_flags[ERR_NUM_ERRORS];
+	unsigned long err_buffer[ERR_NUM_ERRORS];
+	char *err_data[ERR_NUM_ERRORS];
+	int err_data_flags[ERR_NUM_ERRORS];
+	const char *err_file[ERR_NUM_ERRORS];
+	int err_line[ERR_NUM_ERRORS];
+	int top,bottom;
+	} ERR_STATE;
 
 /* library */
-#define ERR_LIB_NONE        1
-#define ERR_LIB_SYS     2
-#define ERR_LIB_BN      3
-#define ERR_LIB_RSA     4
-#define ERR_LIB_DH      5
-#define ERR_LIB_EVP     6
-#define ERR_LIB_BUF     7
-#define ERR_LIB_OBJ     8
-#define ERR_LIB_PEM     9
-#define ERR_LIB_DSA     10
-#define ERR_LIB_X509        11
+#define ERR_LIB_NONE		1
+#define ERR_LIB_SYS		2
+#define ERR_LIB_BN		3
+#define ERR_LIB_RSA		4
+#define ERR_LIB_DH		5
+#define ERR_LIB_EVP		6
+#define ERR_LIB_BUF		7
+#define ERR_LIB_OBJ		8
+#define ERR_LIB_PEM		9
+#define ERR_LIB_DSA		10
+#define ERR_LIB_X509		11
 /* #define ERR_LIB_METH         12 */
-#define ERR_LIB_ASN1        13
-#define ERR_LIB_CONF        14
-#define ERR_LIB_CRYPTO      15
-#define ERR_LIB_EC      16
-#define ERR_LIB_SSL     20
+#define ERR_LIB_ASN1		13
+#define ERR_LIB_CONF		14
+#define ERR_LIB_CRYPTO		15
+#define ERR_LIB_EC		16
+#define ERR_LIB_SSL		20
 /* #define ERR_LIB_SSL23        21 */
 /* #define ERR_LIB_SSL2         22 */
 /* #define ERR_LIB_SSL3         23 */
 /* #define ERR_LIB_RSAREF       30 */
 /* #define ERR_LIB_PROXY        31 */
-#define ERR_LIB_BIO     32
-#define ERR_LIB_PKCS7       33
-#define ERR_LIB_X509V3      34
-#define ERR_LIB_PKCS12      35
-#define ERR_LIB_RAND        36
-#define ERR_LIB_DSO     37
-#define ERR_LIB_ENGINE      38
+#define ERR_LIB_BIO		32
+#define ERR_LIB_PKCS7		33
+#define ERR_LIB_X509V3		34
+#define ERR_LIB_PKCS12		35
+#define ERR_LIB_RAND		36
+#define ERR_LIB_DSO		37
+#define ERR_LIB_ENGINE		38
 #define ERR_LIB_OCSP            39
 #define ERR_LIB_UI              40
 #define ERR_LIB_COMP            41
-#define ERR_LIB_ECDSA       42
-#define ERR_LIB_ECDH        43
+#define ERR_LIB_ECDSA		42
+#define ERR_LIB_ECDH		43
 #define ERR_LIB_STORE           44
+#define ERR_LIB_FIPS		45
+#define ERR_LIB_CMS		46
+#define ERR_LIB_JPAKE		47
 
-#define ERR_LIB_USER        128
+#define ERR_LIB_USER		128
 
 #define SYSerr(f,r)  ERR_PUT_error(ERR_LIB_SYS,(f),(r),__FILE__,__LINE__)
 #define BNerr(f,r)   ERR_PUT_error(ERR_LIB_BN,(f),(r),__FILE__,__LINE__)
@@ -171,86 +174,89 @@ typedef struct err_state_st
 #define ECDSAerr(f,r)  ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),__FILE__,__LINE__)
 #define ECDHerr(f,r)  ERR_PUT_error(ERR_LIB_ECDH,(f),(r),__FILE__,__LINE__)
 #define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__)
+#define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),__FILE__,__LINE__)
+#define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__)
+#define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__)
 
 /* Borland C seems too stupid to be able to shift and do longs in
  * the pre-processor :-( */
-#define ERR_PACK(l,f,r)     (((((unsigned long)l)&0xffL)*0x1000000)| \
-                ((((unsigned long)f)&0xfffL)*0x1000)| \
-                ((((unsigned long)r)&0xfffL)))
-#define ERR_GET_LIB(l)      (int)((((unsigned long)l)>>24L)&0xffL)
-#define ERR_GET_FUNC(l)     (int)((((unsigned long)l)>>12L)&0xfffL)
-#define ERR_GET_REASON(l)   (int)((l)&0xfffL)
-#define ERR_FATAL_ERROR(l)  (int)((l)&ERR_R_FATAL)
+#define ERR_PACK(l,f,r)		(((((unsigned long)l)&0xffL)*0x1000000)| \
+				((((unsigned long)f)&0xfffL)*0x1000)| \
+				((((unsigned long)r)&0xfffL)))
+#define ERR_GET_LIB(l)		(int)((((unsigned long)l)>>24L)&0xffL)
+#define ERR_GET_FUNC(l)		(int)((((unsigned long)l)>>12L)&0xfffL)
+#define ERR_GET_REASON(l)	(int)((l)&0xfffL)
+#define ERR_FATAL_ERROR(l)	(int)((l)&ERR_R_FATAL)
 
 
 /* OS functions */
-#define SYS_F_FOPEN     1
-#define SYS_F_CONNECT       2
-#define SYS_F_GETSERVBYNAME 3
-#define SYS_F_SOCKET        4
-#define SYS_F_IOCTLSOCKET   5
-#define SYS_F_BIND      6
-#define SYS_F_LISTEN        7
-#define SYS_F_ACCEPT        8
-#define SYS_F_WSASTARTUP    9 /* Winsock stuff */
-#define SYS_F_OPENDIR       10
-#define SYS_F_FREAD     11
+#define SYS_F_FOPEN		1
+#define SYS_F_CONNECT		2
+#define SYS_F_GETSERVBYNAME	3
+#define SYS_F_SOCKET		4
+#define SYS_F_IOCTLSOCKET	5
+#define SYS_F_BIND		6
+#define SYS_F_LISTEN		7
+#define SYS_F_ACCEPT		8
+#define SYS_F_WSASTARTUP	9 /* Winsock stuff */
+#define SYS_F_OPENDIR		10
+#define SYS_F_FREAD		11
 
 
 /* reasons */
-#define ERR_R_SYS_LIB   ERR_LIB_SYS       /* 2 */
-#define ERR_R_BN_LIB    ERR_LIB_BN        /* 3 */
-#define ERR_R_RSA_LIB   ERR_LIB_RSA       /* 4 */
-#define ERR_R_DH_LIB    ERR_LIB_DH        /* 5 */
-#define ERR_R_EVP_LIB   ERR_LIB_EVP       /* 6 */
-#define ERR_R_BUF_LIB   ERR_LIB_BUF       /* 7 */
-#define ERR_R_OBJ_LIB   ERR_LIB_OBJ       /* 8 */
-#define ERR_R_PEM_LIB   ERR_LIB_PEM       /* 9 */
-#define ERR_R_DSA_LIB   ERR_LIB_DSA      /* 10 */
-#define ERR_R_X509_LIB  ERR_LIB_X509     /* 11 */
-#define ERR_R_ASN1_LIB  ERR_LIB_ASN1     /* 13 */
-#define ERR_R_CONF_LIB  ERR_LIB_CONF     /* 14 */
+#define ERR_R_SYS_LIB	ERR_LIB_SYS       /* 2 */
+#define ERR_R_BN_LIB	ERR_LIB_BN        /* 3 */
+#define ERR_R_RSA_LIB	ERR_LIB_RSA       /* 4 */
+#define ERR_R_DH_LIB	ERR_LIB_DH        /* 5 */
+#define ERR_R_EVP_LIB	ERR_LIB_EVP       /* 6 */
+#define ERR_R_BUF_LIB	ERR_LIB_BUF       /* 7 */
+#define ERR_R_OBJ_LIB	ERR_LIB_OBJ       /* 8 */
+#define ERR_R_PEM_LIB	ERR_LIB_PEM       /* 9 */
+#define ERR_R_DSA_LIB	ERR_LIB_DSA      /* 10 */
+#define ERR_R_X509_LIB	ERR_LIB_X509     /* 11 */
+#define ERR_R_ASN1_LIB	ERR_LIB_ASN1     /* 13 */
+#define ERR_R_CONF_LIB	ERR_LIB_CONF     /* 14 */
 #define ERR_R_CRYPTO_LIB ERR_LIB_CRYPTO  /* 15 */
-#define ERR_R_EC_LIB    ERR_LIB_EC       /* 16 */
-#define ERR_R_SSL_LIB   ERR_LIB_SSL      /* 20 */
-#define ERR_R_BIO_LIB   ERR_LIB_BIO      /* 32 */
-#define ERR_R_PKCS7_LIB ERR_LIB_PKCS7    /* 33 */
+#define ERR_R_EC_LIB	ERR_LIB_EC       /* 16 */
+#define ERR_R_SSL_LIB	ERR_LIB_SSL      /* 20 */
+#define ERR_R_BIO_LIB	ERR_LIB_BIO      /* 32 */
+#define ERR_R_PKCS7_LIB	ERR_LIB_PKCS7    /* 33 */
 #define ERR_R_X509V3_LIB ERR_LIB_X509V3  /* 34 */
 #define ERR_R_PKCS12_LIB ERR_LIB_PKCS12  /* 35 */
-#define ERR_R_RAND_LIB  ERR_LIB_RAND     /* 36 */
-#define ERR_R_DSO_LIB   ERR_LIB_DSO      /* 37 */
+#define ERR_R_RAND_LIB	ERR_LIB_RAND     /* 36 */
+#define ERR_R_DSO_LIB	ERR_LIB_DSO      /* 37 */
 #define ERR_R_ENGINE_LIB ERR_LIB_ENGINE  /* 38 */
 #define ERR_R_OCSP_LIB  ERR_LIB_OCSP     /* 39 */
 #define ERR_R_UI_LIB    ERR_LIB_UI       /* 40 */
-#define ERR_R_COMP_LIB  ERR_LIB_COMP     /* 41 */
-#define ERR_R_ECDSA_LIB ERR_LIB_ECDSA    /* 42 */
-#define ERR_R_ECDH_LIB  ERR_LIB_ECDH     /* 43 */
+#define ERR_R_COMP_LIB	ERR_LIB_COMP     /* 41 */
+#define ERR_R_ECDSA_LIB ERR_LIB_ECDSA	 /* 42 */
+#define ERR_R_ECDH_LIB  ERR_LIB_ECDH	 /* 43 */
 #define ERR_R_STORE_LIB ERR_LIB_STORE    /* 44 */
 
-#define ERR_R_NESTED_ASN1_ERROR         58
-#define ERR_R_BAD_ASN1_OBJECT_HEADER        59
-#define ERR_R_BAD_GET_ASN1_OBJECT_CALL      60
-#define ERR_R_EXPECTING_AN_ASN1_SEQUENCE    61
-#define ERR_R_ASN1_LENGTH_MISMATCH      62
-#define ERR_R_MISSING_ASN1_EOS          63
+#define ERR_R_NESTED_ASN1_ERROR			58
+#define ERR_R_BAD_ASN1_OBJECT_HEADER		59
+#define ERR_R_BAD_GET_ASN1_OBJECT_CALL		60
+#define ERR_R_EXPECTING_AN_ASN1_SEQUENCE	61
+#define ERR_R_ASN1_LENGTH_MISMATCH		62
+#define ERR_R_MISSING_ASN1_EOS			63
 
 /* fatal error */
-#define ERR_R_FATAL             64
-#define ERR_R_MALLOC_FAILURE            (1|ERR_R_FATAL)
-#define ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED   (2|ERR_R_FATAL)
-#define ERR_R_PASSED_NULL_PARAMETER     (3|ERR_R_FATAL)
-#define ERR_R_INTERNAL_ERROR            (4|ERR_R_FATAL)
-#define ERR_R_DISABLED              (5|ERR_R_FATAL)
+#define ERR_R_FATAL				64
+#define	ERR_R_MALLOC_FAILURE			(1|ERR_R_FATAL)
+#define	ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED	(2|ERR_R_FATAL)
+#define	ERR_R_PASSED_NULL_PARAMETER		(3|ERR_R_FATAL)
+#define	ERR_R_INTERNAL_ERROR			(4|ERR_R_FATAL)
+#define	ERR_R_DISABLED				(5|ERR_R_FATAL)
 
 /* 99 is the maximum possible ERR_R_... code, higher values
  * are reserved for the individual libraries */
 
 
 typedef struct ERR_string_data_st
-    {
-    unsigned long error;
-    const char *string;
-    } ERR_STRING_DATA;
+	{
+	unsigned long error;
+	const char *string;
+	} ERR_STRING_DATA;
 
 void ERR_put_error(int lib, int func,int reason,const char *file,int line);
 void ERR_set_error_data(char *data,int flags);
@@ -258,15 +264,15 @@ void ERR_set_error_data(char *data,int flags);
 unsigned long ERR_get_error(void);
 unsigned long ERR_get_error_line(const char **file,int *line);
 unsigned long ERR_get_error_line_data(const char **file,int *line,
-                      const char **data, int *flags);
+				      const char **data, int *flags);
 unsigned long ERR_peek_error(void);
 unsigned long ERR_peek_error_line(const char **file,int *line);
 unsigned long ERR_peek_error_line_data(const char **file,int *line,
-                       const char **data,int *flags);
+				       const char **data,int *flags);
 unsigned long ERR_peek_last_error(void);
 unsigned long ERR_peek_last_error_line(const char **file,int *line);
 unsigned long ERR_peek_last_error_line_data(const char **file,int *line,
-                       const char **data,int *flags);
+				       const char **data,int *flags);
 void ERR_clear_error(void );
 char *ERR_error_string(unsigned long e,char *buf);
 void ERR_error_string_n(unsigned long e, char *buf, size_t len);
@@ -274,7 +280,7 @@ const char *ERR_lib_error_string(unsigned long e);
 const char *ERR_func_error_string(unsigned long e);
 const char *ERR_reason_error_string(unsigned long e);
 void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
-             void *u);
+			 void *u);
 #ifndef OPENSSL_NO_FP_API
 void ERR_print_errors_fp(FILE *fp);
 #endif
@@ -302,6 +308,12 @@ int ERR_get_next_error_library(void);
 int ERR_set_mark(void);
 int ERR_pop_to_mark(void);
 
+#ifdef OPENSSL_FIPS
+void int_ERR_set_state_func(ERR_STATE *(*get_func)(void),
+				void (*remove_func)(unsigned long pid));
+void int_ERR_lib_init(void);
+#endif
+
 /* Already defined in ossl_typ.h */
 /* typedef struct st_ERR_FNS ERR_FNS; */
 /* An application can use this function and provide the return value to loaded
@@ -311,9 +323,8 @@ const ERR_FNS *ERR_get_implementation(void);
  * the application's "ERR_FNS". */
 int ERR_set_implementation(const ERR_FNS *fns);
 
-#ifdef  __cplusplus
+#ifdef	__cplusplus
 }
 #endif
 
 #endif
-