summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/net/02_tls.js7
-rw-r--r--tests/specs/future/runtime_api/main.js13
-rw-r--r--tests/specs/future/runtime_api/main.out1
3 files changed, 21 insertions, 0 deletions
diff --git a/ext/net/02_tls.js b/ext/net/02_tls.js
index 4216cbe22..b77b92e26 100644
--- a/ext/net/02_tls.js
+++ b/ext/net/02_tls.js
@@ -153,6 +153,13 @@ function loadTlsKeyPair(api, {
keyFile,
privateKey,
}) {
+ if (internals.future) {
+ certFile = undefined;
+ certChain = undefined;
+ keyFile = undefined;
+ privateKey = undefined;
+ }
+
// Check for "pem" format
if (keyFormat !== undefined && keyFormat !== "pem") {
throw new TypeError('If `keyFormat` is specified, it must be "pem"');
diff --git a/tests/specs/future/runtime_api/main.js b/tests/specs/future/runtime_api/main.js
index a79185e92..b44291218 100644
--- a/tests/specs/future/runtime_api/main.js
+++ b/tests/specs/future/runtime_api/main.js
@@ -92,6 +92,19 @@ try {
}
}
+// Note: this could throw with a `Deno.errors.NotFound` error if `keyFile` and
+// `certFile` were used.
+try {
+ Deno.listenTls({ port: tlsPort, keyFile: "foo", certFile: "foo" });
+} catch (error) {
+ if (
+ error instanceof Deno.errors.InvalidData &&
+ error.message ===
+ "Deno.listenTls requires a key: Error creating TLS certificate"
+ ) {
+ console.log("Deno.ListenTlsOptions.(keyFile|certFile) do nothing");
+ }
+}
console.log("Deno.customInspect is", Deno.customInspect);
self.close();
diff --git a/tests/specs/future/runtime_api/main.out b/tests/specs/future/runtime_api/main.out
index 1bc41c026..07b588495 100644
--- a/tests/specs/future/runtime_api/main.out
+++ b/tests/specs/future/runtime_api/main.out
@@ -34,4 +34,5 @@ Deno.TlsListener.prototype.rid is undefined
Deno.TlsConn.prototype.rid is undefined
Deno.FsWatcher.prototype.rid is undefined
Deno.FsFile constructor is illegal
+Deno.ListenTlsOptions.(keyFile|certFile) do nothing
Deno.customInspect is undefined