Browse Source

src: remove unused md_ data members

The code assigned the result of EVP_get_digestbyname() to data members
called md_ that were not used outside the initialization functions.

PR-URL: https://github.com/nodejs/node/pull/7374
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
v6.x
Ben Noordhuis 9 years ago
committed by Jeremiah Senkpiel
parent
commit
25bc7fee34
  1. 34
      src/node_crypto.cc
  2. 6
      src/node_crypto.h

34
src/node_crypto.cc

@ -3585,17 +3585,17 @@ void Hmac::New(const FunctionCallbackInfo<Value>& args) {
void Hmac::HmacInit(const char* hash_type, const char* key, int key_len) { void Hmac::HmacInit(const char* hash_type, const char* key, int key_len) {
HandleScope scope(env()->isolate()); HandleScope scope(env()->isolate());
CHECK_EQ(md_, nullptr); CHECK_EQ(initialised_, false);
md_ = EVP_get_digestbyname(hash_type); const EVP_MD* md = EVP_get_digestbyname(hash_type);
if (md_ == nullptr) { if (md == nullptr) {
return env()->ThrowError("Unknown message digest"); return env()->ThrowError("Unknown message digest");
} }
HMAC_CTX_init(&ctx_); HMAC_CTX_init(&ctx_);
int result = 0; int result = 0;
if (key_len == 0) { if (key_len == 0) {
result = HMAC_Init(&ctx_, "", 0, md_); result = HMAC_Init(&ctx_, "", 0, md);
} else { } else {
result = HMAC_Init(&ctx_, key, key_len, md_); result = HMAC_Init(&ctx_, key, key_len, md);
} }
if (!result) { if (!result) {
return ThrowCryptoError(env(), ERR_get_error()); return ThrowCryptoError(env(), ERR_get_error());
@ -3730,12 +3730,12 @@ void Hash::New(const FunctionCallbackInfo<Value>& args) {
bool Hash::HashInit(const char* hash_type) { bool Hash::HashInit(const char* hash_type) {
CHECK_EQ(md_, nullptr); CHECK_EQ(initialised_, false);
md_ = EVP_get_digestbyname(hash_type); const EVP_MD* md = EVP_get_digestbyname(hash_type);
if (md_ == nullptr) if (md == nullptr)
return false; return false;
EVP_MD_CTX_init(&mdctx_); EVP_MD_CTX_init(&mdctx_);
if (EVP_DigestInit_ex(&mdctx_, md_, nullptr) <= 0) { if (EVP_DigestInit_ex(&mdctx_, md, nullptr) <= 0) {
return false; return false;
} }
initialised_ = true; initialised_ = true;
@ -3881,13 +3881,13 @@ void Sign::New(const FunctionCallbackInfo<Value>& args) {
SignBase::Error Sign::SignInit(const char* sign_type) { SignBase::Error Sign::SignInit(const char* sign_type) {
CHECK_EQ(md_, nullptr); CHECK_EQ(initialised_, false);
md_ = EVP_get_digestbyname(sign_type); const EVP_MD* md = EVP_get_digestbyname(sign_type);
if (!md_) if (md == nullptr)
return kSignUnknownDigest; return kSignUnknownDigest;
EVP_MD_CTX_init(&mdctx_); EVP_MD_CTX_init(&mdctx_);
if (!EVP_SignInit_ex(&mdctx_, md_, nullptr)) if (!EVP_SignInit_ex(&mdctx_, md, nullptr))
return kSignInit; return kSignInit;
initialised_ = true; initialised_ = true;
@ -4087,13 +4087,13 @@ void Verify::New(const FunctionCallbackInfo<Value>& args) {
SignBase::Error Verify::VerifyInit(const char* verify_type) { SignBase::Error Verify::VerifyInit(const char* verify_type) {
CHECK_EQ(md_, nullptr); CHECK_EQ(initialised_, false);
md_ = EVP_get_digestbyname(verify_type); const EVP_MD* md = EVP_get_digestbyname(verify_type);
if (md_ == nullptr) if (md == nullptr)
return kSignUnknownDigest; return kSignUnknownDigest;
EVP_MD_CTX_init(&mdctx_); EVP_MD_CTX_init(&mdctx_);
if (!EVP_VerifyInit_ex(&mdctx_, md_, nullptr)) if (!EVP_VerifyInit_ex(&mdctx_, md, nullptr))
return kSignInit; return kSignInit;
initialised_ = true; initialised_ = true;

6
src/node_crypto.h

@ -500,14 +500,12 @@ class Hmac : public BaseObject {
Hmac(Environment* env, v8::Local<v8::Object> wrap) Hmac(Environment* env, v8::Local<v8::Object> wrap)
: BaseObject(env, wrap), : BaseObject(env, wrap),
md_(nullptr),
initialised_(false) { initialised_(false) {
MakeWeak<Hmac>(this); MakeWeak<Hmac>(this);
} }
private: private:
HMAC_CTX ctx_; /* coverity[member_decl] */ HMAC_CTX ctx_; /* coverity[member_decl] */
const EVP_MD* md_; /* coverity[member_decl] */
bool initialised_; bool initialised_;
}; };
@ -531,14 +529,12 @@ class Hash : public BaseObject {
Hash(Environment* env, v8::Local<v8::Object> wrap) Hash(Environment* env, v8::Local<v8::Object> wrap)
: BaseObject(env, wrap), : BaseObject(env, wrap),
md_(nullptr),
initialised_(false) { initialised_(false) {
MakeWeak<Hash>(this); MakeWeak<Hash>(this);
} }
private: private:
EVP_MD_CTX mdctx_; /* coverity[member_decl] */ EVP_MD_CTX mdctx_; /* coverity[member_decl] */
const EVP_MD* md_; /* coverity[member_decl] */
bool initialised_; bool initialised_;
bool finalized_; bool finalized_;
}; };
@ -557,7 +553,6 @@ class SignBase : public BaseObject {
SignBase(Environment* env, v8::Local<v8::Object> wrap) SignBase(Environment* env, v8::Local<v8::Object> wrap)
: BaseObject(env, wrap), : BaseObject(env, wrap),
md_(nullptr),
initialised_(false) { initialised_(false) {
} }
@ -571,7 +566,6 @@ class SignBase : public BaseObject {
void CheckThrow(Error error); void CheckThrow(Error error);
EVP_MD_CTX mdctx_; /* coverity[member_decl] */ EVP_MD_CTX mdctx_; /* coverity[member_decl] */
const EVP_MD* md_; /* coverity[member_decl] */
bool initialised_; bool initialised_;
}; };

Loading…
Cancel
Save