Only in openssl-orig/.git: ORIG_HEAD Binary files openssl-orig/.git/index and openssl-work/.git/index differ diff -ur openssl-orig/crypto/crypto.h openssl-work/crypto/crypto.h --- openssl-orig/crypto/crypto.h 2014-12-10 17:53:20.000000000 +0300 +++ openssl-work/crypto/crypto.h 2014-12-10 17:43:26.000000000 +0300 @@ -231,6 +231,7 @@ #ifndef OPENSSL_NO_LOCKING #ifndef CRYPTO_w_lock +#ifndef NDEBUG #define CRYPTO_w_lock(type) \ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) #define CRYPTO_w_unlock(type) \ @@ -241,6 +242,18 @@ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__) #define CRYPTO_add(addr,amount,type) \ CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__) +#else +#define CRYPTO_w_lock(type) \ + CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,NULL,0) +#define CRYPTO_w_unlock(type) \ + CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,NULL,0) +#define CRYPTO_r_lock(type) \ + CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,NULL,0) +#define CRYPTO_r_unlock(type) \ + CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,NULL,0) +#define CRYPTO_add(addr,amount,type) \ + CRYPTO_add_lock(addr,amount,type,NULL,0) +#endif #endif #else #define CRYPTO_w_lock(a) @@ -358,14 +371,26 @@ int CRYPTO_is_mem_check_on(void); /* for applications */ +#ifndef NDEBUG #define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) #define MemCheck_stop() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF) +#else +#define MemCheck_start() CRYPTO_MEM_CHECK_OFF +#define MemCheck_stop() CRYPTO_MEM_CHECK_OFF +#endif /* for library-internal use */ +#ifndef NDEBUG #define MemCheck_on() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE) #define MemCheck_off() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE) #define is_MemCheck_on() CRYPTO_is_mem_check_on() +#else +#define MemCheck_on() CRYPTO_MEM_CHECK_OFF +#define MemCheck_off() CRYPTO_MEM_CHECK_OFF +#define is_MemCheck_on() CRYPTO_MEM_CHECK_OFF +#endif +#ifndef NDEBUG #define OPENSSL_malloc(num) CRYPTO_malloc((int)num,__FILE__,__LINE__) #define OPENSSL_strdup(str) CRYPTO_strdup((str),__FILE__,__LINE__) #define OPENSSL_realloc(addr,num) \ @@ -374,11 +399,23 @@ CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__) #define OPENSSL_remalloc(addr,num) \ CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__) +#define OPENSSL_malloc_locked(num) \ + CRYPTO_malloc_locked((int)num,__FILE__,__LINE__) +#else +#define OPENSSL_malloc(num) CRYPTO_malloc((int)num,NULL,0) +#define OPENSSL_strdup(str) CRYPTO_strdup((str),NULL,0) +#define OPENSSL_realloc(addr,num) \ + CRYPTO_realloc((char *)addr,(int)num,NULL,0) +#define OPENSSL_realloc_clean(addr,old_num,num) \ + CRYPTO_realloc_clean(addr,old_num,num,NULL,0) +#define OPENSSL_remalloc(addr,num) \ + CRYPTO_remalloc((char **)addr,(int)num,NULL,0) +#define OPENSSL_malloc_locked(num) \ + CRYPTO_malloc_locked((int)num,NULL,0) +#endif #define OPENSSL_freeFunc CRYPTO_free #define OPENSSL_free(addr) CRYPTO_free(addr) -#define OPENSSL_malloc_locked(num) \ - CRYPTO_malloc_locked((int)num,__FILE__,__LINE__) #define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr) #define OPENSSL_MALLOC_MAX_NELEMS(type) (((1U<<(sizeof(int)*8-1))-1)/sizeof(type)) @@ -504,8 +541,13 @@ void CRYPTO_set_mem_debug_options(long bits); long CRYPTO_get_mem_debug_options(void); +#ifndef NDEBUG #define CRYPTO_push_info(info) \ CRYPTO_push_info_(info, __FILE__, __LINE__); +#else +#define CRYPTO_push_info(info) \ + CRYPTO_push_info_(info, NULL, 0); +#endif int CRYPTO_push_info_(const char *info, const char *file, int line); int CRYPTO_pop_info(void); int CRYPTO_remove_all_info(void); @@ -543,7 +585,11 @@ /* die if we have to */ void OpenSSLDie(const char *file,int line,const char *assertion); +#ifndef NDEBUG #define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1)) +#else +#define OPENSSL_assert(e) +#endif unsigned int *OPENSSL_ia32cap_loc(void); #define OPENSSL_ia32cap ((OPENSSL_ia32cap_loc())[0]) diff -ur openssl-orig/crypto/lock.c openssl-work/crypto/lock.c --- openssl-orig/crypto/lock.c 2014-12-10 17:53:20.000000000 +0300 +++ openssl-work/crypto/lock.c 2014-12-10 17:26:03.000000000 +0300 @@ -256,7 +256,11 @@ return(0); } pointer->references = 1; +#ifndef NDEBUG pointer->data = dynlock_create_callback(__FILE__,__LINE__); +#else + pointer->data = dynlock_create_callback(NULL,0); +#endif if (pointer->data == NULL) { OPENSSL_free(pointer); @@ -282,7 +286,11 @@ if (i == -1) { +#ifndef NDEBUG dynlock_destroy_callback(pointer->data,__FILE__,__LINE__); +#else + dynlock_destroy_callback(pointer->data,NULL,0); +#endif OPENSSL_free(pointer); } else @@ -328,7 +336,11 @@ if (pointer) { +#ifndef NDEBUG dynlock_destroy_callback(pointer->data,__FILE__,__LINE__); +#else + dynlock_destroy_callback(pointer->data,NULL,0); +#endif OPENSSL_free(pointer); } } diff -ur openssl-orig/engines/ccgost/e_gost_err.h openssl-work/engines/ccgost/e_gost_err.h --- openssl-orig/engines/ccgost/e_gost_err.h 2014-12-10 17:53:20.000000000 +0300 +++ openssl-work/engines/ccgost/e_gost_err.h 2014-12-10 17:45:34.000000000 +0300 @@ -66,7 +66,11 @@ void ERR_load_GOST_strings(void); void ERR_unload_GOST_strings(void); void ERR_GOST_error(int function, int reason, char *file, int line); +#ifndef OPENSSL_NO_ERR #define GOSTerr(f,r) ERR_GOST_error((f),(r),__FILE__,__LINE__) +#else +#define GOSTerr(f,r) ERR_GOST_error((f),(r),NULL,0) +#endif /* Error codes for the GOST functions. */ diff -ur openssl-orig/include/openssl/crypto.h openssl-work/include/openssl/crypto.h --- openssl-orig/include/openssl/crypto.h 2014-12-10 17:53:20.000000000 +0300 +++ openssl-work/include/openssl/crypto.h 2014-12-10 17:43:26.000000000 +0300 @@ -231,6 +231,7 @@ #ifndef OPENSSL_NO_LOCKING #ifndef CRYPTO_w_lock +#ifndef NDEBUG #define CRYPTO_w_lock(type) \ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) #define CRYPTO_w_unlock(type) \ @@ -241,6 +242,18 @@ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__) #define CRYPTO_add(addr,amount,type) \ CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__) +#else +#define CRYPTO_w_lock(type) \ + CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,NULL,0) +#define CRYPTO_w_unlock(type) \ + CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,NULL,0) +#define CRYPTO_r_lock(type) \ + CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,NULL,0) +#define CRYPTO_r_unlock(type) \ + CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,NULL,0) +#define CRYPTO_add(addr,amount,type) \ + CRYPTO_add_lock(addr,amount,type,NULL,0) +#endif #endif #else #define CRYPTO_w_lock(a) @@ -358,14 +371,26 @@ int CRYPTO_is_mem_check_on(void); /* for applications */ +#ifndef NDEBUG #define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) #define MemCheck_stop() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF) +#else +#define MemCheck_start() CRYPTO_MEM_CHECK_OFF +#define MemCheck_stop() CRYPTO_MEM_CHECK_OFF +#endif /* for library-internal use */ +#ifndef NDEBUG #define MemCheck_on() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE) #define MemCheck_off() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE) #define is_MemCheck_on() CRYPTO_is_mem_check_on() +#else +#define MemCheck_on() CRYPTO_MEM_CHECK_OFF +#define MemCheck_off() CRYPTO_MEM_CHECK_OFF +#define is_MemCheck_on() CRYPTO_MEM_CHECK_OFF +#endif +#ifndef NDEBUG #define OPENSSL_malloc(num) CRYPTO_malloc((int)num,__FILE__,__LINE__) #define OPENSSL_strdup(str) CRYPTO_strdup((str),__FILE__,__LINE__) #define OPENSSL_realloc(addr,num) \ @@ -374,11 +399,23 @@ CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__) #define OPENSSL_remalloc(addr,num) \ CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__) +#define OPENSSL_malloc_locked(num) \ + CRYPTO_malloc_locked((int)num,__FILE__,__LINE__) +#else +#define OPENSSL_malloc(num) CRYPTO_malloc((int)num,NULL,0) +#define OPENSSL_strdup(str) CRYPTO_strdup((str),NULL,0) +#define OPENSSL_realloc(addr,num) \ + CRYPTO_realloc((char *)addr,(int)num,NULL,0) +#define OPENSSL_realloc_clean(addr,old_num,num) \ + CRYPTO_realloc_clean(addr,old_num,num,NULL,0) +#define OPENSSL_remalloc(addr,num) \ + CRYPTO_remalloc((char **)addr,(int)num,NULL,0) +#define OPENSSL_malloc_locked(num) \ + CRYPTO_malloc_locked((int)num,NULL,0) +#endif #define OPENSSL_freeFunc CRYPTO_free #define OPENSSL_free(addr) CRYPTO_free(addr) -#define OPENSSL_malloc_locked(num) \ - CRYPTO_malloc_locked((int)num,__FILE__,__LINE__) #define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr) #define OPENSSL_MALLOC_MAX_NELEMS(type) (((1U<<(sizeof(int)*8-1))-1)/sizeof(type)) @@ -504,8 +541,13 @@ void CRYPTO_set_mem_debug_options(long bits); long CRYPTO_get_mem_debug_options(void); +#ifndef NDEBUG #define CRYPTO_push_info(info) \ CRYPTO_push_info_(info, __FILE__, __LINE__); +#else +#define CRYPTO_push_info(info) \ + CRYPTO_push_info_(info, NULL, 0); +#endif int CRYPTO_push_info_(const char *info, const char *file, int line); int CRYPTO_pop_info(void); int CRYPTO_remove_all_info(void); @@ -543,7 +585,11 @@ /* die if we have to */ void OpenSSLDie(const char *file,int line,const char *assertion); +#ifndef NDEBUG #define OPENSSL_assert(e) (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1)) +#else +#define OPENSSL_assert(e) +#endif unsigned int *OPENSSL_ia32cap_loc(void); #define OPENSSL_ia32cap ((OPENSSL_ia32cap_loc())[0]) diff -ur openssl-orig/ssl/t1_enc.c openssl-work/ssl/t1_enc.c --- openssl-orig/ssl/t1_enc.c 2014-12-10 17:53:20.000000000 +0300 +++ openssl-work/ssl/t1_enc.c 2014-12-10 17:48:09.000000000 +0300 @@ -734,6 +734,7 @@ ivlen = 0; if (ivlen > 1) { +#ifndef NDEBUG if ( rec->data != rec->input) /* we can't write into the input stream: * Can this ever happen?? (steve) @@ -741,7 +742,9 @@ fprintf(stderr, "%s:%d: rec->data != rec->input\n", __FILE__, __LINE__); - else if (RAND_bytes(rec->input, ivlen) <= 0) + else +#endif + if (RAND_bytes(rec->input, ivlen) <= 0) return -1; } } diff -ur openssl-orig/util/mkerr.pl openssl-work/util/mkerr.pl --- openssl-orig/util/mkerr.pl 2014-12-10 17:53:20.000000000 +0300 +++ openssl-work/util/mkerr.pl 2014-12-10 17:49:24.000000000 +0300 @@ -473,7 +473,11 @@ ${staticloader}void ERR_load_${lib}_strings(void); ${staticloader}void ERR_unload_${lib}_strings(void); ${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line); +#ifndef OPENSSL_NO_ERR #define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__) +#else +#define ${lib}err(f,r) ERR_${lib}_error((f),(r),NULL,0) +#endif EOF }