DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

OpenSSL: Allow ca_cert_blob in PEM format

Browse source 
GnuTLS backend already accepts CA cert blobs in both DER and PEM
formats. Implement similar trial-and-error handling in OpenSSL backend.

Signed-off-by: Santtu Lakkala <santtu.lakkala@jolla.com>
This commit is contained in:
Santtu Lakkala 2019-05-27 10:06:28 +03:00 • committed by Jouni Malinen
parent 2080f4c779
commit 8ba809f67b
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/crypto/tls_openssl.c
View file

@ -2577,9 +2577,23 @@ static int tls_connection_ca_cert(struct tls_data *data,
(const unsigned char **) &ca_cert_blob, (const unsigned char **) &ca_cert_blob,
ca_cert_blob_len); ca_cert_blob_len);
if (cert == NULL) { if (cert == NULL) {
tls_show_errors(MSG_WARNING, __func__, BIO *bio = BIO_new_mem_buf(ca_cert_blob,
"Failed to parse ca_cert_blob"); ca_cert_blob_len);
return -1;
if (bio) {
cert = PEM_read_bio_X509(bio, NULL, NULL, NULL);
BIO_free(bio);
}
if (!cert) {
tls_show_errors(MSG_WARNING, __func__,
"Failed to parse ca_cert_blob");
return -1;
}
while (ERR_get_error()) {
/* Ignore errors from DER conversion. */
}
} }
if (!X509_STORE_add_cert(SSL_CTX_get_cert_store(ssl_ctx), if (!X509_STORE_add_cert(SSL_CTX_get_cert_store(ssl_ctx),