diff options
| author | Sam Roberts <vieuxtech@gmail.com> | 2018-11-30 11:20:55 -0800 |
|---|---|---|
| committer | Sam Roberts <vieuxtech@gmail.com> | 2018-12-11 15:28:58 -0800 |
| commit | 2e4a163012d9a960f014935272cd279e5e72a93b (patch) | |
| tree | 759415bea54346777c36d73751e49a45fb8350cc /src/node_crypto.cc | |
| parent | e5878eaf5e6b891907d2cd668637abb4fd389a5e (diff) | |
| download | android-node-v8-2e4a163012d9a960f014935272cd279e5e72a93b.tar.gz android-node-v8-2e4a163012d9a960f014935272cd279e5e72a93b.tar.bz2 android-node-v8-2e4a163012d9a960f014935272cd279e5e72a93b.zip | |
tls: support "BEGIN TRUSTED CERTIFICATE" for ca:
Support the same PEM certificate formats for the ca: option to
tls.createSecureContext() that are supported by openssl when loading a
CAfile.
Fixes: https://github.com/nodejs/node/issues/24761
PR-URL: https://github.com/nodejs/node/pull/24733
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'src/node_crypto.cc')
| -rw-r--r-- | src/node_crypto.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 16d958ea88..cf3b524a9d 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -819,7 +819,7 @@ void SecureContext::AddCACert(const FunctionCallbackInfo<Value>& args) { return; X509_STORE* cert_store = SSL_CTX_get_cert_store(sc->ctx_.get()); - while (X509* x509 = PEM_read_bio_X509( + while (X509* x509 = PEM_read_bio_X509_AUX( bio.get(), nullptr, NoPasswordCallback, nullptr)) { if (cert_store == root_cert_store) { cert_store = NewRootCertStore(); |