details: https://github.com/nginx/njs/commit/74ef8d95ff9c1f4b2362436e6b12094c9e0b5299 branches: master commit: 74ef8d95ff9c1f4b2362436e6b12094c9e0b5299 user: Dmitry Volyntsev <xei...@nginx.com> date: Wed, 12 Feb 2025 18:13:54 -0800 description: QuickJS: added missed OPENSSL context for errors in WebCrypto.
--- external/qjs_webcrypto_module.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/external/qjs_webcrypto_module.c b/external/qjs_webcrypto_module.c index 6e820887..3cb3d2b2 100644 --- a/external/qjs_webcrypto_module.c +++ b/external/qjs_webcrypto_module.c @@ -3242,14 +3242,14 @@ qjs_webcrypto_import_key(JSContext *cx, JSValueConst this_val, int argc, case QJS_KEY_FORMAT_PKCS8: bio = BIO_new_mem_buf(key_data.start, key_data.length); if (bio == NULL) { - JS_ThrowTypeError(cx, "BIO_new_mem_buf() failed"); + qjs_webcrypto_error(cx, "BIO_new_mem_buf() failed"); goto fail; } pkcs8 = d2i_PKCS8_PRIV_KEY_INFO_bio(bio, NULL); if (pkcs8 == NULL) { BIO_free(bio); - JS_ThrowTypeError(cx, "d2i_PKCS8_PRIV_KEY_INFO_bio() failed"); + qjs_webcrypto_error(cx, "d2i_PKCS8_PRIV_KEY_INFO_bio() failed"); goto fail; } @@ -3257,7 +3257,7 @@ qjs_webcrypto_import_key(JSContext *cx, JSValueConst this_val, int argc, if (pkey == NULL) { PKCS8_PRIV_KEY_INFO_free(pkcs8); BIO_free(bio); - JS_ThrowTypeError(cx, "EVP_PKCS82PKEY() failed"); + qjs_webcrypto_error(cx, "EVP_PKCS82PKEY() failed"); goto fail; } @@ -3272,7 +3272,7 @@ qjs_webcrypto_import_key(JSContext *cx, JSValueConst this_val, int argc, start = key_data.start; pkey = d2i_PUBKEY(NULL, &start, key_data.length); if (pkey == NULL) { - JS_ThrowTypeError(cx, "d2i_PUBKEY() failed"); + qjs_webcrypto_error(cx, "d2i_PUBKEY() failed"); goto fail; } @@ -3720,7 +3720,7 @@ qjs_convert_p1363_to_der(JSContext *cx, EVP_PKEY *pkey, u_char *p1363, if (len < 0) { js_free(cx, data); - JS_ThrowTypeError(cx, "i2d_ECDSA_SIG() failed"); + qjs_webcrypto_error(cx, "i2d_ECDSA_SIG() failed"); goto fail; } _______________________________________________ nginx-devel mailing list nginx-devel@nginx.org https://mailman.nginx.org/mailman/listinfo/nginx-devel