generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
fopen(NULL).
This commit is contained in:
Bodo Möller 2000-11-02 10:35:10 +00:00
parent d48f487e2c
commit 15d52ddb55
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -4,6 +4,9 @@
Changes between 0.9.6 and 0.9.7 [xx XXX 2000] Changes between 0.9.6 and 0.9.7 [xx XXX 2000]
*) Never call load_dh_param(NULL) in s_server.
[Bodo Moeller]
*) Add engine application. It can currently list engines by name and *) Add engine application. It can currently list engines by name and
identity, and test if they are actually available. identity, and test if they are actually available.
[Richard Levitte] [Richard Levitte]

11
apps/s_server.c
View File

@ -416,9 +416,6 @@ int MAIN(int argc, char *argv[])
int state=0; int state=0;
SSL_METHOD *meth=NULL; SSL_METHOD *meth=NULL;
ENGINE *e=NULL; ENGINE *e=NULL;
#ifndef NO_DH
DH *dh=NULL;
#endif
#if !defined(NO_SSL2) && !defined(NO_SSL3) #if !defined(NO_SSL2) && !defined(NO_SSL3)
meth=SSLv23_server_method(); meth=SSLv23_server_method();
@ -682,7 +679,13 @@ bad:
#ifndef NO_DH #ifndef NO_DH
if (!no_dhe) 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) if (dh != NULL)
{ {
BIO_printf(bio_s_out,"Setting temp DH parameters\n"); BIO_printf(bio_s_out,"Setting temp DH parameters\n");