jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wolfSSL: Load certificates using 'chain' APIs

Browse source 
This allows the full chain to be loaded.

Signed-off-by: Sean Parkinson <sean@wolfssl.com>
This commit is contained in:
Sean Parkinson 2018-03-29 14:55:55 +10:00 committed by Jouni Malinen
parent fc5e88e3ea
commit 6590d84664
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/crypto/tls_wolfssl.c
View file

@ -470,8 +470,8 @@ static int tls_connection_client_cert(struct tls_connection *conn,
return 0; return 0;
if (client_cert_blob) { if (client_cert_blob) {
if (wolfSSL_use_certificate_buffer(conn->ssl, client_cert_blob, if (wolfSSL_use_certificate_chain_buffer_format(
blob_len, conn->ssl, client_cert_blob, blob_len,
SSL_FILETYPE_ASN1) < 0) { SSL_FILETYPE_ASN1) < 0) {
wpa_printf(MSG_INFO, wpa_printf(MSG_INFO,
"SSL: use client cert DER blob failed"); "SSL: use client cert DER blob failed");
@ -482,11 +482,11 @@ static int tls_connection_client_cert(struct tls_connection *conn,
} }
if (client_cert) { if (client_cert) {
if (wolfSSL_use_certificate_file(conn->ssl, client_cert, if (wolfSSL_use_certificate_chain_file(conn->ssl,
SSL_FILETYPE_PEM) < 0) { client_cert) < 0) {
wpa_printf(MSG_INFO, wpa_printf(MSG_INFO,
"SSL: use client cert PEM file failed"); "SSL: use client cert PEM file failed");
if (wolfSSL_use_certificate_file( if (wolfSSL_use_certificate_chain_file_format(
conn->ssl, client_cert, conn->ssl, client_cert,
SSL_FILETYPE_ASN1) < 0) { SSL_FILETYPE_ASN1) < 0) {
wpa_printf(MSG_INFO, wpa_printf(MSG_INFO,
@ -1370,11 +1370,11 @@ static int tls_global_client_cert(void *ssl_ctx, const char *client_cert)
if (!client_cert) if (!client_cert)
return 0; return 0;
if (wolfSSL_CTX_use_certificate_file(ctx, client_cert, if (wolfSSL_CTX_use_certificate_chain_file_format(ctx, client_cert,
SSL_FILETYPE_ASN1) != SSL_FILETYPE_ASN1) !=
SSL_SUCCESS && SSL_SUCCESS &&
wolfSSL_CTX_use_certificate_file(ctx, client_cert, wolfSSL_CTX_use_certificate_chain_file(ctx, client_cert) !=
SSL_FILETYPE_PEM) != SSL_SUCCESS) { SSL_SUCCESS) {
wpa_printf(MSG_INFO, "Failed to load client certificate"); wpa_printf(MSG_INFO, "Failed to load client certificate");
return -1; return -1;
} }