Skip to content

fix dh_params_file_name warnings for OpenSSL >= 3.0.0 #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
salvoilmiosi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix dh_params_file_name warnings for OpenSSL >= 3.0.0 #228

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions src/crypto/openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,33 @@ SSL_CTX *create_ssl_context_from_options(struct us_socket_context_options_t opti

if (options.dh_params_file_name) {
/* Set up ephemeral DH parameters. */

#if OPENSSL_VERSION_NUMBER >= 0x30000000
EVP_PKEY *dhparams = NULL;
BIO *paramfile;
paramfile = BIO_new_file(options.dh_params_file_name, "r");

if (paramfile) {
dhparams = EVP_PKEY_new();
if (!PEM_read_bio_Parameters(paramfile, &dhparams)) {
BIO_free(paramfile);
free_ssl_context(ssl_context);
return NULL;
}
BIO_free(paramfile);
} else {
free_ssl_context(ssl_context);
return NULL;
}

const long set_tmp_dh = SSL_CTX_set0_tmp_dh_pkey(ssl_context, dhparams);
EVP_PKEY_free(dhparams);

if (!set_tmp_dh) {
free_ssl_context(ssl_context);
return NULL;
}
#else
DH *dh_2048 = NULL;
FILE *paramfile;
paramfile = fopen(options.dh_params_file_name, "r");
Expand All @@ -515,6 +542,7 @@ SSL_CTX *create_ssl_context_from_options(struct us_socket_context_options_t opti
free_ssl_context(ssl_context);
return NULL;
}
#endif

/* OWASP Cipher String 'A+' (https://www.owasp.org/index.php/TLS_Cipher_String_Cheat_Sheet) */
if (SSL_CTX_set_cipher_list(ssl_context, "DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256") != 1) {
Expand Down