\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
+ \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/conf/conf.h b/crypto/conf/conf.h\r
index 8d926d5..41cf38e 100644\r
--- a/crypto/conf/conf.h\r
}\r
\r
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c\r
-index c9f674b..e223118 100644\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
\r
#ifdef __cplusplus\r
diff --git a/crypto/crypto.h b/crypto/crypto.h\r
-index c450d7a..d6e804e 100644\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 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
++ 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,NULL,0)\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,NULL,0)\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,NULL,0)\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,NULL,0)\r
++ CRYPTO_add_lock(addr,amount,type,OPENSSL_FILE,OPENSSL_LINE)\r
# endif\r
# else\r
# define CRYPTO_w_lock(a)\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_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,NULL,0)\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,NULL,0)\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,NULL,0)\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,NULL,0)\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
\r
# define CRYPTO_push_info(info) \\r
- CRYPTO_push_info_(info, __FILE__, __LINE__);\r
-+ CRYPTO_push_info_(info, NULL, 0);\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
/* 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
++# 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
int alg##_Init(cx##_CTX *c) \\r
{ \\r
- if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \\r
-+ if (FIPS_mode()) OpenSSLDie(NULL, 0, \\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
\r
# define fips_cipher_abort(alg) \\r
- if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \\r
-+ if (FIPS_mode()) OpenSSLDie(NULL, 0, \\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
}\r
return 1;\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
/* #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
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
+ /* Error codes for the CL functions. */\r
+ \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
+ /* Error codes for the IBMCA functions. */\r
+ \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
+ /* 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
+ /* Error codes for the ZENCOD functions. */\r
+ \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
+ #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
# 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
};\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/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 / commitdiff