diff options
author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-12-06 08:09:02 +0100 |
---|---|---|
committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-12-08 07:16:26 +0100 |
commit | abc280172f1cdd44c8dbb8285a67322b9e16a414 (patch) | |
tree | d6fb6542974e6558771bae7c69fe0f1afcbae57b /src | |
parent | 09e9e2bd82d5b82747100ab9163ebadba4cb3972 (diff) | |
download | android-node-v8-abc280172f1cdd44c8dbb8285a67322b9e16a414.tar.gz android-node-v8-abc280172f1cdd44c8dbb8285a67322b9e16a414.tar.bz2 android-node-v8-abc280172f1cdd44c8dbb8285a67322b9e16a414.zip |
crypto: declare int return type for set_field
This commit updates the set_field function pointer to return an int, and
also updates the lambdas with a return statement.
PR-URL: https://github.com/nodejs/node/pull/17468
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'src')
-rw-r--r-- | src/node_crypto.cc | 10 | ||||
-rw-r--r-- | src/node_crypto.h | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/node_crypto.cc b/src/node_crypto.cc index c2433518f1..498443f944 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -5084,7 +5084,7 @@ void DiffieHellman::ComputeSecret(const FunctionCallbackInfo<Value>& args) { } void DiffieHellman::SetKey(const v8::FunctionCallbackInfo<v8::Value>& args, - void (*set_field)(DH*, BIGNUM*), const char* what) { + int (*set_field)(DH*, BIGNUM*), const char* what) { Environment* env = Environment::GetCurrent(args); DiffieHellman* dh; @@ -5107,12 +5107,13 @@ void DiffieHellman::SetKey(const v8::FunctionCallbackInfo<v8::Value>& args, BN_bin2bn(reinterpret_cast<unsigned char*>(Buffer::Data(args[0])), Buffer::Length(args[0]), nullptr); CHECK_NE(num, nullptr); - set_field(dh->dh, num); + CHECK_EQ(1, set_field(dh->dh, num)); } void DiffieHellman::SetPublicKey(const FunctionCallbackInfo<Value>& args) { - SetKey(args, [](DH* dh, BIGNUM* num) { DH_set0_key(dh, num, nullptr); }, + SetKey(args, + [](DH* dh, BIGNUM* num) { return DH_set0_key(dh, num, nullptr); }, "Public key"); } @@ -5123,7 +5124,8 @@ void DiffieHellman::SetPrivateKey(const FunctionCallbackInfo<Value>& args) { // Node. See https://github.com/openssl/openssl/pull/4384. #error "OpenSSL 1.1.0 revisions before 1.1.0g are not supported" #endif - SetKey(args, [](DH* dh, BIGNUM* num) { DH_set0_key(dh, nullptr, num); }, + SetKey(args, + [](DH* dh, BIGNUM* num) { return DH_set0_key(dh, nullptr, num); }, "Private key"); } diff --git a/src/node_crypto.h b/src/node_crypto.h index 836144bf8b..7d8c9032c6 100644 --- a/src/node_crypto.h +++ b/src/node_crypto.h @@ -712,7 +712,7 @@ class DiffieHellman : public BaseObject { const BIGNUM* (*get_field)(const DH*), const char* err_if_null); static void SetKey(const v8::FunctionCallbackInfo<v8::Value>& args, - void (*set_field)(DH*, BIGNUM*), const char* what); + int (*set_field)(DH*, BIGNUM*), const char* what); bool VerifyContext(); bool initialised_; |