-diff U3 crypto/bio/bio.h crypto/bio/bio.h\r
---- crypto/bio/bio.h Thu Jan 28 21:56:08 2016\r
-+++ crypto/bio/bio.h Wed Feb 17 16:43:40 2016\r
-@@ -650,10 +650,10 @@\r
- int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,\r
- asn1_ps_func **psuffix_free);\r
- \r
--# ifndef OPENSSL_NO_FP_API\r
- BIO_METHOD *BIO_s_file(void);\r
- BIO *BIO_new_file(const char *filename, const char *mode);\r
- BIO *BIO_new_fp(FILE *stream, int close_flag);\r
-+# ifndef OPENSSL_NO_FP_API\r
- # define BIO_s_file_internal BIO_s_file\r
+diff --git a/Configure b/Configure\r
+index 4a715dc..eb61eda 100755\r
+--- a/Configure\r
++++ b/Configure\r
+@@ -1082,7 +1082,7 @@ if (defined($disabled{"tls1"}))\r
+ }\r
+ \r
+ if (defined($disabled{"ec"}) || defined($disabled{"dsa"})\r
+- || defined($disabled{"dh"}))\r
++ || defined($disabled{"dh"}) || defined($disabled{"stdio"}))\r
+ {\r
+ $disabled{"gost"} = "forced";\r
+ }\r
+diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c\r
+index 35fd44c..9f39bff 100644\r
+--- a/crypto/asn1/a_strex.c\r
++++ b/crypto/asn1/a_strex.c\r
+@@ -104,6 +104,7 @@ static int send_bio_chars(void *arg, const void *buf, int len)\r
+ return 1;\r
+ }\r
+ \r
++#ifndef OPENSSL_NO_FP_API\r
+ static int send_fp_chars(void *arg, const void *buf, int len)\r
+ {\r
+ if (!arg)\r
+@@ -112,6 +113,7 @@ static int send_fp_chars(void *arg, const void *buf, int len)\r
+ return 0;\r
+ return 1;\r
+ }\r
++#endif\r
+ \r
+ typedef int char_io (void *arg, const void *buf, int len);\r
+ \r
+diff --git a/crypto/asn1/asn1_mac.h b/crypto/asn1/asn1_mac.h\r
+index abc6dc3..3a672e9 100644\r
+--- a/crypto/asn1/asn1_mac.h\r
++++ b/crypto/asn1/asn1_mac.h\r
+@@ -70,7 +70,7 @@ extern "C" {\r
# endif\r
- BIO *BIO_new(BIO_METHOD *type);\r
-diff U3 crypto/bio/bss_file.c crypto/bio/bss_file.c\r
---- crypto/bio/bss_file.c Thu Jan 28 21:38:30 2016\r
-+++ crypto/bio/bss_file.c Wed Feb 17 16:01:02 2016\r
-@@ -467,6 +467,23 @@\r
- return (ret);\r
+ \r
+ # define ASN1_MAC_H_err(f,r,line) \\r
+- ERR_PUT_error(ASN1_MAC_ERR_LIB,(f),(r),__FILE__,(line))\r
++ ERR_PUT_error(ASN1_MAC_ERR_LIB,(f),(r),OPENSSL_FILE,(line))\r
+ \r
+ # define M_ASN1_D2I_vars(a,type,func) \\r
+ ASN1_const_CTX c; \\r
+@@ -81,7 +81,7 @@ extern "C" {\r
+ c.error=ERR_R_NESTED_ASN1_ERROR; \\r
+ if ((a == NULL) || ((*a) == NULL)) \\r
+ { if ((ret=(type)func()) == NULL) \\r
+- { c.line=__LINE__; goto err; } } \\r
++ { c.line=OPENSSL_LINE; goto err; } } \\r
+ else ret=(*a);\r
+ \r
+ # define M_ASN1_D2I_Init() \\r
+@@ -90,7 +90,7 @@ extern "C" {\r
+ \r
+ # define M_ASN1_D2I_Finish_2(a) \\r
+ if (!asn1_const_Finish(&c)) \\r
+- { c.line=__LINE__; goto err; } \\r
++ { c.line=OPENSSL_LINE; goto err; } \\r
+ *(const unsigned char **)pp=c.p; \\r
+ if (a != NULL) (*a)=ret; \\r
+ return(ret);\r
+@@ -105,7 +105,7 @@ err:\\r
+ \r
+ # define M_ASN1_D2I_start_sequence() \\r
+ if (!asn1_GetSequence(&c,&length)) \\r
+- { c.line=__LINE__; goto err; }\r
++ { c.line=OPENSSL_LINE; goto err; }\r
+ /* Begin reading ASN1 without a surrounding sequence */\r
+ # define M_ASN1_D2I_begin() \\r
+ c.slen = length;\r
+@@ -129,21 +129,21 @@ err:\\r
+ # define M_ASN1_D2I_get(b, func) \\r
+ c.q=c.p; \\r
+ if (func(&(b),&c.p,c.slen) == NULL) \\r
+- {c.line=__LINE__; goto err; } \\r
++ {c.line=OPENSSL_LINE; goto err; } \\r
+ c.slen-=(c.p-c.q);\r
+ \r
+ /* Don't use this with d2i_ASN1_BOOLEAN() */\r
+ # define M_ASN1_D2I_get_x(type,b,func) \\r
+ c.q=c.p; \\r
+ if (((D2I_OF(type))func)(&(b),&c.p,c.slen) == NULL) \\r
+- {c.line=__LINE__; goto err; } \\r
++ {c.line=OPENSSL_LINE; goto err; } \\r
+ c.slen-=(c.p-c.q);\r
+ \r
+ /* use this instead () */\r
+ # define M_ASN1_D2I_get_int(b,func) \\r
+ c.q=c.p; \\r
+ if (func(&(b),&c.p,c.slen) < 0) \\r
+- {c.line=__LINE__; goto err; } \\r
++ {c.line=OPENSSL_LINE; goto err; } \\r
+ c.slen-=(c.p-c.q);\r
+ \r
+ # define M_ASN1_D2I_get_opt(b,func,type) \\r
+@@ -164,7 +164,7 @@ err:\\r
+ M_ASN1_next=(_tmp& V_ASN1_CONSTRUCTED)|type; \\r
+ c.q=c.p; \\r
+ if (func(&(b),&c.p,c.slen) == NULL) \\r
+- {c.line=__LINE__; M_ASN1_next_prev = _tmp; goto err; } \\r
++ {c.line=OPENSSL_LINE; M_ASN1_next_prev = _tmp; goto err; } \\r
+ c.slen-=(c.p-c.q);\\r
+ M_ASN1_next_prev=_tmp;\r
+ \r
+@@ -258,20 +258,20 @@ err:\\r
+ c.q=c.p; \\r
+ if (d2i_ASN1_SET(&(r),&c.p,c.slen,(char *(*)())func,\\r
+ (void (*)())free_func,a,b) == NULL) \\r
+- { c.line=__LINE__; goto err; } \\r
++ { c.line=OPENSSL_LINE; goto err; } \\r
+ c.slen-=(c.p-c.q);\r
+ \r
+ # define M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,a,b) \\r
+ c.q=c.p; \\r
+ if (d2i_ASN1_SET_OF_##type(&(r),&c.p,c.slen,func,\\r
+ free_func,a,b) == NULL) \\r
+- { c.line=__LINE__; goto err; } \\r
++ { c.line=OPENSSL_LINE; goto err; } \\r
+ c.slen-=(c.p-c.q);\r
+ \r
+ # define M_ASN1_D2I_get_set_strings(r,func,a,b) \\r
+ c.q=c.p; \\r
+ if (d2i_ASN1_STRING_SET(&(r),&c.p,c.slen,a,b) == NULL) \\r
+- { c.line=__LINE__; goto err; } \\r
++ { c.line=OPENSSL_LINE; goto err; } \\r
+ c.slen-=(c.p-c.q);\r
+ \r
+ # define M_ASN1_D2I_get_EXP_opt(r,func,tag) \\r
+@@ -285,16 +285,16 @@ err:\\r
+ Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \\r
+ if (Tinf & 0x80) \\r
+ { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \\r
+- c.line=__LINE__; goto err; } \\r
++ c.line=OPENSSL_LINE; goto err; } \\r
+ if (Tinf == (V_ASN1_CONSTRUCTED+1)) \\r
+ Tlen = c.slen - (c.p - c.q) - 2; \\r
+ if (func(&(r),&c.p,Tlen) == NULL) \\r
+- { c.line=__LINE__; goto err; } \\r
++ { c.line=OPENSSL_LINE; goto err; } \\r
+ if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \\r
+ Tlen = c.slen - (c.p - c.q); \\r
+ if(!ASN1_const_check_infinite_end(&c.p, Tlen)) \\r
+ { c.error=ERR_R_MISSING_ASN1_EOS; \\r
+- c.line=__LINE__; goto err; } \\r
++ c.line=OPENSSL_LINE; goto err; } \\r
+ }\\r
+ c.slen-=(c.p-c.q); \\r
+ }\r
+@@ -310,18 +310,18 @@ err:\\r
+ Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \\r
+ if (Tinf & 0x80) \\r
+ { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \\r
+- c.line=__LINE__; goto err; } \\r
++ c.line=OPENSSL_LINE; goto err; } \\r
+ if (Tinf == (V_ASN1_CONSTRUCTED+1)) \\r
+ Tlen = c.slen - (c.p - c.q) - 2; \\r
+ if (d2i_ASN1_SET(&(r),&c.p,Tlen,(char *(*)())func, \\r
+ (void (*)())free_func, \\r
+ b,V_ASN1_UNIVERSAL) == NULL) \\r
+- { c.line=__LINE__; goto err; } \\r
++ { c.line=OPENSSL_LINE; goto err; } \\r
+ if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \\r
+ Tlen = c.slen - (c.p - c.q); \\r
+ if(!ASN1_check_infinite_end(&c.p, Tlen)) \\r
+ { c.error=ERR_R_MISSING_ASN1_EOS; \\r
+- c.line=__LINE__; goto err; } \\r
++ c.line=OPENSSL_LINE; goto err; } \\r
+ }\\r
+ c.slen-=(c.p-c.q); \\r
+ }\r
+@@ -337,17 +337,17 @@ err:\\r
+ Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \\r
+ if (Tinf & 0x80) \\r
+ { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \\r
+- c.line=__LINE__; goto err; } \\r
++ c.line=OPENSSL_LINE; goto err; } \\r
+ if (Tinf == (V_ASN1_CONSTRUCTED+1)) \\r
+ Tlen = c.slen - (c.p - c.q) - 2; \\r
+ if (d2i_ASN1_SET_OF_##type(&(r),&c.p,Tlen,func, \\r
+ free_func,b,V_ASN1_UNIVERSAL) == NULL) \\r
+- { c.line=__LINE__; goto err; } \\r
++ { c.line=OPENSSL_LINE; goto err; } \\r
+ if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \\r
+ Tlen = c.slen - (c.p - c.q); \\r
+ if(!ASN1_check_infinite_end(&c.p, Tlen)) \\r
+ { c.error=ERR_R_MISSING_ASN1_EOS; \\r
+- c.line=__LINE__; goto err; } \\r
++ c.line=OPENSSL_LINE; goto err; } \\r
+ }\\r
+ c.slen-=(c.p-c.q); \\r
+ }\r
+@@ -355,7 +355,7 @@ err:\\r
+ /* New macros */\r
+ # define M_ASN1_New_Malloc(ret,type) \\r
+ if ((ret=(type *)OPENSSL_malloc(sizeof(type))) == NULL) \\r
+- { c.line=__LINE__; goto err2; }\r
++ { c.line=OPENSSL_LINE; goto err2; }\r
+ \r
+ # define M_ASN1_New(arg,func) \\r
+ if (((arg)=func()) == NULL) return(NULL)\r
+diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c\r
+index 1d25687..e933ead 100644\r
+--- a/crypto/bn/bn_prime.c\r
++++ b/crypto/bn/bn_prime.c\r
+@@ -131,7 +131,7 @@\r
+ static int witness(BIGNUM *w, const BIGNUM *a, const BIGNUM *a1,\r
+ const BIGNUM *a1_odd, int k, BN_CTX *ctx,\r
+ BN_MONT_CTX *mont);\r
+-static int probable_prime(BIGNUM *rnd, int bits);\r
++static int probable_prime(BIGNUM *rnd, int bits, prime_t *mods);\r
+ static int probable_prime_dh(BIGNUM *rnd, int bits,\r
+ const BIGNUM *add, const BIGNUM *rem,\r
+ BN_CTX *ctx);\r
+@@ -166,9 +166,13 @@ int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe,\r
+ BIGNUM *t;\r
+ int found = 0;\r
+ int i, j, c1 = 0;\r
+- BN_CTX *ctx;\r
++ BN_CTX *ctx = NULL;\r
++ prime_t *mods = NULL;\r
+ int checks = BN_prime_checks_for_size(bits);\r
+ \r
++ mods = OPENSSL_malloc(sizeof(*mods) * NUMPRIMES);\r
++ if (mods == NULL)\r
++ goto err;\r
+ ctx = BN_CTX_new();\r
+ if (ctx == NULL)\r
+ goto err;\r
+@@ -179,7 +183,7 @@ int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe,\r
+ loop:\r
+ /* make a random number and set the top and bottom bits */\r
+ if (add == NULL) {\r
+- if (!probable_prime(ret, bits))\r
++ if (!probable_prime(ret, bits, mods))\r
+ goto err;\r
+ } else {\r
+ if (safe) {\r
+@@ -230,6 +234,7 @@ int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe,\r
+ /* we have a prime :-) */\r
+ found = 1;\r
+ err:\r
++ OPENSSL_free(mods);\r
+ if (ctx != NULL) {\r
+ BN_CTX_end(ctx);\r
+ BN_CTX_free(ctx);\r
+@@ -375,10 +380,9 @@ static int witness(BIGNUM *w, const BIGNUM *a, const BIGNUM *a1,\r
+ return 1;\r
}\r
\r
-+# else\r
-+\r
-+BIO_METHOD *BIO_s_file(void)\r
-+{\r
-+ return NULL;\r
-+}\r
+-static int probable_prime(BIGNUM *rnd, int bits)\r
++static int probable_prime(BIGNUM *rnd, int bits, prime_t *mods)\r
+ {\r
+ int i;\r
+- prime_t mods[NUMPRIMES];\r
+ BN_ULONG delta, maxdelta;\r
+ \r
+ again:\r
+diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h\r
+index 8d926d5..41cf38e 100644\r
+--- a/crypto/conf/conf.h\r
++++ b/crypto/conf/conf.h\r
+@@ -118,8 +118,10 @@ typedef void conf_finish_func (CONF_IMODULE *md);\r
+ \r
+ int CONF_set_default_method(CONF_METHOD *meth);\r
+ void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash);\r
++# ifndef OPENSSL_NO_STDIO\r
+ LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,\r
+ long *eline);\r
++# endif\r
+ # ifndef OPENSSL_NO_FP_API\r
+ LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,\r
+ long *eline);\r
+@@ -133,7 +135,9 @@ char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,\r
+ long CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group,\r
+ const char *name);\r
+ void CONF_free(LHASH_OF(CONF_VALUE) *conf);\r
++#ifndef OPENSSL_NO_FP_API\r
+ int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out);\r
++#endif\r
+ int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out);\r
+ \r
+ void OPENSSL_config(const char *config_name);\r
+@@ -160,7 +164,9 @@ CONF_METHOD *NCONF_XML(void);\r
+ void NCONF_free(CONF *conf);\r
+ void NCONF_free_data(CONF *conf);\r
+ \r
++# ifndef OPENSSL_NO_STDIO\r
+ int NCONF_load(CONF *conf, const char *file, long *eline);\r
++# endif\r
+ # ifndef OPENSSL_NO_FP_API\r
+ int NCONF_load_fp(CONF *conf, FILE *fp, long *eline);\r
+ # endif\r
+@@ -170,7 +176,9 @@ STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf,\r
+ char *NCONF_get_string(const CONF *conf, const char *group, const char *name);\r
+ int NCONF_get_number_e(const CONF *conf, const char *group, const char *name,\r
+ long *result);\r
++#ifndef OPENSSL_NO_FP_API\r
+ int NCONF_dump_fp(const CONF *conf, FILE *out);\r
++#endif\r
+ int NCONF_dump_bio(const CONF *conf, BIO *out);\r
+ \r
+ # if 0 /* The following function has no error\r
+@@ -184,8 +192,10 @@ long NCONF_get_number(CONF *conf, char *group, char *name);\r
+ \r
+ int CONF_modules_load(const CONF *cnf, const char *appname,\r
+ unsigned long flags);\r
++#ifndef OPENSSL_NO_STDIO\r
+ int CONF_modules_load_file(const char *filename, const char *appname,\r
+ unsigned long flags);\r
++#endif\r
+ void CONF_modules_unload(int all);\r
+ void CONF_modules_finish(void);\r
+ void CONF_modules_free(void);\r
+diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c\r
+index 68c77ce..3d308c7 100644\r
+--- a/crypto/conf/conf_def.c\r
++++ b/crypto/conf/conf_def.c\r
+@@ -182,6 +182,10 @@ static int def_destroy_data(CONF *conf)\r
+ \r
+ static int def_load(CONF *conf, const char *name, long *line)\r
+ {\r
++#ifdef OPENSSL_NO_STDIO\r
++ CONFerr(CONF_F_DEF_LOAD, ERR_R_SYS_LIB);\r
++ return 0;\r
++#else\r
+ int ret;\r
+ BIO *in = NULL;\r
+ \r
+@@ -202,6 +206,7 @@ static int def_load(CONF *conf, const char *name, long *line)\r
+ BIO_free(in);\r
+ \r
+ return ret;\r
++#endif\r
+ }\r
+ \r
+ static int def_load_bio(CONF *conf, BIO *in, long *line)\r
+diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c\r
+index 5281384..952b545 100644\r
+--- a/crypto/conf/conf_lib.c\r
++++ b/crypto/conf/conf_lib.c\r
+@@ -90,6 +90,7 @@ int CONF_set_default_method(CONF_METHOD *meth)\r
+ return 1;\r
+ }\r
+ \r
++#ifndef OPENSSL_NO_STDIO\r
+ LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,\r
+ long *eline)\r
+ {\r
+@@ -111,6 +112,7 @@ LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,\r
+ \r
+ return ltmp;\r
+ }\r
++#endif\r
+ \r
+ #ifndef OPENSSL_NO_FP_API\r
+ LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,\r
+@@ -255,6 +257,7 @@ void NCONF_free_data(CONF *conf)\r
+ conf->meth->destroy_data(conf);\r
+ }\r
+ \r
++#ifndef OPENSSL_NO_STDIO\r
+ int NCONF_load(CONF *conf, const char *file, long *eline)\r
+ {\r
+ if (conf == NULL) {\r
+@@ -264,6 +267,7 @@ int NCONF_load(CONF *conf, const char *file, long *eline)\r
+ \r
+ return conf->meth->load(conf, file, eline);\r
+ }\r
++#endif\r
+ \r
+ #ifndef OPENSSL_NO_FP_API\r
+ int NCONF_load_fp(CONF *conf, FILE *fp, long *eline)\r
+diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c\r
+index 9acfca4..5e0a482 100644\r
+--- a/crypto/conf/conf_mod.c\r
++++ b/crypto/conf/conf_mod.c\r
+@@ -159,6 +159,7 @@ int CONF_modules_load(const CONF *cnf, const char *appname,\r
+ \r
+ }\r
+ \r
++#ifndef OPENSSL_NO_STDIO\r
+ int CONF_modules_load_file(const char *filename, const char *appname,\r
+ unsigned long flags)\r
+ {\r
+@@ -194,6 +195,7 @@ int CONF_modules_load_file(const char *filename, const char *appname,\r
+ \r
+ return ret;\r
+ }\r
++#endif\r
+ \r
+ static int module_run(const CONF *cnf, char *name, char *value,\r
+ unsigned long flags)\r
+diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c\r
+index c042cf2..a25b636 100644\r
+--- a/crypto/conf/conf_sap.c\r
++++ b/crypto/conf/conf_sap.c\r
+@@ -87,9 +87,11 @@ void OPENSSL_config(const char *config_name)\r
+ ENGINE_load_builtin_engines();\r
+ #endif\r
+ ERR_clear_error();\r
++#ifndef OPENSSL_NO_STDIO\r
+ CONF_modules_load_file(NULL, config_name,\r
+ CONF_MFLAGS_DEFAULT_SECTION |\r
+ CONF_MFLAGS_IGNORE_MISSING_FILE);\r
++#endif\r
+ openssl_configured = 1;\r
+ }\r
+ \r
+diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c\r
+index c9f674b..39ead7f 100644\r
+--- a/crypto/cryptlib.c\r
++++ b/crypto/cryptlib.c\r
+@@ -263,7 +263,7 @@ int CRYPTO_get_new_dynlockid(void)\r
+ return (0);\r
+ }\r
+ pointer->references = 1;\r
+- pointer->data = dynlock_create_callback(__FILE__, __LINE__);\r
++ pointer->data = dynlock_create_callback(OPENSSL_FILE, OPENSSL_LINE);\r
+ if (pointer->data == NULL) {\r
+ OPENSSL_free(pointer);\r
+ CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID, ERR_R_MALLOC_FAILURE);\r
+@@ -289,7 +289,7 @@ int CRYPTO_get_new_dynlockid(void)\r
+ CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);\r
+ \r
+ if (i == -1) {\r
+- dynlock_destroy_callback(pointer->data, __FILE__, __LINE__);\r
++ dynlock_destroy_callback(pointer->data, OPENSSL_FILE, OPENSSL_LINE);\r
+ OPENSSL_free(pointer);\r
+ } else\r
+ i += 1; /* to avoid 0 */\r
+@@ -328,7 +328,7 @@ void CRYPTO_destroy_dynlockid(int i)\r
+ CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);\r
+ \r
+ if (pointer) {\r
+- dynlock_destroy_callback(pointer->data, __FILE__, __LINE__);\r
++ dynlock_destroy_callback(pointer->data, OPENSSL_FILE, OPENSSL_LINE);\r
+ OPENSSL_free(pointer);\r
+ }\r
+ }\r
+@@ -670,6 +670,7 @@ unsigned long *OPENSSL_ia32cap_loc(void)\r
+ }\r
+ \r
+ # if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)\r
++#include <stdio.h>\r
+ # define OPENSSL_CPUID_SETUP\r
+ # if defined(_WIN32)\r
+ typedef unsigned __int64 IA32CAP;\r
+@@ -980,11 +981,13 @@ void OPENSSL_showfatal(const char *fmta, ...)\r
+ #else\r
+ void OPENSSL_showfatal(const char *fmta, ...)\r
+ {\r
++#ifndef OPENSSL_NO_STDIO\r
+ va_list ap;\r
+ \r
+ va_start(ap, fmta);\r
+ vfprintf(stderr, fmta, ap);\r
+ va_end(ap);\r
++#endif\r
+ }\r
+ \r
+ int OPENSSL_isservice(void)\r
+@@ -1011,10 +1014,12 @@ void OpenSSLDie(const char *file, int line, const char *assertion)\r
+ #endif\r
+ }\r
+ \r
++#ifndef OPENSSL_NO_STDIO\r
+ void *OPENSSL_stderr(void)\r
+ {\r
+ return stderr;\r
+ }\r
++#endif\r
+ \r
+ int CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len)\r
+ {\r
+diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h\r
+index fba180a..3e3ea5e 100644\r
+--- a/crypto/cryptlib.h\r
++++ b/crypto/cryptlib.h\r
+@@ -101,7 +101,9 @@ extern "C" {\r
+ void OPENSSL_cpuid_setup(void);\r
+ extern unsigned int OPENSSL_ia32cap_P[];\r
+ void OPENSSL_showfatal(const char *fmta, ...);\r
++#ifndef OPENSSL_NO_STDIO\r
+ void *OPENSSL_stderr(void);\r
++#endif\r
+ extern int OPENSSL_NONPIC_relocated;\r
+ \r
+ #ifdef __cplusplus\r
+diff --git a/crypto/crypto.h b/crypto/crypto.h\r
+index c450d7a..063d78e 100644\r
+--- a/crypto/crypto.h\r
++++ b/crypto/crypto.h\r
+@@ -235,15 +235,15 @@ typedef struct openssl_item_st {\r
+ # ifndef OPENSSL_NO_LOCKING\r
+ # ifndef CRYPTO_w_lock\r
+ # define CRYPTO_w_lock(type) \\r
+- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)\r
++ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,OPENSSL_FILE,OPENSSL_LINE)\r
+ # define CRYPTO_w_unlock(type) \\r
+- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)\r
++ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,OPENSSL_FILE,OPENSSL_LINE)\r
+ # define CRYPTO_r_lock(type) \\r
+- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)\r
++ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,OPENSSL_FILE,OPENSSL_LINE)\r
+ # define CRYPTO_r_unlock(type) \\r
+- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)\r
++ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,OPENSSL_FILE,OPENSSL_LINE)\r
+ # define CRYPTO_add(addr,amount,type) \\r
+- CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)\r
++ CRYPTO_add_lock(addr,amount,type,OPENSSL_FILE,OPENSSL_LINE)\r
+ # endif\r
+ # else\r
+ # define CRYPTO_w_lock(a)\r
+@@ -378,19 +378,19 @@ int CRYPTO_is_mem_check_on(void);\r
+ # define MemCheck_off() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)\r
+ # define is_MemCheck_on() CRYPTO_is_mem_check_on()\r
+ \r
+-# define OPENSSL_malloc(num) CRYPTO_malloc((int)num,__FILE__,__LINE__)\r
+-# define OPENSSL_strdup(str) CRYPTO_strdup((str),__FILE__,__LINE__)\r
++# define OPENSSL_malloc(num) CRYPTO_malloc((int)num,OPENSSL_FILE,OPENSSL_LINE)\r
++# define OPENSSL_strdup(str) CRYPTO_strdup((str),OPENSSL_FILE,OPENSSL_LINE)\r
+ # define OPENSSL_realloc(addr,num) \\r
+- CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__)\r
++ CRYPTO_realloc((char *)addr,(int)num,OPENSSL_FILE,OPENSSL_LINE)\r
+ # define OPENSSL_realloc_clean(addr,old_num,num) \\r
+- CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__)\r
++ CRYPTO_realloc_clean(addr,old_num,num,OPENSSL_FILE,OPENSSL_LINE)\r
+ # define OPENSSL_remalloc(addr,num) \\r
+- CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__)\r
++ CRYPTO_remalloc((char **)addr,(int)num,OPENSSL_FILE,OPENSSL_LINE)\r
+ # define OPENSSL_freeFunc CRYPTO_free\r
+ # define OPENSSL_free(addr) CRYPTO_free(addr)\r
+ \r
+ # define OPENSSL_malloc_locked(num) \\r
+- CRYPTO_malloc_locked((int)num,__FILE__,__LINE__)\r
++ CRYPTO_malloc_locked((int)num,OPENSSL_FILE,OPENSSL_LINE)\r
+ # define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr)\r
+ \r
+ const char *SSLeay_version(int type);\r
+@@ -545,7 +545,7 @@ void CRYPTO_set_mem_debug_options(long bits);\r
+ long CRYPTO_get_mem_debug_options(void);\r
+ \r
+ # define CRYPTO_push_info(info) \\r
+- CRYPTO_push_info_(info, __FILE__, __LINE__);\r
++ CRYPTO_push_info_(info, OPENSSL_FILE, OPENSSL_LINE);\r
+ int CRYPTO_push_info_(const char *info, const char *file, int line);\r
+ int CRYPTO_pop_info(void);\r
+ int CRYPTO_remove_all_info(void);\r
+@@ -588,7 +588,7 @@ void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);\r
+ \r
+ /* die if we have to */\r
+ void OpenSSLDie(const char *file, int line, const char *assertion);\r
+-# define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))\r
++# define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(OPENSSL_FILE, OPENSSL_LINE, #e),1))\r
+ \r
+ unsigned long *OPENSSL_ia32cap_loc(void);\r
+ # define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))\r
+@@ -605,14 +605,14 @@ void OPENSSL_init(void);\r
+ # define fips_md_init_ctx(alg, cx) \\r
+ int alg##_Init(cx##_CTX *c) \\r
+ { \\r
+- if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \\r
++ if (FIPS_mode()) OpenSSLDie(OPENSSL_FILE, OPENSSL_LINE, \\r
+ "Low level API call to digest " #alg " forbidden in FIPS mode!"); \\r
+ return private_##alg##_Init(c); \\r
+ } \\r
+ int private_##alg##_Init(cx##_CTX *c)\r
+ \r
+ # define fips_cipher_abort(alg) \\r
+- if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \\r
++ if (FIPS_mode()) OpenSSLDie(OPENSSL_FILE, OPENSSL_LINE, \\r
+ "Low level API call to cipher " #alg " forbidden in FIPS mode!")\r
+ \r
+ # else\r
+diff --git a/crypto/des/read2pwd.c b/crypto/des/read2pwd.c\r
+index 01e275f..7633139 100644\r
+--- a/crypto/des/read2pwd.c\r
++++ b/crypto/des/read2pwd.c\r
+@@ -114,6 +114,10 @@\r
+ #include <openssl/ui.h>\r
+ #include <openssl/crypto.h>\r
+ \r
++#ifndef BUFSIZ\r
++#define BUFSIZ 256\r
++#endif\r
+\r
-+BIO *BIO_new_file(const char *filename, const char *mode)\r
-+{\r
-+ return NULL;\r
-+}\r
+ int DES_read_password(DES_cblock *key, const char *prompt, int verify)\r
+ {\r
+ int ok;\r
+diff --git a/crypto/dh/Makefile b/crypto/dh/Makefile\r
+index 46fa5ac..cc366ec 100644\r
+--- a/crypto/dh/Makefile\r
++++ b/crypto/dh/Makefile\r
+@@ -134,7 +134,7 @@ dh_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h\r
+ dh_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h\r
+ dh_gen.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h\r
+ dh_gen.o: ../cryptlib.h dh_gen.c\r
+-dh_kdf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h\r
++dh_kdf.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h\r
+ dh_kdf.o: ../../include/openssl/buffer.h ../../include/openssl/cms.h\r
+ dh_kdf.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h\r
+ dh_kdf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h\r
+diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h\r
+index 5498a9d..4a5c665 100644\r
+--- a/crypto/dh/dh.h\r
++++ b/crypto/dh/dh.h\r
+@@ -240,11 +240,13 @@ DH *DH_get_1024_160(void);\r
+ DH *DH_get_2048_224(void);\r
+ DH *DH_get_2048_256(void);\r
+ \r
++# ifndef OPENSSL_NO_CMS\r
+ /* RFC2631 KDF */\r
+ int DH_KDF_X9_42(unsigned char *out, size_t outlen,\r
+ const unsigned char *Z, size_t Zlen,\r
+ ASN1_OBJECT *key_oid,\r
+ const unsigned char *ukm, size_t ukmlen, const EVP_MD *md);\r
++# endif\r
+ \r
+ # define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \\r
+ EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \\r
+@@ -337,7 +339,9 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,\r
+ \r
+ /* KDF types */\r
+ # define EVP_PKEY_DH_KDF_NONE 1\r
++# ifndef OPENSSL_NO_CMS\r
+ # define EVP_PKEY_DH_KDF_X9_42 2\r
++# endif\r
+ \r
+ /* BEGIN ERROR CODES */\r
+ /*\r
+diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c\r
+index a882cb2..4eddb9a 100644\r
+--- a/crypto/dh/dh_kdf.c\r
++++ b/crypto/dh/dh_kdf.c\r
+@@ -51,13 +51,18 @@\r
+ * ====================================================================\r
+ */\r
+ \r
++#include <e_os.h>\r
+\r
-+BIO *BIO_new_fp(FILE *stream, int close_flag)\r
-+{\r
-+ return NULL;\r
-+}\r
++#ifndef OPENSSL_NO_CMS\r
+ #include <string.h>\r
+ #include <openssl/dh.h>\r
+ #include <openssl/evp.h>\r
+ #include <openssl/asn1.h>\r
+ #include <openssl/cms.h>\r
+ \r
+\r
- # endif /* OPENSSL_NO_STDIO */\r
+ /* Key derivation from X9.42/RFC2631 */\r
++/* Uses CMS functions, hence the #ifdef wrapper. */\r
\r
- #endif /* HEADER_BSS_FILE_C */\r
-diff U3 crypto/dh/dh_pmeth.c crypto/dh/dh_pmeth.c\r
---- crypto/dh/dh_pmeth.c Thu Jan 28 21:56:08 2016\r
-+++ crypto/dh/dh_pmeth.c Wed Feb 17 16:15:58 2016\r
-@@ -449,6 +449,9 @@\r
- *keylen = ret;\r
- return 1;\r
- } else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) {\r
+ #define DH_KDF_MAX (1L << 30)\r
+ \r
+@@ -185,3 +190,4 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,\r
+ EVP_MD_CTX_cleanup(&mctx);\r
+ return rv;\r
+ }\r
++#endif\r
+diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c\r
+index b58e3fa..c6288f6 100644\r
+--- a/crypto/dh/dh_pmeth.c\r
++++ b/crypto/dh/dh_pmeth.c\r
+@@ -207,7 +207,11 @@ static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)\r
+ case EVP_PKEY_CTRL_DH_KDF_TYPE:\r
+ if (p1 == -2)\r
+ return dctx->kdf_type;\r
+#ifdef OPENSSL_NO_CMS\r
-+ return 0;\r
++ if (p1 != EVP_PKEY_DH_KDF_NONE)\r
+#else\r
+ if (p1 != EVP_PKEY_DH_KDF_NONE && p1 != EVP_PKEY_DH_KDF_X9_42)\r
++#endif\r
+ return -2;\r
+ dctx->kdf_type = p1;\r
+ return 1;\r
+@@ -448,7 +452,10 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,\r
+ return ret;\r
+ *keylen = ret;\r
+ return 1;\r
+- } else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) {\r
++ }\r
++#ifndef OPENSSL_NO_CMS\r
++ else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) {\r
++\r
unsigned char *Z = NULL;\r
size_t Zlen = 0;\r
if (!dctx->kdf_outlen || !dctx->kdf_oid)\r
-@@ -478,6 +481,7 @@\r
- OPENSSL_free(Z);\r
+@@ -479,7 +486,8 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key,\r
}\r
return ret;\r
-+#endif\r
}\r
- return 1;\r
+- return 1;\r
++#endif\r
++ return 0;\r
}\r
-diff U3 crypto/pem/pem.h crypto/pem/pem.h\r
---- crypto/pem/pem.h Thu Jan 28 21:56:08 2016\r
-+++ crypto/pem/pem.h Wed Feb 17 15:56:26 2016\r
-@@ -324,6 +324,7 @@\r
+ \r
+ const EVP_PKEY_METHOD dh_pkey_meth = {\r
+diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c\r
+index 83e208c..4869098 100644\r
+--- a/crypto/ec/ec_ameth.c\r
++++ b/crypto/ec/ec_ameth.c\r
+@@ -67,8 +67,10 @@\r
+ #include <openssl/asn1t.h>\r
+ #include "asn1_locl.h"\r
+ \r
++#ifndef OPENSSL_NO_CMS\r
+ static int ecdh_cms_decrypt(CMS_RecipientInfo *ri);\r
+ static int ecdh_cms_encrypt(CMS_RecipientInfo *ri);\r
++#endif\r
+ \r
+ static int eckey_param2type(int *pptype, void **ppval, EC_KEY *ec_key)\r
+ {\r
+diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_int.h\r
+index 46f163b..b4a72a0 100644\r
+--- a/crypto/engine/eng_int.h\r
++++ b/crypto/engine/eng_int.h\r
+@@ -88,7 +88,7 @@ extern "C" {\r
+ (unsigned int)(e), (isfunct ? "funct" : "struct"), \\r
+ ((isfunct) ? ((e)->funct_ref - (diff)) : ((e)->struct_ref - (diff))), \\r
+ ((isfunct) ? (e)->funct_ref : (e)->struct_ref), \\r
+- (__FILE__), (__LINE__));\r
++ (OPENSSL_FILE), (OPENSSL_LINE));\r
+ \r
+ # else\r
+ \r
+@@ -136,7 +136,7 @@ ENGINE *engine_table_select(ENGINE_TABLE **table, int nid);\r
+ # else\r
+ ENGINE *engine_table_select_tmp(ENGINE_TABLE **table, int nid, const char *f,\r
+ int l);\r
+-# define engine_table_select(t,n) engine_table_select_tmp(t,n,__FILE__,__LINE__)\r
++# define engine_table_select(t,n) engine_table_select_tmp(t,n,OPENSSL_FILE,OPENSSL_LINE)\r
+ # endif\r
+ typedef void (engine_table_doall_cb) (int nid, STACK_OF(ENGINE) *sk,\r
+ ENGINE *def, void *arg);\r
+diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c\r
+index 34b0029..cf622bb 100644\r
+--- a/crypto/engine/eng_openssl.c\r
++++ b/crypto/engine/eng_openssl.c\r
+@@ -86,7 +86,9 @@\r
+ * this is no longer automatic in ENGINE_load_builtin_engines().\r
+ */\r
+ #define TEST_ENG_OPENSSL_RC4\r
++#ifndef OPENSSL_NO_FP_API\r
+ #define TEST_ENG_OPENSSL_PKEY\r
++#endif\r
+ /* #define TEST_ENG_OPENSSL_RC4_OTHERS */\r
+ #define TEST_ENG_OPENSSL_RC4_P_INIT\r
+ /* #define TEST_ENG_OPENSSL_RC4_P_CIPHER */\r
+diff --git a/crypto/err/err.h b/crypto/err/err.h\r
+index 585aa8b..04c6cfc 100644\r
+--- a/crypto/err/err.h\r
++++ b/crypto/err/err.h\r
+@@ -200,39 +200,39 @@ typedef struct err_state_st {\r
+ \r
+ # define ERR_LIB_USER 128\r
+ \r
+-# define SYSerr(f,r) ERR_PUT_error(ERR_LIB_SYS,(f),(r),__FILE__,__LINE__)\r
+-# define BNerr(f,r) ERR_PUT_error(ERR_LIB_BN,(f),(r),__FILE__,__LINE__)\r
+-# define RSAerr(f,r) ERR_PUT_error(ERR_LIB_RSA,(f),(r),__FILE__,__LINE__)\r
+-# define DHerr(f,r) ERR_PUT_error(ERR_LIB_DH,(f),(r),__FILE__,__LINE__)\r
+-# define EVPerr(f,r) ERR_PUT_error(ERR_LIB_EVP,(f),(r),__FILE__,__LINE__)\r
+-# define BUFerr(f,r) ERR_PUT_error(ERR_LIB_BUF,(f),(r),__FILE__,__LINE__)\r
+-# define OBJerr(f,r) ERR_PUT_error(ERR_LIB_OBJ,(f),(r),__FILE__,__LINE__)\r
+-# define PEMerr(f,r) ERR_PUT_error(ERR_LIB_PEM,(f),(r),__FILE__,__LINE__)\r
+-# define DSAerr(f,r) ERR_PUT_error(ERR_LIB_DSA,(f),(r),__FILE__,__LINE__)\r
+-# define X509err(f,r) ERR_PUT_error(ERR_LIB_X509,(f),(r),__FILE__,__LINE__)\r
+-# define ASN1err(f,r) ERR_PUT_error(ERR_LIB_ASN1,(f),(r),__FILE__,__LINE__)\r
+-# define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),__FILE__,__LINE__)\r
+-# define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),__FILE__,__LINE__)\r
+-# define ECerr(f,r) ERR_PUT_error(ERR_LIB_EC,(f),(r),__FILE__,__LINE__)\r
+-# define SSLerr(f,r) ERR_PUT_error(ERR_LIB_SSL,(f),(r),__FILE__,__LINE__)\r
+-# define BIOerr(f,r) ERR_PUT_error(ERR_LIB_BIO,(f),(r),__FILE__,__LINE__)\r
+-# define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),__FILE__,__LINE__)\r
+-# define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),__FILE__,__LINE__)\r
+-# define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),__FILE__,__LINE__)\r
+-# define RANDerr(f,r) ERR_PUT_error(ERR_LIB_RAND,(f),(r),__FILE__,__LINE__)\r
+-# define DSOerr(f,r) ERR_PUT_error(ERR_LIB_DSO,(f),(r),__FILE__,__LINE__)\r
+-# define ENGINEerr(f,r) ERR_PUT_error(ERR_LIB_ENGINE,(f),(r),__FILE__,__LINE__)\r
+-# define OCSPerr(f,r) ERR_PUT_error(ERR_LIB_OCSP,(f),(r),__FILE__,__LINE__)\r
+-# define UIerr(f,r) ERR_PUT_error(ERR_LIB_UI,(f),(r),__FILE__,__LINE__)\r
+-# define COMPerr(f,r) ERR_PUT_error(ERR_LIB_COMP,(f),(r),__FILE__,__LINE__)\r
+-# define ECDSAerr(f,r) ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),__FILE__,__LINE__)\r
+-# define ECDHerr(f,r) ERR_PUT_error(ERR_LIB_ECDH,(f),(r),__FILE__,__LINE__)\r
+-# define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__)\r
+-# define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),__FILE__,__LINE__)\r
+-# define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__)\r
+-# define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),__FILE__,__LINE__)\r
+-# define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)\r
+-# define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__)\r
++# define SYSerr(f,r) ERR_PUT_error(ERR_LIB_SYS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define BNerr(f,r) ERR_PUT_error(ERR_LIB_BN,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define RSAerr(f,r) ERR_PUT_error(ERR_LIB_RSA,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define DHerr(f,r) ERR_PUT_error(ERR_LIB_DH,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define EVPerr(f,r) ERR_PUT_error(ERR_LIB_EVP,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define BUFerr(f,r) ERR_PUT_error(ERR_LIB_BUF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define OBJerr(f,r) ERR_PUT_error(ERR_LIB_OBJ,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define PEMerr(f,r) ERR_PUT_error(ERR_LIB_PEM,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define DSAerr(f,r) ERR_PUT_error(ERR_LIB_DSA,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define X509err(f,r) ERR_PUT_error(ERR_LIB_X509,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define ASN1err(f,r) ERR_PUT_error(ERR_LIB_ASN1,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define ECerr(f,r) ERR_PUT_error(ERR_LIB_EC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define SSLerr(f,r) ERR_PUT_error(ERR_LIB_SSL,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define BIOerr(f,r) ERR_PUT_error(ERR_LIB_BIO,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define RANDerr(f,r) ERR_PUT_error(ERR_LIB_RAND,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define DSOerr(f,r) ERR_PUT_error(ERR_LIB_DSO,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define ENGINEerr(f,r) ERR_PUT_error(ERR_LIB_ENGINE,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define OCSPerr(f,r) ERR_PUT_error(ERR_LIB_OCSP,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define UIerr(f,r) ERR_PUT_error(ERR_LIB_UI,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define COMPerr(f,r) ERR_PUT_error(ERR_LIB_COMP,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define ECDSAerr(f,r) ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define ECDHerr(f,r) ERR_PUT_error(ERR_LIB_ECDH,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
++# define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
+ \r
+ /*\r
+ * Borland C seems too stupid to be able to shift and do longs in the\r
+diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in\r
+index 7a1c85d..a5f51a7 100644\r
+--- a/crypto/opensslconf.h.in\r
++++ b/crypto/opensslconf.h.in\r
+@@ -1,5 +1,15 @@\r
+ /* crypto/opensslconf.h.in */\r
+ \r
++#ifndef OPENSSL_FILE\r
++#ifdef OPENSSL_NO_FILENAMES\r
++#define OPENSSL_FILE ""\r
++#define OPENSSL_LINE 0\r
++#else\r
++#define OPENSSL_FILE __FILE__\r
++#define OPENSSL_LINE __LINE__\r
++#endif\r
++#endif\r
++\r
+ /* Generate 80386 code? */\r
+ #undef I386_ONLY\r
+ \r
+diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h\r
+index d3b23fc..87b0b6a 100644\r
+--- a/crypto/pem/pem.h\r
++++ b/crypto/pem/pem.h\r
+@@ -324,6 +324,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \\r
\r
# define DECLARE_PEM_read_fp(name, type) /**/\r
# define DECLARE_PEM_write_fp(name, type) /**/\r
# define DECLARE_PEM_write_cb_fp(name, type) /**/\r
# else\r
\r
-diff U3 crypto/pkcs7/pk7_smime.c crypto/pkcs7/pk7_smime.c\r
---- crypto/pkcs7/pk7_smime.c Thu Jan 28 21:56:08 2016\r
-+++ crypto/pkcs7/pk7_smime.c Wed Feb 17 16:22:45 2016\r
-@@ -254,7 +254,8 @@\r
+@@ -417,6 +418,7 @@ int PEM_X509_INFO_write_bio(BIO *bp, X509_INFO *xi, EVP_CIPHER *enc,\r
+ pem_password_cb *cd, void *u);\r
+ # endif\r
+ \r
++#ifndef OPENSSL_NO_FP_API\r
+ int PEM_read(FILE *fp, char **name, char **header,\r
+ unsigned char **data, long *len);\r
+ int PEM_write(FILE *fp, const char *name, const char *hdr,\r
+@@ -428,6 +430,7 @@ int PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp,\r
+ int klen, pem_password_cb *callback, void *u);\r
+ STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,\r
+ pem_password_cb *cb, void *u);\r
++#endif\r
+ \r
+ int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type,\r
+ EVP_MD *md_type, unsigned char **ek, int *ekl,\r
+@@ -494,6 +497,7 @@ int i2d_PKCS8PrivateKey_nid_bio(BIO *bp, EVP_PKEY *x, int nid,\r
+ EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,\r
+ void *u);\r
+ \r
++#ifndef OPENSSL_NO_FP_API\r
+ int i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,\r
+ char *kstr, int klen,\r
+ pem_password_cb *cb, void *u);\r
+@@ -510,7 +514,7 @@ EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,\r
+ int PEM_write_PKCS8PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,\r
+ char *kstr, int klen, pem_password_cb *cd,\r
+ void *u);\r
+-\r
++#endif\r
+ EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x);\r
+ int PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x);\r
+ \r
+diff --git a/crypto/pem/pem_pk8.c b/crypto/pem/pem_pk8.c\r
+index 5747c73..fe465cc 100644\r
+--- a/crypto/pem/pem_pk8.c\r
++++ b/crypto/pem/pem_pk8.c\r
+@@ -69,10 +69,12 @@\r
+ static int do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder,\r
+ int nid, const EVP_CIPHER *enc,\r
+ char *kstr, int klen, pem_password_cb *cb, void *u);\r
++\r
++#ifndef OPENSSL_NO_FP_API\r
+ static int do_pk8pkey_fp(FILE *bp, EVP_PKEY *x, int isder,\r
+ int nid, const EVP_CIPHER *enc,\r
+ char *kstr, int klen, pem_password_cb *cb, void *u);\r
+-\r
++#endif\r
+ /*\r
+ * These functions write a private key in PKCS#8 format: it is a "drop in"\r
+ * replacement for PEM_write_bio_PrivateKey() and friends. As usual if 'enc'\r
+diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c\r
+index c4d3724..0bc3d43 100644\r
+--- a/crypto/pkcs7/pk7_smime.c\r
++++ b/crypto/pkcs7/pk7_smime.c\r
+@@ -64,6 +64,9 @@\r
+ #include <openssl/x509.h>\r
+ #include <openssl/x509v3.h>\r
+ \r
++\r
++#define BUFFERSIZE 4096\r
++\r
+ static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si);\r
+ \r
+ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,\r
+@@ -254,7 +257,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,\r
STACK_OF(PKCS7_SIGNER_INFO) *sinfos;\r
PKCS7_SIGNER_INFO *si;\r
X509_STORE_CTX cert_ctx;\r
- char buf[4096];\r
+ char *buf = NULL;\r
-+ int bufsiz;\r
int i, j = 0, k, ret = 0;\r
BIO *p7bio = NULL;\r
BIO *tmpin = NULL, *tmpout = NULL;\r
-@@ -275,12 +276,6 @@\r
+@@ -274,12 +277,29 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,\r
+ PKCS7err(PKCS7_F_PKCS7_VERIFY, PKCS7_R_NO_CONTENT);\r
return 0;\r
}\r
++#if 0\r
++ /*\r
++ * NB: this test commented out because some versions of Netscape\r
++ * illegally include zero length content when signing data. Also\r
++ * Microsoft Authenticode includes a SpcIndirectDataContent data\r
++ * structure which describes the content to be protected by the\r
++ * signature, rather than directly embedding that content. So\r
++ * Authenticode implementations are also expected to use\r
++ * PKCS7_verify() with explicit external data, on non-detached\r
++ * PKCS#7 signatures.\r
++ *\r
++ * In OpenSSL 1.1 a new flag PKCS7_NO_DUAL_CONTENT has been\r
++ * introduced to disable this sanity check. For the 1.0.2 branch\r
++ * this change is not acceptable, so the check remains completely\r
++ * commented out (as it has been for a long time).\r
++ */\r
+ \r
+ /* Check for data and content: two sets of data */\r
+ if (!PKCS7_get_detached(p7) && indata) {\r
+ PKCS7err(PKCS7_F_PKCS7_VERIFY, PKCS7_R_CONTENT_AND_DATA_PRESENT);\r
+ return 0;\r
+ }\r
++#endif\r
\r
-- /* Check for data and content: two sets of data */\r
-- if (!PKCS7_get_detached(p7) && indata) {\r
-- PKCS7err(PKCS7_F_PKCS7_VERIFY, PKCS7_R_CONTENT_AND_DATA_PRESENT);\r
-- return 0;\r
-- }\r
--\r
sinfos = PKCS7_get_signer_info(p7);\r
\r
- if (!sinfos || !sk_PKCS7_SIGNER_INFO_num(sinfos)) {\r
-@@ -355,9 +350,14 @@\r
- } else\r
+@@ -356,8 +376,12 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,\r
tmpout = out;\r
\r
-+ bufsiz = 4096;\r
-+ buf = OPENSSL_malloc(bufsiz);\r
-+ if (buf == NULL) {\r
+ /* We now have to 'read' from p7bio to calculate digests etc. */\r
++ if ((buf = OPENSSL_malloc(BUFFERSIZE)) == NULL) {\r
++ PKCS7err(PKCS7_F_PKCS7_VERIFY, ERR_R_MALLOC_FAILURE);\r
+ goto err;\r
+ }\r
- /* We now have to 'read' from p7bio to calculate digests etc. */\r
for (;;) {\r
- i = BIO_read(p7bio, buf, sizeof(buf));\r
-+ i = BIO_read(p7bio, buf, bufsiz);\r
++ i = BIO_read(p7bio, buf, BUFFERSIZE);\r
if (i <= 0)\r
break;\r
if (tmpout)\r
-@@ -394,6 +394,9 @@\r
- }\r
- BIO_free_all(p7bio);\r
- sk_X509_free(signers);\r
-+ if (buf != NULL) {\r
-+ OPENSSL_free(buf);\r
+@@ -388,6 +412,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,\r
+ ret = 1;\r
+ \r
+ err:\r
++ OPENSSL_free(buf);\r
+ if (tmpin == indata) {\r
+ if (indata)\r
+ BIO_pop(p7bio);\r
+@@ -506,7 +531,7 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags)\r
+ {\r
+ BIO *tmpmem;\r
+ int ret, i;\r
+- char buf[4096];\r
++ char *buf = NULL;\r
+ \r
+ if (!p7) {\r
+ PKCS7err(PKCS7_F_PKCS7_DECRYPT, PKCS7_R_INVALID_NULL_POINTER);\r
+@@ -550,24 +575,29 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags)\r
+ }\r
+ BIO_free_all(bread);\r
+ return ret;\r
+- } else {\r
+- for (;;) {\r
+- i = BIO_read(tmpmem, buf, sizeof(buf));\r
+- if (i <= 0) {\r
+- ret = 1;\r
+- if (BIO_method_type(tmpmem) == BIO_TYPE_CIPHER) {\r
+- if (!BIO_get_cipher_status(tmpmem))\r
+- ret = 0;\r
+- }\r
+-\r
+- break;\r
+- }\r
+- if (BIO_write(data, buf, i) != i) {\r
+- ret = 0;\r
+- break;\r
+ }\r
- return ret;\r
++ if ((buf = OPENSSL_malloc(BUFFERSIZE)) == NULL) {\r
++ PKCS7err(PKCS7_F_PKCS7_DECRYPT, ERR_R_MALLOC_FAILURE);\r
++ goto err;\r
++ }\r
++ for (;;) {\r
++ i = BIO_read(tmpmem, buf, BUFFERSIZE);\r
++ if (i <= 0) {\r
++ ret = 1;\r
++ if (BIO_method_type(tmpmem) == BIO_TYPE_CIPHER) {\r
++ if (!BIO_get_cipher_status(tmpmem))\r
++ ret = 0;\r
+ }\r
++\r
++ break;\r
++ }\r
++ if (BIO_write(data, buf, i) != i) {\r
++ ret = 0;\r
++ break;\r
+ }\r
+- BIO_free_all(tmpmem);\r
+- return ret;\r
+ }\r
++err:\r
++ OPENSSL_free(buf);\r
++ BIO_free_all(tmpmem);\r
++ return ret;\r
}\r
- \r
-diff U3 crypto/rand/rand_unix.c crypto/rand/rand_unix.c\r
---- crypto/rand/rand_unix.c Thu Jan 28 21:38:32 2016\r
-+++ crypto/rand/rand_unix.c Wed Feb 17 15:40:02 2016\r
+diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c\r
+index 266111e..f60fac6 100644\r
+--- a/crypto/rand/rand_unix.c\r
++++ b/crypto/rand/rand_unix.c\r
@@ -116,7 +116,7 @@\r
#include <openssl/rand.h>\r
#include "rand_lcl.h"\r
\r
# include <sys/types.h>\r
# include <sys/time.h>\r
-@@ -439,7 +439,7 @@\r
+@@ -439,7 +439,7 @@ int RAND_poll(void)\r
* defined(OPENSSL_SYS_VXWORKS) ||\r
* defined(OPENSSL_SYS_NETWARE)) */\r
\r
int RAND_poll(void)\r
{\r
return 0;\r
-diff U3 crypto/rsa/rsa_ameth.c crypto/rsa/rsa_ameth.c\r
---- crypto/rsa/rsa_ameth.c Thu Jan 28 21:56:08 2016\r
-+++ crypto/rsa/rsa_ameth.c Wed Feb 17 15:09:46 2016\r
+diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c\r
+index 4e06218..ddead3d 100644\r
+--- a/crypto/rsa/rsa_ameth.c\r
++++ b/crypto/rsa/rsa_ameth.c\r
@@ -68,10 +68,12 @@\r
#endif\r
#include "asn1_locl.h"\r
\r
static int rsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)\r
{\r
-@@ -665,6 +667,7 @@\r
+@@ -665,6 +667,7 @@ static int rsa_pss_to_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pkctx,\r
return rv;\r
}\r
\r
static int rsa_cms_verify(CMS_SignerInfo *si)\r
{\r
int nid, nid2;\r
-@@ -683,6 +686,7 @@\r
+@@ -683,6 +686,7 @@ static int rsa_cms_verify(CMS_SignerInfo *si)\r
}\r
return 0;\r
}\r
\r
/*\r
* Customised RSA item verification routine. This is called when a signature\r
-@@ -705,6 +709,7 @@\r
+@@ -705,6 +709,7 @@ static int rsa_item_verify(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,\r
return -1;\r
}\r
\r
static int rsa_cms_sign(CMS_SignerInfo *si)\r
{\r
int pad_mode = RSA_PKCS1_PADDING;\r
-@@ -729,6 +734,7 @@\r
+@@ -729,6 +734,7 @@ static int rsa_cms_sign(CMS_SignerInfo *si)\r
X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsassaPss), V_ASN1_SEQUENCE, os);\r
return 1;\r
}\r
\r
static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,\r
X509_ALGOR *alg1, X509_ALGOR *alg2,\r
-@@ -785,6 +791,7 @@\r
- return pss;\r
+@@ -762,6 +768,7 @@ static int rsa_item_sign(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,\r
+ return 2;\r
}\r
\r
+#ifndef OPENSSL_NO_CMS\r
- static int rsa_cms_decrypt(CMS_RecipientInfo *ri)\r
+ static RSA_OAEP_PARAMS *rsa_oaep_decode(const X509_ALGOR *alg,\r
+ X509_ALGOR **pmaskHash)\r
{\r
- EVP_PKEY_CTX *pkctx;\r
-@@ -857,7 +864,9 @@\r
- X509_ALGOR_free(maskHash);\r
+@@ -920,6 +927,7 @@ static int rsa_cms_encrypt(CMS_RecipientInfo *ri)\r
+ ASN1_STRING_free(os);\r
return rv;\r
}\r
+#endif\r
\r
-+#ifndef OPENSSL_NO_CMS\r
- static int rsa_cms_encrypt(CMS_RecipientInfo *ri)\r
+ const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[] = {\r
+ {\r
+diff --git a/crypto/srp/srp.h b/crypto/srp/srp.h\r
+index d072536..73b945f 100644\r
+--- a/crypto/srp/srp.h\r
++++ b/crypto/srp/srp.h\r
+@@ -114,7 +114,9 @@ DECLARE_STACK_OF(SRP_gN)\r
+ \r
+ SRP_VBASE *SRP_VBASE_new(char *seed_key);\r
+ int SRP_VBASE_free(SRP_VBASE *vb);\r
++#ifndef OPENSSL_NO_STDIO\r
+ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file);\r
++#endif\r
+ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username);\r
+ char *SRP_create_verifier(const char *user, const char *pass, char **salt,\r
+ char **verifier, const char *N, const char *g);\r
+diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c\r
+index a3f1a8a..3fbb186 100644\r
+--- a/crypto/srp/srp_vfy.c\r
++++ b/crypto/srp/srp_vfy.c\r
+@@ -225,6 +225,7 @@ static int SRP_user_pwd_set_ids(SRP_user_pwd *vinfo, const char *id,\r
+ return (info == NULL || NULL != (vinfo->info = BUF_strdup(info)));\r
+ }\r
+ \r
++#ifndef OPENSSL_NO_STDIO\r
+ static int SRP_user_pwd_set_sv(SRP_user_pwd *vinfo, const char *s,\r
+ const char *v)\r
{\r
- const EVP_MD *md, *mgf1md;\r
-@@ -920,6 +929,7 @@\r
- ASN1_STRING_free(os);\r
- return rv;\r
+@@ -239,6 +240,7 @@ static int SRP_user_pwd_set_sv(SRP_user_pwd *vinfo, const char *s,\r
+ len = t_fromb64(tmp, s);\r
+ return ((vinfo->s = BN_bin2bn(tmp, len, NULL)) != NULL);\r
}\r
+#endif\r
\r
- const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[] = {\r
- {\r
-diff U3 crypto/x509/x509_vfy.c crypto/x509/x509_vfy.c\r
---- crypto/x509/x509_vfy.c Thu Jan 28 21:56:08 2016\r
-+++ crypto/x509/x509_vfy.c Wed Feb 17 16:09:58 2016\r
-@@ -940,6 +940,8 @@\r
+ static int SRP_user_pwd_set_sv_BN(SRP_user_pwd *vinfo, BIGNUM *s, BIGNUM *v)\r
+ {\r
+@@ -279,6 +281,7 @@ int SRP_VBASE_free(SRP_VBASE *vb)\r
+ return 0;\r
+ }\r
+ \r
++#ifndef OPENSSL_NO_STDIO\r
+ static SRP_gN_cache *SRP_gN_new_init(const char *ch)\r
+ {\r
+ unsigned char tmp[MAX_LEN];\r
+@@ -310,6 +313,7 @@ static void SRP_gN_free(SRP_gN_cache *gN_cache)\r
+ BN_free(gN_cache->bn);\r
+ OPENSSL_free(gN_cache);\r
+ }\r
++#endif\r
+ \r
+ static SRP_gN *SRP_get_gN_by_id(const char *id, STACK_OF(SRP_gN) *gN_tab)\r
+ {\r
+@@ -326,6 +330,7 @@ static SRP_gN *SRP_get_gN_by_id(const char *id, STACK_OF(SRP_gN) *gN_tab)\r
+ return SRP_get_default_gN(id);\r
+ }\r
+ \r
++#ifndef OPENSSL_NO_STDIO\r
+ static BIGNUM *SRP_gN_place_bn(STACK_OF(SRP_gN_cache) *gN_cache, char *ch)\r
+ {\r
+ int i;\r
+@@ -467,6 +472,7 @@ int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file)\r
+ return error_code;\r
+ \r
+ }\r
++#endif\r
+ \r
+ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username)\r
+ {\r
+diff --git a/crypto/ts/ts.h b/crypto/ts/ts.h\r
+index 16eccbb..a9fe40e 100644\r
+--- a/crypto/ts/ts.h\r
++++ b/crypto/ts/ts.h\r
+@@ -281,8 +281,10 @@ TS_REQ *d2i_TS_REQ(TS_REQ **a, const unsigned char **pp, long length);\r
+ \r
+ TS_REQ *TS_REQ_dup(TS_REQ *a);\r
+ \r
++#ifndef OPENSSL_NO_FP_API\r
+ TS_REQ *d2i_TS_REQ_fp(FILE *fp, TS_REQ **a);\r
+ int i2d_TS_REQ_fp(FILE *fp, TS_REQ *a);\r
++#endif\r
+ TS_REQ *d2i_TS_REQ_bio(BIO *fp, TS_REQ **a);\r
+ int i2d_TS_REQ_bio(BIO *fp, TS_REQ *a);\r
+ \r
+@@ -294,10 +296,12 @@ TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT(TS_MSG_IMPRINT **a,\r
+ \r
+ TS_MSG_IMPRINT *TS_MSG_IMPRINT_dup(TS_MSG_IMPRINT *a);\r
+ \r
++#ifndef OPENSSL_NO_FP_API\r
+ TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a);\r
+ int i2d_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT *a);\r
+-TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_bio(BIO *fp, TS_MSG_IMPRINT **a);\r
+-int i2d_TS_MSG_IMPRINT_bio(BIO *fp, TS_MSG_IMPRINT *a);\r
++#endif\r
++TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_bio(BIO *bio, TS_MSG_IMPRINT **a);\r
++int i2d_TS_MSG_IMPRINT_bio(BIO *bio, TS_MSG_IMPRINT *a);\r
+ \r
+ TS_RESP *TS_RESP_new(void);\r
+ void TS_RESP_free(TS_RESP *a);\r
+@@ -306,10 +310,12 @@ TS_RESP *d2i_TS_RESP(TS_RESP **a, const unsigned char **pp, long length);\r
+ TS_TST_INFO *PKCS7_to_TS_TST_INFO(PKCS7 *token);\r
+ TS_RESP *TS_RESP_dup(TS_RESP *a);\r
+ \r
++#ifndef OPENSSL_NO_FP_API\r
+ TS_RESP *d2i_TS_RESP_fp(FILE *fp, TS_RESP **a);\r
+ int i2d_TS_RESP_fp(FILE *fp, TS_RESP *a);\r
+-TS_RESP *d2i_TS_RESP_bio(BIO *fp, TS_RESP **a);\r
+-int i2d_TS_RESP_bio(BIO *fp, TS_RESP *a);\r
++#endif\r
++TS_RESP *d2i_TS_RESP_bio(BIO *bio, TS_RESP **a);\r
++int i2d_TS_RESP_bio(BIO *bio, TS_RESP *a);\r
+ \r
+ TS_STATUS_INFO *TS_STATUS_INFO_new(void);\r
+ void TS_STATUS_INFO_free(TS_STATUS_INFO *a);\r
+@@ -325,10 +331,12 @@ TS_TST_INFO *d2i_TS_TST_INFO(TS_TST_INFO **a, const unsigned char **pp,\r
+ long length);\r
+ TS_TST_INFO *TS_TST_INFO_dup(TS_TST_INFO *a);\r
+ \r
++#ifndef OPENSSL_NO_FP_API\r
+ TS_TST_INFO *d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a);\r
+ int i2d_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO *a);\r
+-TS_TST_INFO *d2i_TS_TST_INFO_bio(BIO *fp, TS_TST_INFO **a);\r
+-int i2d_TS_TST_INFO_bio(BIO *fp, TS_TST_INFO *a);\r
++#endif\r
++TS_TST_INFO *d2i_TS_TST_INFO_bio(BIO *bio, TS_TST_INFO **a);\r
++int i2d_TS_TST_INFO_bio(BIO *bio, TS_TST_INFO *a);\r
+ \r
+ TS_ACCURACY *TS_ACCURACY_new(void);\r
+ void TS_ACCURACY_free(TS_ACCURACY *a);\r
+@@ -728,15 +736,18 @@ int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *msg);\r
+ * ts/ts_conf.c\r
+ */\r
+ \r
++#ifndef OPENSSL_NO_STDIO\r
+ X509 *TS_CONF_load_cert(const char *file);\r
+ STACK_OF(X509) *TS_CONF_load_certs(const char *file);\r
+ EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass);\r
++#endif\r
+ const char *TS_CONF_get_tsa_section(CONF *conf, const char *section);\r
+ int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb,\r
+ TS_RESP_CTX *ctx);\r
+ int TS_CONF_set_crypto_device(CONF *conf, const char *section,\r
+ const char *device);\r
+ int TS_CONF_set_default_engine(const char *name);\r
++#ifndef OPENSSL_NO_STDIO\r
+ int TS_CONF_set_signer_cert(CONF *conf, const char *section,\r
+ const char *cert, TS_RESP_CTX *ctx);\r
+ int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs,\r
+@@ -744,6 +755,7 @@ int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs,\r
+ int TS_CONF_set_signer_key(CONF *conf, const char *section,\r
+ const char *key, const char *pass,\r
+ TS_RESP_CTX *ctx);\r
++#endif\r
+ int TS_CONF_set_def_policy(CONF *conf, const char *section,\r
+ const char *policy, TS_RESP_CTX *ctx);\r
+ int TS_CONF_set_policies(CONF *conf, const char *section, TS_RESP_CTX *ctx);\r
+@@ -784,6 +796,11 @@ void ERR_load_TS_strings(void);\r
+ # define TS_F_TS_CHECK_SIGNING_CERTS 103\r
+ # define TS_F_TS_CHECK_STATUS_INFO 104\r
+ # define TS_F_TS_COMPUTE_IMPRINT 145\r
++# define TS_F_TS_CONF_INVALID 151\r
++# define TS_F_TS_CONF_LOAD_CERT 153\r
++# define TS_F_TS_CONF_LOAD_CERTS 154\r
++# define TS_F_TS_CONF_LOAD_KEY 155\r
++# define TS_F_TS_CONF_LOOKUP_FAIL 152\r
+ # define TS_F_TS_CONF_SET_DEFAULT_ENGINE 146\r
+ # define TS_F_TS_GET_STATUS_TEXT 105\r
+ # define TS_F_TS_MSG_IMPRINT_SET_ALGO 118\r
+@@ -822,6 +839,8 @@ void ERR_load_TS_strings(void);\r
+ /* Reason codes. */\r
+ # define TS_R_BAD_PKCS7_TYPE 132\r
+ # define TS_R_BAD_TYPE 133\r
++# define TS_R_CANNOT_LOAD_CERT 137\r
++# define TS_R_CANNOT_LOAD_KEY 138\r
+ # define TS_R_CERTIFICATE_VERIFY_ERROR 100\r
+ # define TS_R_COULD_NOT_SET_ENGINE 127\r
+ # define TS_R_COULD_NOT_SET_TIME 115\r
+@@ -854,6 +873,8 @@ void ERR_load_TS_strings(void);\r
+ # define TS_R_UNACCEPTABLE_POLICY 125\r
+ # define TS_R_UNSUPPORTED_MD_ALGORITHM 126\r
+ # define TS_R_UNSUPPORTED_VERSION 113\r
++# define TS_R_VAR_BAD_VALUE 135\r
++# define TS_R_VAR_LOOKUP_FAILURE 136\r
+ # define TS_R_WRONG_CONTENT_TYPE 114\r
+ \r
+ #ifdef __cplusplus\r
+diff --git a/crypto/ts/ts_conf.c b/crypto/ts/ts_conf.c\r
+index 4716b23..c4416ba 100644\r
+--- a/crypto/ts/ts_conf.c\r
++++ b/crypto/ts/ts_conf.c\r
+@@ -92,6 +92,7 @@\r
+ \r
+ /* Function definitions for certificate and key loading. */\r
+ \r
++#ifndef OPENSSL_NO_STDIO\r
+ X509 *TS_CONF_load_cert(const char *file)\r
+ {\r
+ BIO *cert = NULL;\r
+@@ -102,7 +103,7 @@ X509 *TS_CONF_load_cert(const char *file)\r
+ x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL);\r
+ end:\r
+ if (x == NULL)\r
+- fprintf(stderr, "unable to load certificate: %s\n", file);\r
++ TSerr(TS_F_TS_CONF_LOAD_CERT, TS_R_CANNOT_LOAD_CERT);\r
+ BIO_free(cert);\r
+ return x;\r
+ }\r
+@@ -129,7 +130,7 @@ STACK_OF(X509) *TS_CONF_load_certs(const char *file)\r
+ }\r
+ end:\r
+ if (othercerts == NULL)\r
+- fprintf(stderr, "unable to load certificates: %s\n", file);\r
++ TSerr(TS_F_TS_CONF_LOAD_CERTS, TS_R_CANNOT_LOAD_CERT);\r
+ sk_X509_INFO_pop_free(allcerts, X509_INFO_free);\r
+ BIO_free(certs);\r
+ return othercerts;\r
+@@ -145,21 +146,24 @@ EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass)\r
+ pkey = PEM_read_bio_PrivateKey(key, NULL, NULL, (char *)pass);\r
+ end:\r
+ if (pkey == NULL)\r
+- fprintf(stderr, "unable to load private key: %s\n", file);\r
++ TSerr(TS_F_TS_CONF_LOAD_KEY, TS_R_CANNOT_LOAD_KEY);\r
+ BIO_free(key);\r
+ return pkey;\r
+ }\r
++#endif /* !OPENSSL_NO_STDIO */\r
+ \r
+ /* Function definitions for handling configuration options. */\r
+ \r
+ static void TS_CONF_lookup_fail(const char *name, const char *tag)\r
+ {\r
+- fprintf(stderr, "variable lookup failed for %s::%s\n", name, tag);\r
++ TSerr(TS_F_TS_CONF_LOOKUP_FAIL, TS_R_VAR_LOOKUP_FAILURE);\r
++ ERR_add_error_data(3, name, "::", tag);\r
+ }\r
+ \r
+ static void TS_CONF_invalid(const char *name, const char *tag)\r
+ {\r
+- fprintf(stderr, "invalid variable value for %s::%s\n", name, tag);\r
++ TSerr(TS_F_TS_CONF_INVALID, TS_R_VAR_BAD_VALUE);\r
++ ERR_add_error_data(3, name, "::", tag);\r
+ }\r
+ \r
+ const char *TS_CONF_get_tsa_section(CONF *conf, const char *section)\r
+@@ -237,6 +241,7 @@ int TS_CONF_set_default_engine(const char *name)\r
+ \r
+ #endif\r
+ \r
++#ifndef OPENSSL_NO_STDIO\r
+ int TS_CONF_set_signer_cert(CONF *conf, const char *section,\r
+ const char *cert, TS_RESP_CTX *ctx)\r
+ {\r
+@@ -302,6 +307,7 @@ int TS_CONF_set_signer_key(CONF *conf, const char *section,\r
+ EVP_PKEY_free(key_obj);\r
+ return ret;\r
+ }\r
++#endif /* !OPENSSL_NO_STDIO */\r
+ \r
+ int TS_CONF_set_def_policy(CONF *conf, const char *section,\r
+ const char *policy, TS_RESP_CTX *ctx)\r
+diff --git a/crypto/ts/ts_err.c b/crypto/ts/ts_err.c\r
+index ff1abf4..3f5b78f 100644\r
+--- a/crypto/ts/ts_err.c\r
++++ b/crypto/ts/ts_err.c\r
+@@ -1,6 +1,6 @@\r
+ /* crypto/ts/ts_err.c */\r
+ /* ====================================================================\r
+- * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved.\r
++ * Copyright (c) 1999-2015 The OpenSSL Project. All rights reserved.\r
+ *\r
+ * Redistribution and use in source and binary forms, with or without\r
+ * modification, are permitted provided that the following conditions\r
+@@ -87,6 +87,11 @@ static ERR_STRING_DATA TS_str_functs[] = {\r
+ {ERR_FUNC(TS_F_TS_CHECK_SIGNING_CERTS), "TS_CHECK_SIGNING_CERTS"},\r
+ {ERR_FUNC(TS_F_TS_CHECK_STATUS_INFO), "TS_CHECK_STATUS_INFO"},\r
+ {ERR_FUNC(TS_F_TS_COMPUTE_IMPRINT), "TS_COMPUTE_IMPRINT"},\r
++ {ERR_FUNC(TS_F_TS_CONF_INVALID), "ts_CONF_invalid"},\r
++ {ERR_FUNC(TS_F_TS_CONF_LOAD_CERT), "TS_CONF_load_cert"},\r
++ {ERR_FUNC(TS_F_TS_CONF_LOAD_CERTS), "TS_CONF_load_certs"},\r
++ {ERR_FUNC(TS_F_TS_CONF_LOAD_KEY), "TS_CONF_load_key"},\r
++ {ERR_FUNC(TS_F_TS_CONF_LOOKUP_FAIL), "ts_CONF_lookup_fail"},\r
+ {ERR_FUNC(TS_F_TS_CONF_SET_DEFAULT_ENGINE), "TS_CONF_set_default_engine"},\r
+ {ERR_FUNC(TS_F_TS_GET_STATUS_TEXT), "TS_GET_STATUS_TEXT"},\r
+ {ERR_FUNC(TS_F_TS_MSG_IMPRINT_SET_ALGO), "TS_MSG_IMPRINT_set_algo"},\r
+@@ -132,6 +137,8 @@ static ERR_STRING_DATA TS_str_functs[] = {\r
+ static ERR_STRING_DATA TS_str_reasons[] = {\r
+ {ERR_REASON(TS_R_BAD_PKCS7_TYPE), "bad pkcs7 type"},\r
+ {ERR_REASON(TS_R_BAD_TYPE), "bad type"},\r
++ {ERR_REASON(TS_R_CANNOT_LOAD_CERT), "cannot load certificate"},\r
++ {ERR_REASON(TS_R_CANNOT_LOAD_KEY), "cannot load private key"},\r
+ {ERR_REASON(TS_R_CERTIFICATE_VERIFY_ERROR), "certificate verify error"},\r
+ {ERR_REASON(TS_R_COULD_NOT_SET_ENGINE), "could not set engine"},\r
+ {ERR_REASON(TS_R_COULD_NOT_SET_TIME), "could not set time"},\r
+@@ -170,6 +177,8 @@ static ERR_STRING_DATA TS_str_reasons[] = {\r
+ {ERR_REASON(TS_R_UNACCEPTABLE_POLICY), "unacceptable policy"},\r
+ {ERR_REASON(TS_R_UNSUPPORTED_MD_ALGORITHM), "unsupported md algorithm"},\r
+ {ERR_REASON(TS_R_UNSUPPORTED_VERSION), "unsupported version"},\r
++ {ERR_REASON(TS_R_VAR_BAD_VALUE), "var bad value"},\r
++ {ERR_REASON(TS_R_VAR_LOOKUP_FAILURE), "cannot find config variable"},\r
+ {ERR_REASON(TS_R_WRONG_CONTENT_TYPE), "wrong content type"},\r
+ {0, NULL}\r
+ };\r
+diff --git a/crypto/ui/ui_util.c b/crypto/ui/ui_util.c\r
+index 0f29011..80dd40e 100644\r
+--- a/crypto/ui/ui_util.c\r
++++ b/crypto/ui/ui_util.c\r
+@@ -56,6 +56,10 @@\r
+ #include <string.h>\r
+ #include "ui_locl.h"\r
+ \r
++#ifndef BUFSIZ\r
++#define BUFSIZ 256\r
++#endif\r
++\r
+ int UI_UTIL_read_pw_string(char *buf, int length, const char *prompt,\r
+ int verify)\r
+ {\r
+diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c\r
+index 9ee8f8d..64b052e 100644\r
+--- a/crypto/x509/by_dir.c\r
++++ b/crypto/x509/by_dir.c\r
+@@ -69,6 +69,8 @@\r
+ # include <sys/stat.h>\r
+ #endif\r
+ \r
++#ifndef OPENSSL_NO_STDIO\r
++\r
+ #include <openssl/lhash.h>\r
+ #include <openssl/x509.h>\r
+ \r
+@@ -434,3 +436,5 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,\r
+ BUF_MEM_free(b);\r
+ return (ok);\r
+ }\r
++\r
++#endif /* OPENSSL_NO_STDIO */\r
+diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c\r
+index 0429767..7ddc21c 100644\r
+--- a/crypto/x509/x509_vfy.c\r
++++ b/crypto/x509/x509_vfy.c\r
+@@ -940,6 +940,8 @@ static int check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify)\r
ctx->current_crl = crl;\r
if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME)\r
ptime = &ctx->param->check_time;\r
else\r
ptime = NULL;\r
\r
-@@ -1663,6 +1665,8 @@\r
+@@ -1663,6 +1665,8 @@ static int check_cert_time(X509_STORE_CTX *ctx, X509 *x)\r
\r
if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME)\r
ptime = &ctx->param->check_time;\r
else\r
ptime = NULL;\r
\r
-diff U3 crypto/x509/x509_vfy.h crypto/x509/x509_vfy.h\r
---- crypto/x509/x509_vfy.h Thu Jan 28 21:56:08 2016\r
-+++ crypto/x509/x509_vfy.h Wed Feb 17 16:08:18 2016\r
-@@ -438,6 +438,8 @@\r
+diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h\r
+index 2663e1c..3790ef5 100644\r
+--- a/crypto/x509/x509_vfy.h\r
++++ b/crypto/x509/x509_vfy.h\r
+@@ -438,6 +438,8 @@ void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);\r
* will force the behaviour to match that of previous versions.\r
*/\r
# define X509_V_FLAG_NO_ALT_CHAINS 0x100000\r
\r
# define X509_VP_FLAG_DEFAULT 0x1\r
# define X509_VP_FLAG_OVERWRITE 0x2\r
-diff U3 crypto/x509v3/ext_dat.h crypto/x509v3/ext_dat.h\r
---- crypto/x509v3/ext_dat.h Thu Jan 28 21:56:08 2016\r
-+++ crypto/x509v3/ext_dat.h Wed Feb 17 16:13:30 2016\r
-@@ -127,8 +127,10 @@\r
+@@ -490,9 +492,10 @@ void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx);\r
+ X509_STORE *X509_STORE_CTX_get0_store(X509_STORE_CTX *ctx);\r
+ \r
+ X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m);\r
+-\r
++#ifndef OPENSSL_NO_STDIO\r
+ X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void);\r
+ X509_LOOKUP_METHOD *X509_LOOKUP_file(void);\r
++#endif\r
+ \r
+ int X509_STORE_add_cert(X509_STORE *ctx, X509 *x);\r
+ int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x);\r
+diff --git a/crypto/x509v3/ext_dat.h b/crypto/x509v3/ext_dat.h\r
+index c3a6fce..01edd2a 100644\r
+--- a/crypto/x509v3/ext_dat.h\r
++++ b/crypto/x509v3/ext_dat.h\r
+@@ -127,8 +127,10 @@ static const X509V3_EXT_METHOD *standard_exts[] = {\r
&v3_idp,\r
&v3_alt[2],\r
&v3_freshest_crl,\r
};\r
\r
/* Number of standard extensions */\r
-diff U3 crypto/crypto.h crypto/crypto.h\r
---- crypto/crypto.h Thu Jan 28 21:38:30 2016\r
-+++ crypto/crypto.h Wed Feb 17 16:33:00 2016\r
-@@ -235,15 +235,15 @@\r
- # ifndef OPENSSL_NO_LOCKING\r
- # ifndef CRYPTO_w_lock\r
- # define CRYPTO_w_lock(type) \\r
-- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)\r
-+ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,NULL,0)\r
- # define CRYPTO_w_unlock(type) \\r
-- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)\r
-+ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,NULL,0)\r
- # define CRYPTO_r_lock(type) \\r
-- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)\r
-+ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,NULL,0)\r
- # define CRYPTO_r_unlock(type) \\r
-- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)\r
-+ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,NULL,0)\r
- # define CRYPTO_add(addr,amount,type) \\r
-- CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)\r
-+ CRYPTO_add_lock(addr,amount,type,NULL,0)\r
- # endif\r
- # else\r
- # define CRYPTO_w_lock(a)\r
-@@ -378,19 +378,19 @@\r
- # define MemCheck_off() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)\r
- # define is_MemCheck_on() CRYPTO_is_mem_check_on()\r
+diff --git a/crypto/x509v3/v3_pci.c b/crypto/x509v3/v3_pci.c\r
+index 34cad53..12f12a7 100644\r
+--- a/crypto/x509v3/v3_pci.c\r
++++ b/crypto/x509v3/v3_pci.c\r
+@@ -149,6 +149,7 @@ static int process_pci_value(CONF_VALUE *val,\r
+ goto err;\r
+ }\r
+ OPENSSL_free(tmp_data2);\r
++#ifndef OPENSSL_NO_STDIO\r
+ } else if (strncmp(val->value, "file:", 5) == 0) {\r
+ unsigned char buf[2048];\r
+ int n;\r
+@@ -181,6 +182,7 @@ static int process_pci_value(CONF_VALUE *val,\r
+ X509V3_conf_err(val);\r
+ goto err;\r
+ }\r
++#endif /* !OPENSSL_NO_STDIO */\r
+ } else if (strncmp(val->value, "text:", 5) == 0) {\r
+ val_len = strlen(val->value + 5);\r
+ tmp_data = OPENSSL_realloc((*policy)->data,\r
+diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h\r
+index f5c6156..a2e78aa 100644\r
+--- a/crypto/x509v3/x509v3.h\r
++++ b/crypto/x509v3/x509v3.h\r
+@@ -688,8 +688,9 @@ void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,\r
+ int ml);\r
+ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,\r
+ int indent);\r
++#ifndef OPENSSL_NO_FP_API\r
+ int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent);\r
+-\r
++#endif\r
+ int X509V3_extensions_print(BIO *out, char *title,\r
+ STACK_OF(X509_EXTENSION) *exts,\r
+ unsigned long flag, int indent);\r
+diff --git a/demos/engines/cluster_labs/hw_cluster_labs_err.h b/demos/engines/cluster_labs/hw_cluster_labs_err.h\r
+index 3300e11..e9e58d5 100644\r
+--- a/demos/engines/cluster_labs/hw_cluster_labs_err.h\r
++++ b/demos/engines/cluster_labs/hw_cluster_labs_err.h\r
+@@ -67,7 +67,7 @@ extern "C" {\r
+ static void ERR_load_CL_strings(void);\r
+ static void ERR_unload_CL_strings(void);\r
+ static void ERR_CL_error(int function, int reason, char *file, int line);\r
+-# define CLerr(f,r) ERR_CL_error((f),(r),__FILE__,__LINE__)\r
++# define CLerr(f,r) ERR_CL_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
\r
--# define OPENSSL_malloc(num) CRYPTO_malloc((int)num,__FILE__,__LINE__)\r
--# define OPENSSL_strdup(str) CRYPTO_strdup((str),__FILE__,__LINE__)\r
-+# define OPENSSL_malloc(num) CRYPTO_malloc((int)num,NULL,0)\r
-+# define OPENSSL_strdup(str) CRYPTO_strdup((str),NULL,0)\r
- # define OPENSSL_realloc(addr,num) \\r
-- CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__)\r
-+ CRYPTO_realloc((char *)addr,(int)num,NULL,0)\r
- # define OPENSSL_realloc_clean(addr,old_num,num) \\r
-- CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__)\r
-+ CRYPTO_realloc_clean(addr,old_num,num,NULL,0)\r
- # define OPENSSL_remalloc(addr,num) \\r
-- CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__)\r
-+ CRYPTO_remalloc((char **)addr,(int)num,NULL,0)\r
- # define OPENSSL_freeFunc CRYPTO_free\r
- # define OPENSSL_free(addr) CRYPTO_free(addr)\r
+ /* Error codes for the CL functions. */\r
\r
- # define OPENSSL_malloc_locked(num) \\r
-- CRYPTO_malloc_locked((int)num,__FILE__,__LINE__)\r
-+ CRYPTO_malloc_locked((int)num,NULL,0)\r
- # define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr)\r
+diff --git a/demos/engines/ibmca/hw_ibmca_err.h b/demos/engines/ibmca/hw_ibmca_err.h\r
+index c17e0c9..10d0212 100644\r
+--- a/demos/engines/ibmca/hw_ibmca_err.h\r
++++ b/demos/engines/ibmca/hw_ibmca_err.h\r
+@@ -67,7 +67,7 @@ extern "C" {\r
+ static void ERR_load_IBMCA_strings(void);\r
+ static void ERR_unload_IBMCA_strings(void);\r
+ static void ERR_IBMCA_error(int function, int reason, char *file, int line);\r
+-# define IBMCAerr(f,r) ERR_IBMCA_error((f),(r),__FILE__,__LINE__)\r
++# define IBMCAerr(f,r) ERR_IBMCA_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
\r
- const char *SSLeay_version(int type);\r
-@@ -545,7 +545,7 @@\r
- long CRYPTO_get_mem_debug_options(void);\r
+ /* Error codes for the IBMCA functions. */\r
\r
- # define CRYPTO_push_info(info) \\r
-- CRYPTO_push_info_(info, __FILE__, __LINE__);\r
-+ CRYPTO_push_info_(info, NULL, 0);\r
- int CRYPTO_push_info_(const char *info, const char *file, int line);\r
- int CRYPTO_pop_info(void);\r
- int CRYPTO_remove_all_info(void);\r
-@@ -588,7 +588,7 @@\r
+diff --git a/demos/engines/rsaref/rsaref_err.h b/demos/engines/rsaref/rsaref_err.h\r
+index 4356815..598836f 100644\r
+--- a/demos/engines/rsaref/rsaref_err.h\r
++++ b/demos/engines/rsaref/rsaref_err.h\r
+@@ -68,7 +68,7 @@ extern "C" {\r
+ static void ERR_load_RSAREF_strings(void);\r
+ static void ERR_unload_RSAREF_strings(void);\r
+ static void ERR_RSAREF_error(int function, int reason, char *file, int line);\r
+-# define RSAREFerr(f,r) ERR_RSAREF_error((f),(r),__FILE__,__LINE__)\r
++# define RSAREFerr(f,r) ERR_RSAREF_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
+ /* Error codes for the RSAREF functions. */\r
\r
- /* die if we have to */\r
- void OpenSSLDie(const char *file, int line, const char *assertion);\r
--# define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))\r
-+# define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(NULL, 0, #e),1))\r
+ /* Function codes. */\r
+diff --git a/demos/engines/zencod/hw_zencod_err.h b/demos/engines/zencod/hw_zencod_err.h\r
+index f4a8358..94d3293 100644\r
+--- a/demos/engines/zencod/hw_zencod_err.h\r
++++ b/demos/engines/zencod/hw_zencod_err.h\r
+@@ -67,7 +67,7 @@ extern "C" {\r
+ static void ERR_load_ZENCOD_strings(void);\r
+ static void ERR_unload_ZENCOD_strings(void);\r
+ static void ERR_ZENCOD_error(int function, int reason, char *file, int line);\r
+-# define ZENCODerr(f,r) ERR_ZENCOD_error((f),(r),__FILE__,__LINE__)\r
++# define ZENCODerr(f,r) ERR_ZENCOD_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
\r
- unsigned long *OPENSSL_ia32cap_loc(void);\r
- # define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))\r
-@@ -605,14 +605,14 @@\r
- # define fips_md_init_ctx(alg, cx) \\r
- int alg##_Init(cx##_CTX *c) \\r
- { \\r
-- if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \\r
-+ if (FIPS_mode()) OpenSSLDie(NULL, 0, \\r
- "Low level API call to digest " #alg " forbidden in FIPS mode!"); \\r
- return private_##alg##_Init(c); \\r
- } \\r
- int private_##alg##_Init(cx##_CTX *c)\r
+ /* Error codes for the ZENCOD functions. */\r
\r
- # define fips_cipher_abort(alg) \\r
-- if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \\r
-+ if (FIPS_mode()) OpenSSLDie(NULL, 0, \\r
- "Low level API call to cipher " #alg " forbidden in FIPS mode!")\r
+diff --git a/doc/crypto/threads.pod b/doc/crypto/threads.pod\r
+index dc0e939..fe123bb 100644\r
+--- a/doc/crypto/threads.pod\r
++++ b/doc/crypto/threads.pod\r
+@@ -51,15 +51,15 @@ CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support\r
+ void CRYPTO_lock(int mode, int n, const char *file, int line);\r
\r
- # else\r
-diff U3 e_os.h e_os.h\r
---- e_os.h Thu Jan 28 21:56:08 2016\r
-+++ e_os.h Wed Feb 17 15:52:08 2016\r
-@@ -136,7 +136,7 @@\r
+ #define CRYPTO_w_lock(type) \\r
+- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)\r
++ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,OPENSSL_FILE,OPENSSL_LINE)\r
+ #define CRYPTO_w_unlock(type) \\r
+- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)\r
++ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,OPENSSL_FILE,OPENSSL_LINE)\r
+ #define CRYPTO_r_lock(type) \\r
+- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)\r
++ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,OPENSSL_FILE,OPENSSL_LINE)\r
+ #define CRYPTO_r_unlock(type) \\r
+- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)\r
++ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,OPENSSL_FILE,OPENSSL_LINE)\r
+ #define CRYPTO_add(addr,amount,type) \\r
+- CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)\r
++ CRYPTO_add_lock(addr,amount,type,OPENSSL_FILE,OPENSSL_LINE)\r
+ \r
+ =head1 DESCRIPTION\r
+ \r
+diff --git a/e_os.h b/e_os.h\r
+index 1fa36c1..3e9dae2 100644\r
+--- a/e_os.h\r
++++ b/e_os.h\r
+@@ -136,7 +136,7 @@ extern "C" {\r
# define MSDOS\r
# endif\r
\r
# define GETPID_IS_MEANINGLESS\r
# endif\r
\r
-diff U3 e_os2.h e_os2.h\r
---- e_os2.h Thu Jan 28 21:56:08 2016\r
-+++ e_os2.h Wed Feb 17 15:53:08 2016\r
-@@ -97,7 +97,14 @@\r
+diff --git a/e_os2.h b/e_os2.h\r
+index 7be9989..909e22f 100644\r
+--- a/e_os2.h\r
++++ b/e_os2.h\r
+@@ -97,7 +97,14 @@ extern "C" {\r
* For 32 bit environment, there seems to be the CygWin environment and then\r
* all the others that try to do the same thing Microsoft does...\r
*/\r
# undef OPENSSL_SYS_UNIX\r
# define OPENSSL_SYS_WIN32_UWIN\r
# else\r
+diff --git a/engines/ccgost/e_gost_err.h b/engines/ccgost/e_gost_err.h\r
+index a2018ec..9eacdcf 100644\r
+--- a/engines/ccgost/e_gost_err.h\r
++++ b/engines/ccgost/e_gost_err.h\r
+@@ -67,7 +67,7 @@ extern "C" {\r
+ void ERR_load_GOST_strings(void);\r
+ void ERR_unload_GOST_strings(void);\r
+ void ERR_GOST_error(int function, int reason, char *file, int line);\r
+-# define GOSTerr(f,r) ERR_GOST_error((f),(r),__FILE__,__LINE__)\r
++# define GOSTerr(f,r) ERR_GOST_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
+ \r
+ /* Error codes for the GOST functions. */\r
+ \r
+diff --git a/engines/e_4758cca_err.h b/engines/e_4758cca_err.h\r
+index 2f29d96..47a2635 100644\r
+--- a/engines/e_4758cca_err.h\r
++++ b/engines/e_4758cca_err.h\r
+@@ -67,7 +67,7 @@ extern "C" {\r
+ static void ERR_load_CCA4758_strings(void);\r
+ static void ERR_unload_CCA4758_strings(void);\r
+ static void ERR_CCA4758_error(int function, int reason, char *file, int line);\r
+-# define CCA4758err(f,r) ERR_CCA4758_error((f),(r),__FILE__,__LINE__)\r
++# define CCA4758err(f,r) ERR_CCA4758_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
+ \r
+ /* Error codes for the CCA4758 functions. */\r
+ \r
+diff --git a/engines/e_aep_err.h b/engines/e_aep_err.h\r
+index 2ed0114..1f8fa5b 100644\r
+--- a/engines/e_aep_err.h\r
++++ b/engines/e_aep_err.h\r
+@@ -67,7 +67,7 @@ extern "C" {\r
+ static void ERR_load_AEPHK_strings(void);\r
+ static void ERR_unload_AEPHK_strings(void);\r
+ static void ERR_AEPHK_error(int function, int reason, char *file, int line);\r
+-# define AEPHKerr(f,r) ERR_AEPHK_error((f),(r),__FILE__,__LINE__)\r
++# define AEPHKerr(f,r) ERR_AEPHK_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
+ \r
+ /* Error codes for the AEPHK functions. */\r
+ \r
+diff --git a/engines/e_atalla_err.h b/engines/e_atalla_err.h\r
+index 7b71eff..d958496 100644\r
+--- a/engines/e_atalla_err.h\r
++++ b/engines/e_atalla_err.h\r
+@@ -67,7 +67,7 @@ extern "C" {\r
+ static void ERR_load_ATALLA_strings(void);\r
+ static void ERR_unload_ATALLA_strings(void);\r
+ static void ERR_ATALLA_error(int function, int reason, char *file, int line);\r
+-# define ATALLAerr(f,r) ERR_ATALLA_error((f),(r),__FILE__,__LINE__)\r
++# define ATALLAerr(f,r) ERR_ATALLA_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
+ \r
+ /* Error codes for the ATALLA functions. */\r
+ \r
+diff --git a/engines/e_capi_err.h b/engines/e_capi_err.h\r
+index b5d06dc..cfe46b1 100644\r
+--- a/engines/e_capi_err.h\r
++++ b/engines/e_capi_err.h\r
+@@ -67,7 +67,7 @@ extern "C" {\r
+ static void ERR_load_CAPI_strings(void);\r
+ static void ERR_unload_CAPI_strings(void);\r
+ static void ERR_CAPI_error(int function, int reason, char *file, int line);\r
+-# define CAPIerr(f,r) ERR_CAPI_error((f),(r),__FILE__,__LINE__)\r
++# define CAPIerr(f,r) ERR_CAPI_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
+ \r
+ /* Error codes for the CAPI functions. */\r
+ \r
+diff --git a/engines/e_chil_err.h b/engines/e_chil_err.h\r
+index d86a4ce..3d961b9 100644\r
+--- a/engines/e_chil_err.h\r
++++ b/engines/e_chil_err.h\r
+@@ -67,7 +67,7 @@ extern "C" {\r
+ static void ERR_load_HWCRHK_strings(void);\r
+ static void ERR_unload_HWCRHK_strings(void);\r
+ static void ERR_HWCRHK_error(int function, int reason, char *file, int line);\r
+-# define HWCRHKerr(f,r) ERR_HWCRHK_error((f),(r),__FILE__,__LINE__)\r
++# define HWCRHKerr(f,r) ERR_HWCRHK_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
+ \r
+ /* Error codes for the HWCRHK functions. */\r
+ \r
+diff --git a/engines/e_cswift_err.h b/engines/e_cswift_err.h\r
+index fde3a82..7c20691 100644\r
+--- a/engines/e_cswift_err.h\r
++++ b/engines/e_cswift_err.h\r
+@@ -67,7 +67,7 @@ extern "C" {\r
+ static void ERR_load_CSWIFT_strings(void);\r
+ static void ERR_unload_CSWIFT_strings(void);\r
+ static void ERR_CSWIFT_error(int function, int reason, char *file, int line);\r
+-# define CSWIFTerr(f,r) ERR_CSWIFT_error((f),(r),__FILE__,__LINE__)\r
++# define CSWIFTerr(f,r) ERR_CSWIFT_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
+ \r
+ /* Error codes for the CSWIFT functions. */\r
+ \r
+diff --git a/engines/e_gmp_err.h b/engines/e_gmp_err.h\r
+index 637abbc..ccaf3da 100644\r
+--- a/engines/e_gmp_err.h\r
++++ b/engines/e_gmp_err.h\r
+@@ -67,7 +67,7 @@ extern "C" {\r
+ static void ERR_load_GMP_strings(void);\r
+ static void ERR_unload_GMP_strings(void);\r
+ static void ERR_GMP_error(int function, int reason, char *file, int line);\r
+-# define GMPerr(f,r) ERR_GMP_error((f),(r),__FILE__,__LINE__)\r
++# define GMPerr(f,r) ERR_GMP_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
+ \r
+ /* Error codes for the GMP functions. */\r
+ \r
+diff --git a/engines/e_nuron_err.h b/engines/e_nuron_err.h\r
+index aa7849c..e607d3e 100644\r
+--- a/engines/e_nuron_err.h\r
++++ b/engines/e_nuron_err.h\r
+@@ -67,7 +67,7 @@ extern "C" {\r
+ static void ERR_load_NURON_strings(void);\r
+ static void ERR_unload_NURON_strings(void);\r
+ static void ERR_NURON_error(int function, int reason, char *file, int line);\r
+-# define NURONerr(f,r) ERR_NURON_error((f),(r),__FILE__,__LINE__)\r
++# define NURONerr(f,r) ERR_NURON_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
+ \r
+ /* Error codes for the NURON functions. */\r
+ \r
+diff --git a/engines/e_sureware_err.h b/engines/e_sureware_err.h\r
+index bef8623..54f2848 100644\r
+--- a/engines/e_sureware_err.h\r
++++ b/engines/e_sureware_err.h\r
+@@ -68,7 +68,7 @@ static void ERR_load_SUREWARE_strings(void);\r
+ static void ERR_unload_SUREWARE_strings(void);\r
+ static void ERR_SUREWARE_error(int function, int reason, char *file,\r
+ int line);\r
+-# define SUREWAREerr(f,r) ERR_SUREWARE_error((f),(r),__FILE__,__LINE__)\r
++# define SUREWAREerr(f,r) ERR_SUREWARE_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
+ \r
+ /* Error codes for the SUREWARE functions. */\r
+ \r
+diff --git a/engines/e_ubsec_err.h b/engines/e_ubsec_err.h\r
+index c8aec7c..67110ed 100644\r
+--- a/engines/e_ubsec_err.h\r
++++ b/engines/e_ubsec_err.h\r
+@@ -67,7 +67,7 @@ extern "C" {\r
+ static void ERR_load_UBSEC_strings(void);\r
+ static void ERR_unload_UBSEC_strings(void);\r
+ static void ERR_UBSEC_error(int function, int reason, char *file, int line);\r
+-# define UBSECerr(f,r) ERR_UBSEC_error((f),(r),__FILE__,__LINE__)\r
++# define UBSECerr(f,r) ERR_UBSEC_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
+ \r
+ /* Error codes for the UBSEC functions. */\r
+ \r
+diff --git a/ssl/d1_both.c b/ssl/d1_both.c\r
+index d1fc716..d5f661a 100644\r
+--- a/ssl/d1_both.c\r
++++ b/ssl/d1_both.c\r
+@@ -1053,7 +1053,7 @@ int dtls1_send_change_cipher_spec(SSL *s, int a, int b)\r
+ int dtls1_read_failed(SSL *s, int code)\r
+ {\r
+ if (code > 0) {\r
+- fprintf(stderr, "invalid state reached %s:%d", __FILE__, __LINE__);\r
++ fprintf(stderr, "dtls1_read_failed(); invalid state reached\n");\r
+ return 1;\r
+ }\r
+ \r
+diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c\r
+index 35cc27c..a1f5335 100644\r
+--- a/ssl/ssl_asn1.c\r
++++ b/ssl/ssl_asn1.c\r
+@@ -418,7 +418,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,\r
+ if (ssl_version == SSL2_VERSION) {\r
+ if (os.length != 3) {\r
+ c.error = SSL_R_CIPHER_CODE_WRONG_LENGTH;\r
+- c.line = __LINE__;\r
++ c.line = OPENSSL_LINE;\r
+ goto err;\r
+ }\r
+ id = 0x02000000L |\r
+@@ -429,14 +429,14 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,\r
+ || ssl_version == DTLS1_BAD_VER) {\r
+ if (os.length != 2) {\r
+ c.error = SSL_R_CIPHER_CODE_WRONG_LENGTH;\r
+- c.line = __LINE__;\r
++ c.line = OPENSSL_LINE;\r
+ goto err;\r
+ }\r
+ id = 0x03000000L |\r
+ ((unsigned long)os.data[0] << 8L) | (unsigned long)os.data[1];\r
+ } else {\r
+ c.error = SSL_R_UNKNOWN_SSL_VERSION;\r
+- c.line = __LINE__;\r
++ c.line = OPENSSL_LINE;\r
+ goto err;\r
+ }\r
+ \r
+@@ -526,7 +526,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,\r
+ if (os.data != NULL) {\r
+ if (os.length > SSL_MAX_SID_CTX_LENGTH) {\r
+ c.error = SSL_R_BAD_LENGTH;\r
+- c.line = __LINE__;\r
++ c.line = OPENSSL_LINE;\r
+ goto err;\r
+ } else {\r
+ ret->sid_ctx_length = os.length;\r
+diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c\r
+index a73f866..d534c0a 100644\r
+--- a/ssl/ssl_cert.c\r
++++ b/ssl/ssl_cert.c\r
+@@ -855,12 +855,13 @@ int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x)\r
+ return (add_client_CA(&(ctx->client_CA), x));\r
+ }\r
+ \r
++#ifndef OPENSSL_NO_STDIO\r
++\r
+ static int xname_cmp(const X509_NAME *const *a, const X509_NAME *const *b)\r
+ {\r
+ return (X509_NAME_cmp(*a, *b));\r
+ }\r
+ \r
+-#ifndef OPENSSL_NO_STDIO\r
+ /**\r
+ * Load CA certs from a file into a ::STACK. Note that it is somewhat misnamed;\r
+ * it doesn't really have anything to do with clients (except that a common use\r
+@@ -928,7 +929,6 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file)\r
+ ERR_clear_error();\r
+ return (ret);\r
+ }\r
+-#endif\r
+ \r
+ /**\r
+ * Add a file of certs to a stack.\r
+@@ -1048,6 +1048,7 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,\r
+ CRYPTO_w_unlock(CRYPTO_LOCK_READDIR);\r
+ return ret;\r
+ }\r
++#endif /* !OPENSSL_NO_STDIO */\r
+ \r
+ /* Add a certificate to a BUF_MEM structure */\r
+ \r
+diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c\r
+index 5478840..c2ad7c9 100644\r
+--- a/ssl/ssl_conf.c\r
++++ b/ssl/ssl_conf.c\r
+@@ -362,6 +362,7 @@ static int cmd_Options(SSL_CONF_CTX *cctx, const char *value)\r
+ return CONF_parse_list(value, ',', 1, ssl_set_option_list, cctx);\r
+ }\r
+ \r
++#ifndef OPENSSL_NO_STDIO\r
+ static int cmd_Certificate(SSL_CONF_CTX *cctx, const char *value)\r
+ {\r
+ int rv = 1;\r
+@@ -428,7 +429,9 @@ static int cmd_DHParameters(SSL_CONF_CTX *cctx, const char *value)\r
+ BIO_free(in);\r
+ return rv > 0;\r
+ }\r
+-#endif\r
++#endif /* !OPENSSL_NO_DH */\r
++#endif /* !OPENSSL_NO_STDIO */\r
++\r
+ typedef struct {\r
+ int (*cmd) (SSL_CONF_CTX *cctx, const char *value);\r
+ const char *str_file;\r
+@@ -454,12 +457,14 @@ static const ssl_conf_cmd_tbl ssl_conf_cmds[] = {\r
+ SSL_CONF_CMD_STRING(CipherString, "cipher"),\r
+ SSL_CONF_CMD_STRING(Protocol, NULL),\r
+ SSL_CONF_CMD_STRING(Options, NULL),\r
++#ifndef OPENSSL_NO_STDIO\r
+ SSL_CONF_CMD(Certificate, "cert", SSL_CONF_TYPE_FILE),\r
+ SSL_CONF_CMD(PrivateKey, "key", SSL_CONF_TYPE_FILE),\r
+ SSL_CONF_CMD(ServerInfoFile, NULL, SSL_CONF_TYPE_FILE),\r
+ #ifndef OPENSSL_NO_DH\r
+ SSL_CONF_CMD(DHParameters, "dhparam", SSL_CONF_TYPE_FILE)\r
+ #endif\r
++#endif\r
+ };\r
+ \r
+ static int ssl_conf_cmd_skip_prefix(SSL_CONF_CTX *cctx, const char **pcmd)\r
+diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c\r
+index 514fcb3..2a54cc9 100644\r
+--- a/ssl/t1_enc.c\r
++++ b/ssl/t1_enc.c\r
+@@ -780,9 +780,7 @@ int tls1_enc(SSL *s, int send)\r
+ * we can't write into the input stream: Can this ever\r
+ * happen?? (steve)\r
+ */\r
+- fprintf(stderr,\r
+- "%s:%d: rec->data != rec->input\n",\r
+- __FILE__, __LINE__);\r
++ fprintf(stderr, "tls1_enc: rec->data != rec->input\n");\r
+ else if (RAND_bytes(rec->input, ivlen) <= 0)\r
+ return -1;\r
+ }\r
+diff --git a/test/cms-test.pl b/test/cms-test.pl\r
+index baa3b59..1ee3f02 100644\r
+--- a/test/cms-test.pl\r
++++ b/test/cms-test.pl\r
+@@ -100,6 +100,13 @@ my $no_ec2m;\r
+ my $no_ecdh;\r
+ my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/;\r
+ \r
++system ("$ossl_path no-cms > $null_path");\r
++if ($? == 0)\r
++ {\r
++ print "CMS disabled\n";\r
++ exit 0;\r
++ }\r
++\r
+ system ("$ossl_path no-ec > $null_path");\r
+ if ($? == 0)\r
+ {\r
+diff --git a/util/libeay.num b/util/libeay.num\r
+index 7f7487d..13b2e3a 100755\r
+--- a/util/libeay.num\r
++++ b/util/libeay.num\r
+@@ -4368,7 +4368,7 @@ DH_compute_key_padded 4732 EXIST::FUNCTION:DH\r
+ ECDSA_METHOD_set_sign 4733 EXIST::FUNCTION:ECDSA\r
+ CMS_RecipientEncryptedKey_cert_cmp 4734 EXIST:!VMS:FUNCTION:CMS\r
+ CMS_RecipEncryptedKey_cert_cmp 4734 EXIST:VMS:FUNCTION:CMS\r
+-DH_KDF_X9_42 4735 EXIST::FUNCTION:DH\r
++DH_KDF_X9_42 4735 EXIST::FUNCTION:CMS,DH\r
+ RSA_OAEP_PARAMS_free 4736 EXIST::FUNCTION:RSA\r
+ EVP_des_ede3_wrap 4737 EXIST::FUNCTION:DES\r
+ RSA_OAEP_PARAMS_it 4738 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA\r
+diff --git a/util/mkerr.pl b/util/mkerr.pl\r
+index 09ebebe..cd57ade 100644\r
+--- a/util/mkerr.pl\r
++++ b/util/mkerr.pl\r
+@@ -89,7 +89,7 @@ Options:\r
+ void ERR_load_<LIB>_strings(void);\r
+ void ERR_unload_<LIB>_strings(void);\r
+ void ERR_<LIB>_error(int f, int r, char *fn, int ln);\r
+- #define <LIB>err(f,r) ERR_<LIB>_error(f,r,__FILE__,__LINE__)\r
++ #define <LIB>err(f,r) ERR_<LIB>_error(f,r,OPENSSL_FILE,OPENSSL_LINE)\r
+ while the code facilitates the use of these in an environment\r
+ where the error support routines are dynamically loaded at \r
+ runtime.\r
+@@ -474,7 +474,7 @@ EOF\r
+ ${staticloader}void ERR_load_${lib}_strings(void);\r
+ ${staticloader}void ERR_unload_${lib}_strings(void);\r
+ ${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line);\r
+-# define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)\r
++# define ${lib}err(f,r) ERR_${lib}_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)\r
+ \r
+ EOF\r
+ }\r
projects / mirror_edk2.git / blobdiff