From 754ee994eeb5e3684d0ec84cc4e9445dc8af165f Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 23 Apr 2018 18:32:10 +0200 Subject: [PATCH] src: fix compiler warnings in node_crypto.cc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add parentheses, like my compiler suggests. In the `IsValidGCMTagLength()` case I’m pretty sure that this grouping is the correct one, because it matches the earlier code; in the other case it would be good to have explicit confirmation. Refs: https://github.com/nodejs/node/pull/20039 --- src/node_crypto.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 255dc6e2d42e64..7918c889430aef 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -2798,7 +2798,7 @@ void CipherBase::InitIv(const FunctionCallbackInfo& args) { static bool IsValidGCMTagLength(unsigned int tag_len) { - return tag_len == 4 || tag_len == 8 || tag_len >= 12 && tag_len <= 16; + return tag_len == 4 || tag_len == 8 || (tag_len >= 12 && tag_len <= 16); } bool CipherBase::InitAuthenticated(const char *cipher_type, int iv_len, @@ -2922,8 +2922,8 @@ void CipherBase::SetAuthTag(const FunctionCallbackInfo& args) { unsigned int tag_len = Buffer::Length(args[0]); const int mode = EVP_CIPHER_CTX_mode(cipher->ctx_); if (mode == EVP_CIPH_GCM_MODE) { - if (cipher->auth_tag_len_ != kNoAuthTagLength && - cipher->auth_tag_len_ != tag_len || + if ((cipher->auth_tag_len_ != kNoAuthTagLength && + cipher->auth_tag_len_ != tag_len) || !IsValidGCMTagLength(tag_len)) { char msg[50]; snprintf(msg, sizeof(msg),