crypto: ensure valid point on elliptic curve in SubtleCrypto.importKey

codebytere · codebytere · commit 3bfd27e48a6f · 2024-10-29T20:44:57.000+01:00
nodejs/node#50234
diff --git a/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch b/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
@@ -253,18 +253,18 @@ index 3fa4a415dc911a13afd90dfb31c1ed4ad0fd268f..fa48dffc31342c44a1c1207b9d4c3dc7
      return EVPKeyCtxPointer();
  
 diff --git a/src/crypto/crypto_keys.cc b/src/crypto/crypto_keys.cc
-index 35474c31bfc2e3692b7ca10e4ed7026b9c275dfb..43c42c14f75018d4705f218fe4ed7e5dacb46bb8 100644
+index 8488fc57faaf722174032c5a927d150c76120d60..c51efc92d4818ee7701b4725585fb7e1d2d644ad 100644
 --- a/src/crypto/crypto_keys.cc
 +++ b/src/crypto/crypto_keys.cc
-@@ -1239,6 +1239,7 @@ void KeyObjectHandle::GetAsymmetricKeyType(
+@@ -1204,6 +1204,7 @@ void KeyObjectHandle::GetAsymmetricKeyType(
  }
  
  bool KeyObjectHandle::CheckEcKeyData() const {
 +#ifndef OPENSSL_IS_BORINGSSL
    MarkPopErrorOnReturn mark_pop_error_on_return;
  
-   const ManagedEVPPKey& key = data_->GetAsymmetricKey();
-@@ -1257,6 +1258,9 @@ bool KeyObjectHandle::CheckEcKeyData() const {
+   const auto& key = data_.GetAsymmetricKey();
+@@ -1220,6 +1221,9 @@ bool KeyObjectHandle::CheckEcKeyData() const {
  #else
    return EVP_PKEY_public_check(ctx.get()) == 1;
  #endif
