wrapKey() uses the same serializer as exportKey(), but it bypasses
its format check. This can route a key to a serializer that expects
a different native key representation. Check the format in the
shared export path before dispatching to a serializer.
The issue was introduced in
f42b2683 (0.9.7).
goto fail;
}
- if (njs_slow_path(!(fmt & key->alg->fmt))) {
- njs_vm_type_error(vm, "unsupported key fmt \"%V\" for \"%V\" key",
- njs_format_string(fmt),
- njs_algorithm_string(key->alg));
- goto fail;
- }
-
- if (njs_slow_path(!key->extractable)) {
- njs_vm_type_error(vm, "provided key cannot be extracted");
- goto fail;
- }
-
ret = njs_webcrypto_export_key_raw(vm, key, fmt, njs_value_arg(&value));
if (njs_slow_path(ret != NJS_OK)) {
goto fail;
njs_int_t ret;
PKCS8_PRIV_KEY_INFO *pkcs8;
+ if (njs_slow_path(!(fmt & key->alg->fmt))) {
+ njs_vm_type_error(vm, "unsupported key fmt \"%V\" for \"%V\" key",
+ njs_format_string(fmt),
+ njs_algorithm_string(key->alg));
+ return NJS_ERROR;
+ }
+
+ if (njs_slow_path(!key->extractable)) {
+ njs_vm_type_error(vm, "provided key cannot be extracted");
+ return NJS_ERROR;
+ }
+
switch (fmt) {
case NJS_KEY_FORMAT_JWK:
switch (key->alg->type) {
JSValue ret;
PKCS8_PRIV_KEY_INFO *pkcs8;
+ if (!(fmt & key->alg->fmt)) {
+ JS_ThrowTypeError(cx, "unsupported key fmt \"%s\" for \"%s\" key",
+ qjs_format_string(fmt),
+ qjs_algorithm_string(key->alg));
+ return JS_EXCEPTION;
+ }
+
+ if (!key->extractable) {
+ JS_ThrowTypeError(cx, "provided key cannot be extracted");
+ return JS_EXCEPTION;
+ }
+
switch (fmt) {
case QJS_KEY_FORMAT_JWK:
switch (key->alg->type) {
return JS_EXCEPTION;
}
- if (!(fmt & key->alg->fmt)) {
- JS_ThrowTypeError(cx, "unsupported key fmt \"%s\" for \"%s\" key",
- qjs_format_string(fmt),
- qjs_algorithm_string(key->alg));
- return JS_EXCEPTION;
- }
-
- if (!key->extractable) {
- JS_ThrowTypeError(cx, "provided key cannot be extracted");
- return JS_EXCEPTION;
- }
-
return qjs_webcrypto_export_key_raw(cx, key, fmt);
}
break;
case 'wrapKey':
- await crypto.subtle.wrapKey('JWK', key, wrapping_key, 'AES-KW');
+ await crypto.subtle.wrapKey(params.format || 'JWK', key,
+ wrapping_key, 'AES-KW');
break;
default:
}
} catch (e) {
+ if (params.format) {
+ return 'SUCCESS';
+ }
+
if (!(e instanceof TypeError) || !e.message.includes('JWK')) {
throw Error(`unexpected ${params.op} error: ${e}`);
}
return 'SUCCESS';
}
- throw Error(`${params.op} accepted unknown key format`);
+ throw Error(`${params.op} accepted invalid key format`);
}
let key_format_tsuite = {
- name: 'unknown key format',
+ name: 'invalid key format',
skip: async () => !await has_webcrypto_algorithm('AES-KW', 128),
T: test,
tests: [
{op: 'exportKey'},
{op: 'wrapKey'},
{op: 'unwrapKey'},
+ {op: 'wrapKey', format: 'pkcs8'},
],
};