Commit 3ef0a5b
quic: remove CryptoKey support from session keys option
PR-URL: #62335
Refs: #55293
Refs: #62321
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>1 parent bfff8cb commit 3ef0a5b
3 files changed
Lines changed: 7 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1197,9 +1197,13 @@ True to enable TLS keylogging output. | |||
| 1197 | 1197 | ||
| 1198 | 1198 | <!-- YAML | |
| 1199 | 1199 | added: v23.8.0 | |
| 1200 | + changes: | ||
| 1201 | + - version: REPLACEME | ||
| 1202 | + pr-url: https://github.com/nodejs/node/pull/62335 | ||
| 1203 | + description: CryptoKey is no longer accepted. | ||
| 1200 | 1204 | --> | |
| 1201 | 1205 | ||
| 1202 | - * Type: {KeyObject|CryptoKey|KeyObject\[]|CryptoKey\[]} | ||
| 1206 | + * Type: {KeyObject|KeyObject\[]} | ||
| 1203 | 1207 | ||
| 1204 | 1208 | The TLS crypto keys to use for sessions. | |
| 1205 | 1209 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -98,7 +98,6 @@ const { | |||
| 98 | 98 | ||
| 99 | 99 | const { | |
| 100 | 100 | isKeyObject, | |
| 101 | - isCryptoKey, | ||
| 102 | 101 | } = require('internal/crypto/keys'); | |
| 103 | 102 | ||
| 104 | 103 | const { | |
@@ -143,7 +142,6 @@ const { | |||
| 143 | 142 | kVersionNegotiation, | |
| 144 | 143 | kInspect, | |
| 145 | 144 | kKeyObjectHandle, | |
| 146 | - kKeyObjectInner, | ||
| 147 | 145 | kWantsHeaders, | |
| 148 | 146 | kWantsTrailers, | |
| 149 | 147 | } = require('internal/quic/symbols'); | |
@@ -187,7 +185,6 @@ const onSessionHandshakeChannel = dc.channel('quic.session.handshake'); | |||
| 187 | 185 | /** | |
| 188 | 186 | * @typedef {import('../socketaddress.js').SocketAddress} SocketAddress | |
| 189 | 187 | * @typedef {import('../crypto/keys.js').KeyObject} KeyObject | |
| 190 | - * @typedef {import('../crypto/keys.js').CryptoKey} CryptoKey | ||
| 191 | 188 | */ | |
| 192 | 189 | ||
| 193 | 190 | /** | |
@@ -260,7 +257,7 @@ const onSessionHandshakeChannel = dc.channel('quic.session.handshake'); | |||
| 260 | 257 | * @property {boolean} [verifyClient] Verify the client | |
| 261 | 258 | * @property {boolean} [tlsTrace] Enable TLS tracing | |
| 262 | 259 | * @property {boolean} [verifyPrivateKey] Verify the private key | |
| 263 | - * @property {KeyObject|CryptoKey|Array<KeyObject|CryptoKey>} [keys] The keys | ||
| 260 | + * @property {KeyObject|KeyObject[]} [keys] The keys | ||
| 264 | 261 | * @property {ArrayBuffer|ArrayBufferView|Array<ArrayBuffer|ArrayBufferView>} [certs] The certificates | |
| 265 | 262 | * @property {ArrayBuffer|ArrayBufferView|Array<ArrayBuffer|ArrayBufferView>} [ca] The certificate authority | |
| 266 | 263 | * @property {ArrayBuffer|ArrayBufferView|Array<ArrayBuffer|ArrayBufferView>} [crl] The certificate revocation list | |
@@ -2171,13 +2168,8 @@ function processTlsOptions(tls, forServer) { | |||
| 2171 | 2168 | throw new ERR_INVALID_ARG_VALUE('options.keys', key, 'must be a private key'); | |
| 2172 | 2169 | } | |
| 2173 | 2170 | ArrayPrototypePush(keyHandles, key[kKeyObjectHandle]); | |
| 2174 | - } else if (isCryptoKey(key)) { | ||
| 2175 | - if (key.type !== 'private') { | ||
| 2176 | - throw new ERR_INVALID_ARG_VALUE('options.keys', key, 'must be a private key'); | ||
| 2177 | - } | ||
| 2178 | - ArrayPrototypePush(keyHandles, key[kKeyObjectInner][kKeyObjectHandle]); | ||
| 2179 | 2171 | } else { | |
| 2180 | - throw new ERR_INVALID_ARG_TYPE('options.keys', ['KeyObject', 'CryptoKey'], key); | ||
| 2172 | + throw new ERR_INVALID_ARG_TYPE('options.keys', 'KeyObject', key); | ||
| 2181 | 2173 | } | |
| 2182 | 2174 | } | |
| 2183 | 2175 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -18,7 +18,6 @@ const { | |||
| 18 | 18 | ||
| 19 | 19 | const { | |
| 20 | 20 | kHandle: kKeyObjectHandle, | |
| 21 | - kKeyObject: kKeyObjectInner, | ||
| 22 | 21 | } = require('internal/crypto/util'); | |
| 23 | 22 | ||
| 24 | 23 | // Symbols used to hide various private properties and methods from the | |
@@ -61,7 +60,6 @@ module.exports = { | |||
| 61 | 60 | kHeaders, | |
| 62 | 61 | kInspect, | |
| 63 | 62 | kKeyObjectHandle, | |
| 64 | - kKeyObjectInner, | ||
| 65 | 63 | kListen, | |
| 66 | 64 | kNewSession, | |
| 67 | 65 | kNewStream, | |
0 commit comments