]> git.kaiwu.me - njs.git/commitdiff
WebCrypto: reject asymmetric ECDH and X25519 derived keys
authorDmitry Volyntsev <xeioex@nginx.com>
Wed, 18 Nov 2026 01:16:50 +0000 (17:16 -0800)
committerDmitry Volyntsev <xeioexception@gmail.com>
Thu, 19 Nov 2026 06:07:22 +0000 (22:07 -0800)
Previously, ECDH and X25519 deriveKey() accepted any recognized
derived key algorithm, but the result always stores raw bytes.
With an asymmetric algorithm such as ECDSA, later operations treated
these bytes as an asymmetric key.

Reject derived key algorithms whose keys are not raw. HMAC, AES,
HKDF, and PBKDF2 remain supported.

The issue was introduced for ECDH in 1b69415d (0.9.1) and inherited
by X25519 in 744039e2 (0.9.7).

external/njs_webcrypto_module.c
external/qjs_webcrypto_module.c
test/webcrypto/derive_ecdh.t.mjs

index 6f0859bc2e77653e66ba5430ce0f9eb123e249ff..353931650bc77cdf9a22e7984083361063d5c397 100644 (file)
@@ -1674,6 +1674,12 @@ njs_ext_derive_ecdh(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
             goto fail;
         }
 
+        if (njs_slow_path(!dalg->raw)) {
+            njs_vm_type_error(vm, "not implemented deriveKey: \"%V\"",
+                              njs_algorithm_string(dalg));
+            goto fail;
+        }
+
         value = njs_vm_object_prop(vm, dobject, &string_length, &lvalue);
         if (value == NULL) {
             njs_vm_type_error(vm, "derivedKeyAlgorithm.length is not provided");
index 48b91bf67883f90db767c7ae67c36710f02e4bf3..16f5dd8acc040a3f8a86a1c6488753b3e2c3928b 100644 (file)
@@ -2093,6 +2093,12 @@ qjs_derive_ecdh(JSContext *cx, JSValueConst *argv, int argc, int derive_key,
             goto fail;
         }
 
+        if (!dalg->raw) {
+            JS_ThrowTypeError(cx, "not implemented deriveKey: \"%s\"",
+                              qjs_algorithm_string(dalg));
+            goto fail;
+        }
+
         value = JS_GetPropertyStr(cx, dobject, "length");
         if (JS_IsException(value)) {
             goto fail;
index 50c1925eed937c386d319cbf9bffa2ab8be67c84..7e0a07713c4ec81f2c555f98a46483824e7d1f59 100644 (file)
@@ -181,8 +181,70 @@ let ecdh_key_tsuite = {
     ]
 };
 
+async function testDerivedKeyType(params) {
+    let pair = await load_key_pair('ec');
+    let peer = await load_key_pair('ec2');
+    let ecdh = { name: "ECDH", public: peer.publicKey };
+    let derived = { name: params.name, length: 256 };
+
+    if (params.name === "ECDSA") {
+        derived.namedCurve = "P-256";
+    }
+
+    let key;
+
+    try {
+        key = await crypto.subtle.deriveKey(ecdh, pair.privateKey, derived,
+                                            false, params.usage);
+
+    } catch (e) {
+        if (params.reject
+            && (e.name === "TypeError" || e.name === "NotSupportedError"))
+        {
+            return "SUCCESS";
+        }
+
+        throw e;
+    }
+
+    if (params.reject) {
+        throw Error("deriveKey accepted an asymmetric derived key");
+    }
+
+    let bits = await crypto.subtle.deriveBits(ecdh, pair.privateKey, 256);
+    let imported = await crypto.subtle.importKey("raw", bits, params.name,
+                                                 false, ["deriveBits"]);
+    let alg = { name: params.name, hash: "SHA-256",
+                salt: new Uint8Array(16), info: new Uint8Array(0),
+                iterations: 1 };
+
+    let a = await crypto.subtle.deriveBits(alg, key, 128);
+    let b = await crypto.subtle.deriveBits(alg, imported, 128);
+
+    if (Buffer.from(a).toString("hex") !== Buffer.from(b).toString("hex")) {
+        throw Error(`${params.name} derived key does not match deriveBits`);
+    }
+
+    return "SUCCESS";
+}
+
+let ecdh_key_type_tsuite = {
+    name: "ECDH-DeriveKey type",
+    skip: () => (!has_buffer() || !has_webcrypto()),
+    T: testDerivedKeyType,
+    opts: {
+        usage: ["deriveBits"]
+    },
+    tests: [
+        { name: "HKDF" },
+        { name: "PBKDF2" },
+        { name: "ECDSA", usage: ["sign"], reject: true },
+    ]
+};
+
 run([
     ecdh_bits_tsuite,
     ecdh_key_tsuite,
+    ecdh_key_type_tsuite,
 ])
 .then($DONE, $DONE);