Skip to content

Commit 841e8f4

Browse files
panvadanielleadams
panva
authored and
danielleadams
committed
crypto: fix "Invalid JWK" error messages
PR-URL: #36200 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
1 parent 39d0ced commit 841e8f4

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

‎src/crypto/crypto_dsa.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ std::shared_ptr<KeyObjectData> ImportJWKDsaKey(
192192
!q_value->IsString() ||
193193
!q_value->IsString() ||
194194
(!x_value->IsUndefined() && !x_value->IsString())) {
195-
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JSK DSA key");
195+
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JWK DSA key");
196196
return std::shared_ptr<KeyObjectData>();
197197
}
198198

@@ -210,14 +210,14 @@ std::shared_ptr<KeyObjectData> ImportJWKDsaKey(
210210
p.ToBN().release(),
211211
q.ToBN().release(),
212212
g.ToBN().release())) {
213-
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JSK DSA key");
213+
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JWK DSA key");
214214
return std::shared_ptr<KeyObjectData>();
215215
}
216216

217217
if (type == kKeyTypePrivate) {
218218
ByteSource x = ByteSource::FromEncodedString(env, x_value.As<String>());
219219
if (!DSA_set0_key(dsa.get(), nullptr, x.ToBN().release())) {
220-
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JSK DSA key");
220+
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JWK DSA key");
221221
return std::shared_ptr<KeyObjectData>();
222222
}
223223
}

‎src/crypto/crypto_ecdh.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -680,15 +680,15 @@ std::shared_ptr<KeyObjectData> ImportJWKEcKey(
680680
if (!x_value->IsString() ||
681681
!y_value->IsString() ||
682682
(!d_value->IsUndefined() && !d_value->IsString())) {
683-
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JSK EC key");
683+
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JWK EC key");
684684
return std::shared_ptr<KeyObjectData>();
685685
}
686686

687687
KeyType type = d_value->IsString() ? kKeyTypePrivate : kKeyTypePublic;
688688

689689
ECKeyPointer ec(EC_KEY_new_by_curve_name(nid));
690690
if (!ec) {
691-
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JSK EC key");
691+
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JWK EC key");
692692
return std::shared_ptr<KeyObjectData>();
693693
}
694694

@@ -699,14 +699,14 @@ std::shared_ptr<KeyObjectData> ImportJWKEcKey(
699699
ec.get(),
700700
x.ToBN().get(),
701701
y.ToBN().get())) {
702-
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JSK EC key");
702+
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JWK EC key");
703703
return std::shared_ptr<KeyObjectData>();
704704
}
705705

706706
if (type == kKeyTypePrivate) {
707707
ByteSource d = ByteSource::FromEncodedString(env, d_value.As<String>());
708708
if (!EC_KEY_set_private_key(ec.get(), d.ToBN().get())) {
709-
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JSK EC key");
709+
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JWK EC key");
710710
return std::shared_ptr<KeyObjectData>();
711711
}
712712
}

‎src/crypto/crypto_rsa.cc‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -422,12 +422,12 @@ std::shared_ptr<KeyObjectData> ImportJWKRsaKey(
422422
!jwk->Get(env->context(), env->jwk_d_string()).ToLocal(&d_value) ||
423423
!n_value->IsString() ||
424424
!e_value->IsString()) {
425-
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JSK RSA key");
425+
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JWK RSA key");
426426
return std::shared_ptr<KeyObjectData>();
427427
}
428428

429429
if (!d_value->IsUndefined() && !d_value->IsString()) {
430-
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JSK RSA key");
430+
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JWK RSA key");
431431
return std::shared_ptr<KeyObjectData>();
432432
}
433433

@@ -443,7 +443,7 @@ std::shared_ptr<KeyObjectData> ImportJWKRsaKey(
443443
n.ToBN().release(),
444444
e.ToBN().release(),
445445
nullptr)) {
446-
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JSK RSA key");
446+
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JWK RSA key");
447447
return std::shared_ptr<KeyObjectData>();
448448
}
449449

@@ -459,7 +459,7 @@ std::shared_ptr<KeyObjectData> ImportJWKRsaKey(
459459
!jwk->Get(env->context(), env->jwk_dp_string()).ToLocal(&dp_value) ||
460460
!jwk->Get(env->context(), env->jwk_dq_string()).ToLocal(&dq_value) ||
461461
!jwk->Get(env->context(), env->jwk_qi_string()).ToLocal(&qi_value)) {
462-
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JSK RSA key");
462+
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JWK RSA key");
463463
return std::shared_ptr<KeyObjectData>();
464464
}
465465

@@ -468,7 +468,7 @@ std::shared_ptr<KeyObjectData> ImportJWKRsaKey(
468468
!dp_value->IsString() ||
469469
!dq_value->IsString() ||
470470
!qi_value->IsString()) {
471-
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JSK RSA key");
471+
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JWK RSA key");
472472
return std::shared_ptr<KeyObjectData>();
473473
}
474474

@@ -486,7 +486,7 @@ std::shared_ptr<KeyObjectData> ImportJWKRsaKey(
486486
dp.ToBN().release(),
487487
dq.ToBN().release(),
488488
qi.ToBN().release())) {
489-
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JSK RSA key");
489+
THROW_ERR_CRYPTO_INVALID_JWK(env, "Invalid JWK RSA key");
490490
return std::shared_ptr<KeyObjectData>();
491491
}
492492
}
@@ -547,4 +547,3 @@ void Initialize(Environment* env, Local<Object> target) {
547547
} // namespace RSAAlg
548548
} // namespace crypto
549549
} // namespace node
550-

0 commit comments

Comments
 (0)