commit 15d52ddb559223c87fe7bfaa5675b9e4ee05098f
author Bodo Möller <bodo@openssl.org> Thu Nov 02 10:35:10 2000 +0000
committer Bodo Möller <bodo@openssl.org> Thu Nov 02 10:35:10 2000 +0000
tree f6f41c0539128a21377776a1073240974f42d96f
parent d48f487e2c704e933328c9bafe437a53c44641f4

Never call load_dh_param(NULL) because this leads to an illegal
fopen(NULL).

apps/s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 61a77df..7b6a2b0 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -416,9 +416,6 @@
 	int state=0;
 	SSL_METHOD *meth=NULL;
 	ENGINE *e=NULL;
-#ifndef NO_DH
-	DH *dh=NULL;
-#endif
 
 #if !defined(NO_SSL2) && !defined(NO_SSL3)
 	meth=SSLv23_server_method();
@@ -682,7 +679,13 @@
 #ifndef NO_DH
 	if (!no_dhe)
 		{
-		dh=load_dh_param(dhfile ? dhfile : s_cert_file);
+		DH *dh=NULL;
+
+		if (dhfile)
+			dh = load_dh_param(dhfile);
+		else if (s_cert_file)
+			dh = load_dh_param(s_cert_file);
+
 		if (dh != NULL)
 			{
 			BIO_printf(bio_s_out,"Setting temp DH parameters\n");