summaryrefslogtreecommitdiff
path: root/doc/api/tls.md
diff options
context:
space:
mode:
authorSam Roberts <vieuxtech@gmail.com>2018-11-30 11:20:55 -0800
committerSam Roberts <vieuxtech@gmail.com>2018-12-11 15:28:58 -0800
commit2e4a163012d9a960f014935272cd279e5e72a93b (patch)
tree759415bea54346777c36d73751e49a45fb8350cc /doc/api/tls.md
parente5878eaf5e6b891907d2cd668637abb4fd389a5e (diff)
downloadandroid-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 'doc/api/tls.md')
-rw-r--r--doc/api/tls.md7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/api/tls.md b/doc/api/tls.md
index 44ad2bdf2d..9bfe2a902a 100644
--- a/doc/api/tls.md
+++ b/doc/api/tls.md
@@ -1054,6 +1054,9 @@ argument.
<!-- YAML
added: v0.11.13
changes:
+ - version: REPLACEME
+ pr-url: REPLACEME
+ description: The `ca:` option now supports `BEGIN TRUSTED CERTIFICATE`.
- version: v11.4.0
pr-url: https://github.com/nodejs/node/pull/24405
description: The `minVersion` and `maxVersion` can be used to restrict
@@ -1092,8 +1095,8 @@ changes:
certificate can match or chain to.
For self-signed certificates, the certificate is its own CA, and must be
provided.
- For PEM encoded certificates, supported types are "X509 CERTIFICATE", and
- "CERTIFICATE".
+ For PEM encoded certificates, supported types are "TRUSTED CERTIFICATE",
+ "X509 CERTIFICATE", and "CERTIFICATE".
* `cert` {string|string[]|Buffer|Buffer[]} Cert chains in PEM format. One cert
chain should be provided per private key. Each cert chain should consist of
the PEM formatted certificate for a provided private `key`, followed by the