diff options
| author | Tobias Nießen <tniessen@tnie.de> | 2019-11-25 16:44:43 -0400 |
|---|---|---|
| committer | Anna Henningsen <anna@addaleax.net> | 2019-11-30 01:22:50 +0100 |
| commit | f6a4a36f09934c7b02c55e90436ffce71eca4a50 (patch) | |
| tree | 2b3c969381495aa0e0f72d8cec6c56e1abb62ed7 | |
| parent | be3091136161d8c3793dfe53f6e82f96e2b6a177 (diff) | |
| download | android-node-v8-f6a4a36f09934c7b02c55e90436ffce71eca4a50.tar.gz android-node-v8-f6a4a36f09934c7b02c55e90436ffce71eca4a50.tar.bz2 android-node-v8-f6a4a36f09934c7b02c55e90436ffce71eca4a50.zip | |
crypto: automatically manage memory for ECDSA_SIG
Refs: https://github.com/nodejs/node/pull/29292
PR-URL: https://github.com/nodejs/node/pull/30641
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
| -rw-r--r-- | src/node_crypto.cc | 19 | ||||
| -rw-r--r-- | src/node_crypto.h | 1 |
2 files changed, 9 insertions, 11 deletions
diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 4b5e512102..d1bd5471f3 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -5039,20 +5039,18 @@ static AllocatedBuffer ConvertSignatureToP1363(Environment* env, const unsigned char* sig_data = reinterpret_cast<unsigned char*>(signature.data()); - ECDSA_SIG* asn1_sig = d2i_ECDSA_SIG(nullptr, &sig_data, signature.size()); - if (asn1_sig == nullptr) + ECDSASigPointer asn1_sig(d2i_ECDSA_SIG(nullptr, &sig_data, signature.size())); + if (!asn1_sig) return AllocatedBuffer(); AllocatedBuffer buf = env->AllocateManaged(2 * n); unsigned char* data = reinterpret_cast<unsigned char*>(buf.data()); - const BIGNUM* r = ECDSA_SIG_get0_r(asn1_sig); - const BIGNUM* s = ECDSA_SIG_get0_s(asn1_sig); + const BIGNUM* r = ECDSA_SIG_get0_r(asn1_sig.get()); + const BIGNUM* s = ECDSA_SIG_get0_s(asn1_sig.get()); CHECK_EQ(n, static_cast<unsigned int>(BN_bn2binpad(r, data, n))); CHECK_EQ(n, static_cast<unsigned int>(BN_bn2binpad(s, data + n, n))); - ECDSA_SIG_free(asn1_sig); - return buf; } @@ -5069,19 +5067,18 @@ static ByteSource ConvertSignatureToDER( if (signature.length() != 2 * n) return ByteSource(); - ECDSA_SIG* asn1_sig = ECDSA_SIG_new(); - CHECK_NOT_NULL(asn1_sig); + ECDSASigPointer asn1_sig(ECDSA_SIG_new()); + CHECK(asn1_sig); BIGNUM* r = BN_new(); CHECK_NOT_NULL(r); BIGNUM* s = BN_new(); CHECK_NOT_NULL(s); CHECK_EQ(r, BN_bin2bn(sig_data, n, r)); CHECK_EQ(s, BN_bin2bn(sig_data + n, n, s)); - CHECK_EQ(1, ECDSA_SIG_set0(asn1_sig, r, s)); + CHECK_EQ(1, ECDSA_SIG_set0(asn1_sig.get(), r, s)); unsigned char* data = nullptr; - int len = i2d_ECDSA_SIG(asn1_sig, &data); - ECDSA_SIG_free(asn1_sig); + int len = i2d_ECDSA_SIG(asn1_sig.get(), &data); if (len <= 0) return ByteSource(); diff --git a/src/node_crypto.h b/src/node_crypto.h index cd34c309c5..3f14e155da 100644 --- a/src/node_crypto.h +++ b/src/node_crypto.h @@ -72,6 +72,7 @@ using ECGroupPointer = DeleteFnPtr<EC_GROUP, EC_GROUP_free>; using ECPointPointer = DeleteFnPtr<EC_POINT, EC_POINT_free>; using ECKeyPointer = DeleteFnPtr<EC_KEY, EC_KEY_free>; using DHPointer = DeleteFnPtr<DH, DH_free>; +using ECDSASigPointer = DeleteFnPtr<ECDSA_SIG, ECDSA_SIG_free>; extern int VerifyCallback(int preverify_ok, X509_STORE_CTX* ctx); |