9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

openssl: change how we load DH parameters

Browse source 
The code already assumes the presence of fopen(3) and errno, and, by
extension, fclose(3) and strerror(3), so just use those instead of the
BIO wrappers.

Additionally, don't fail to initialise if the DH file does exist but
parsing it fails, as per the pre-existing comment about them being
optional.
This commit is contained in:
Aaron Jones 2016-05-25 21:46:34 +00:00
parent 4d5a902f08
commit 0763237d5f
No known key found for this signature in database
GPG key ID: 6E854C0FAAD4CEA4
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
librb/src/openssl.c
View file

@ -452,26 +452,25 @@ rb_setup_ssl_server(const char *certfile, const char *keyfile, const char *dhfil
if(dhfile != NULL) if(dhfile != NULL)
{ {
/* DH parameters aren't necessary, but they are nice..if they didn't pass one..that is their problem */ /* DH parameters aren't necessary, but they are nice..if they didn't pass one..that is their problem */
BIO *bio = BIO_new_file(dhfile, "r"); FILE *fp = fopen(dhfile, "r");
if(bio != NULL) DH *dh = NULL;
if(fp == NULL)
{ {
DH *dh = PEM_read_bio_DHparams(bio, NULL, NULL, NULL); rb_lib_log("rb_setup_ssl_server: Error loading DH params file [%s]: %s",
if(dh == NULL) dhfile, strerror(errno));
{
rb_lib_log
("rb_setup_ssl_server: Error loading DH params file [%s]: %s",
dhfile, get_ssl_error(ERR_get_error()));
BIO_free(bio);
return 0;
} }
BIO_free(bio); else if(PEM_read_DHparams(fp, &dh, NULL, NULL) == NULL)
SSL_CTX_set_tmp_dh(ssl_server_ctx, dh);
DH_free(dh);
}
else
{ {
rb_lib_log("rb_setup_ssl_server: Error loading DH params file [%s]: %s", rb_lib_log("rb_setup_ssl_server: Error loading DH params file [%s]: %s",
dhfile, get_ssl_error(ERR_get_error())); dhfile, get_ssl_error(ERR_get_error()));
fclose(fp);
}
else
{
SSL_CTX_set_tmp_dh(ssl_server_ctx, dh);
DH_free(dh);
fclose(fp);
} }
} }