diff options
Diffstat (limited to 'crypto/openssl/crypto/dh/dhtest.c')
| -rw-r--r-- | crypto/openssl/crypto/dh/dhtest.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/crypto/openssl/crypto/dh/dhtest.c b/crypto/openssl/crypto/dh/dhtest.c index a38465d..2723774 100644 --- a/crypto/openssl/crypto/dh/dhtest.c +++ b/crypto/openssl/crypto/dh/dhtest.c @@ -59,7 +59,10 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifdef WINDOWS + +#include "../e_os.h" + +#ifdef OPENSSL_SYS_WINDOWS #include "../bio/bss_file.c" #endif #include <openssl/crypto.h> @@ -68,7 +71,7 @@ #include <openssl/rand.h> #include <openssl/err.h> -#ifdef NO_DH +#ifdef OPENSSL_NO_DH int main(int argc, char *argv[]) { printf("No DH support\n"); @@ -77,14 +80,14 @@ int main(int argc, char *argv[]) #else #include <openssl/dh.h> -#ifdef WIN16 +#ifdef OPENSSL_SYS_WIN16 #define MS_CALLBACK _far _loadds #else #define MS_CALLBACK #endif static void MS_CALLBACK cb(int p, int n, void *arg); -#ifdef NO_STDIO +#ifdef OPENSSL_NO_STDIO #define APPS_WIN16 #include "bss_file.c" #endif @@ -100,14 +103,18 @@ int main(int argc, char *argv[]) int i,alen,blen,aout,bout,ret=1; BIO *out; -#ifdef WIN32 + CRYPTO_malloc_debug_init(); + CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL); + CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); + +#ifdef OPENSSL_SYS_WIN32 CRYPTO_malloc_init(); #endif RAND_seed(rnd_seed, sizeof rnd_seed); out=BIO_new(BIO_s_file()); - if (out == NULL) exit(1); + if (out == NULL) EXIT(1); BIO_set_fp(out,stdout,BIO_NOCLOSE); a=DH_generate_parameters(64,DH_GENERATOR_5,cb,out); @@ -188,7 +195,10 @@ err: if(b != NULL) DH_free(b); if(a != NULL) DH_free(a); BIO_free(out); - exit(ret); + CRYPTO_cleanup_all_ex_data(); + ERR_remove_state(0); + CRYPTO_mem_leaks_fp(stderr); + EXIT(ret); return(ret); } |
