OpenSSL 0.9.7 stable 2002 05 08 merge

1 files changed, 11 insertions, 6 deletions

diff --git a/src/lib/libcrypto/dsa/dsatest.c b/src/lib/libcrypto/dsa/dsatest.c
index 309a7cda89..12da64f9f4 100644
--- a/src/lib/libcrypto/dsa/dsatest.c
+++ b/src/lib/libcrypto/dsa/dsatest.c
@@ -65,11 +65,12 @@
 #include <openssl/rand.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
-#ifdef WINDOWS
+#include <openssl/engine.h>
+#ifdef OPENSSL_SYS_WINDOWS
 #include "../bio/bss_file.c"
 #endif
 
-#ifdef NO_DSA
+#ifdef OPENSSL_NO_DSA
 int main(int argc, char *argv[])
 {
     printf("No DSA support\n");
@@ -78,7 +79,7 @@ int main(int argc, char *argv[])
 #else
 #include <openssl/dsa.h>
 
-#ifdef WIN16
+#ifdef OPENSSL_SYS_WIN16
 #define MS_CALLBACK     _far _loadds
 #else
 #define MS_CALLBACK
@@ -136,14 +137,16 @@ int main(int argc, char **argv)
         unsigned char sig[256];
         unsigned int siglen;
 
-        ERR_load_crypto_strings();
-        RAND_seed(rnd_seed, sizeof rnd_seed);
-
         if (bio_err == NULL)
                 bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 
+        CRYPTO_malloc_debug_init();
+        CRYPTO_dbg_set_options(V_CRYPTO_MDEBUG_ALL);
         CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 
+        ERR_load_crypto_strings();
+        RAND_seed(rnd_seed, sizeof rnd_seed);
+
         BIO_printf(bio_err,"test generation of DSA parameters\n");
 
         dsa=DSA_generate_parameters(512,seed,20,&counter,&h,dsa_cb,bio_err);
@@ -200,7 +203,9 @@ end:
         if (!ret)
                 ERR_print_errors(bio_err);
         if (dsa != NULL) DSA_free(dsa);
+        CRYPTO_cleanup_all_ex_data();
         ERR_remove_state(0);
+        ERR_free_strings();
         CRYPTO_mem_leaks(bio_err);
         if (bio_err != NULL)
                 {