Skip to content

Only set certificate file credentials when files are provided #250

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Only set certificate file credentials when files are provided #250

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
41 changes: 21 additions & 20 deletions src/supplemental/quic/quic_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,23 +270,27 @@ quic_load_sdk_config(BOOLEAN Unsecure)
char *key_path = node->tls.keyfile;
char *password = node->tls.key_password;

if (password) {
QUIC_CERTIFICATE_FILE_PROTECTED *CertFile =
(QUIC_CERTIFICATE_FILE_PROTECTED *) malloc(sizeof(QUIC_CERTIFICATE_FILE_PROTECTED));
CertFile->CertificateFile = cert_path;
CertFile->PrivateKeyFile = key_path;
CertFile->PrivateKeyPassword = password;
CredConfig.CertificateFileProtected = CertFile;
CredConfig.Type =
QUIC_CREDENTIAL_TYPE_CERTIFICATE_FILE_PROTECTED;
} else {
QUIC_CERTIFICATE_FILE *CertFile =
(QUIC_CERTIFICATE_FILE_PROTECTED *) malloc(sizeof(QUIC_CERTIFICATE_FILE_PROTECTED));
CertFile->CertificateFile = cert_path;
CertFile->PrivateKeyFile = key_path;
CredConfig.CertificateFile = CertFile;
CredConfig.Type =
QUIC_CREDENTIAL_TYPE_CERTIFICATE_FILE;
// Only setup certificate files if we have actual paths (not empty strings)
if (cert_path && strlen(cert_path) > 0 && key_path && strlen(key_path) > 0) {
if (password) {
QUIC_CERTIFICATE_FILE_PROTECTED *CertFile =
(QUIC_CERTIFICATE_FILE_PROTECTED *) malloc(sizeof(QUIC_CERTIFICATE_FILE_PROTECTED));
CertFile->CertificateFile = cert_path;
CertFile->PrivateKeyFile = key_path;
CertFile->PrivateKeyPassword = password;
CredConfig.CertificateFileProtected = CertFile;
CredConfig.Type =
QUIC_CREDENTIAL_TYPE_CERTIFICATE_FILE_PROTECTED;
} else {
QUIC_CERTIFICATE_FILE *CertFile =
(QUIC_CERTIFICATE_FILE_PROTECTED *) malloc(sizeof(QUIC_CERTIFICATE_FILE_PROTECTED));
CertFile->CertificateFile = cert_path;
CertFile->PrivateKeyFile = key_path;
CredConfig.CertificateFile = CertFile;
CredConfig.Type =
QUIC_CREDENTIAL_TYPE_CERTIFICATE_FILE;
}
CredConfig.Flags |= QUIC_CREDENTIAL_FLAG_INDICATE_CERTIFICATE_RECEIVED;
}

BOOLEAN verify = (node->tls.verify_peer == true ? 1 : 0);
Expand All @@ -298,9 +302,6 @@ quic_load_sdk_config(BOOLEAN Unsecure)
CredConfig.Flags |= QUIC_CREDENTIAL_FLAG_INDICATE_CERTIFICATE_RECEIVED;
CredConfig.Flags |= QUIC_CREDENTIAL_FLAG_NO_CERTIFICATE_VALIDATION;
}

CredConfig.Type = QUIC_CREDENTIAL_TYPE_CERTIFICATE_FILE;
CredConfig.Flags |= QUIC_CREDENTIAL_FLAG_INDICATE_CERTIFICATE_RECEIVED;
} else {
CredConfig.Flags |= QUIC_CREDENTIAL_FLAG_NO_CERTIFICATE_VALIDATION;
log_warn("No quic TLS/SSL credentials was specified.");
Expand Down