X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=apps%2Fopenssl.c;h=27073f51c3087293d0b241a4b522e936debef935;hp=bae0c4f0046078d09818771111054d4f3c94e29b;hb=1ad9bdf253c7ce1568abeafd4aa3308bd6ca684c;hpb=ec577822f95a8bca0023c5c77cef1a4916822d4a

diff --git a/apps/openssl.c b/apps/openssl.c
index bae0c4f004..27073f51c3 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -83,18 +83,10 @@
 #endif
 */
 
-#ifndef NOPROTO
 static unsigned long MS_CALLBACK hash(FUNCTION *a);
 static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b);
 static LHASH *prog_init(void );
 static int do_cmd(LHASH *prog,int argc,char *argv[]);
-#else
-static unsigned long MS_CALLBACK hash();
-static int MS_CALLBACK cmp();
-static LHASH *prog_init();
-static int do_cmd();
-#endif
-
 LHASH *config=NULL;
 char *default_config_file=NULL;
 
@@ -144,7 +136,7 @@ int main(int Argc, char *Argv[])
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+	MemCheck_start()
 
 	ERR_load_crypto_strings();
 
@@ -155,7 +147,9 @@ int main(int Argc, char *Argv[])
 	if (p == NULL)
 		{
 		strcpy(config_name,X509_get_default_cert_area());
-		strcat(config_name,"/lib/");
+#ifndef VMS
+		strcat(config_name,"/");
+#endif
 		strcat(config_name,OPENSSL_CONF);
 		p=config_name;
 		}
@@ -225,7 +219,7 @@ int main(int Argc, char *Argv[])
 			}
 		if (ret != 0)
 			BIO_printf(bio_err,"error in %s\n",argv[0]);
-		BIO_flush(bio_err);
+		(void)BIO_flush(bio_err);
 		}
 	BIO_printf(bio_err,"bad exit\n");
 	ret=1;
@@ -242,6 +236,13 @@ end:
 	EVP_cleanup();
 	ERR_free_strings();
 
+#ifdef LEVITTE_DEBUG
+	{
+	/* Just to make sure I get a memory leak I can see :-) */
+	char *p = Malloc(1024);
+	}
+#endif
+
 	CRYPTO_mem_leaks(bio_err);
 	if (bio_err != NULL)
 		{