Skip to content

(v10.x backport) Backport 12 crypto commits #20706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tniessen wants to merge 12 commits into from
Closed

(v10.x backport) Backport 12 crypto commits #20706

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
40c014f
crypto: allow to restrict valid GCM tag length
tniessen Apr 13, 2018
1cd6fae
crypto: add createCipher/WithIV functions
danbev Apr 19, 2018
8d2b3d2
crypto: add addCipherPrototypeFunctions function
danbev Apr 20, 2018
7ffaf72
crypto: remove rsaPrivate and rename rsaPublic
danbev Apr 20, 2018
1ae5218
src: fix node_crypto.cc compiler warnings
danbev Apr 23, 2018
9e9dad6
test: remove crypto.DEFAULT_ENCODING usage
danbev Apr 23, 2018
3bd5db3
crypto: use kNoAuthTagLength in InitAuthenticated
tniessen Apr 23, 2018
f57543b
crypto: add using directives for v8::Int32, Uint32
tniessen Apr 24, 2018
0259d30
crypto: support authTagLength in GCM encryption
tniessen Apr 15, 2018
bb975aa
crypto: allocate more memory for cipher.update()
yhwang Apr 26, 2018
60c5ada
src: more automatic memory management in node_crypto.cc
addaleax Apr 23, 2018
8177b22
crypto: add test case for AES key wrapping
yhwang May 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
src: fix node_crypto.cc compiler warnings 
Currently the following compiler warnings are issued by clang:

../src/node_crypto.cc:2801:56:
warning: '&&' within '||' [-Wlogical-op-parentheses]
return tag_len == 4 || tag_len == 8 || tag_len >= 12 && tag_len <= 16;
                                    ~~ ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~
../src/node_crypto.cc:2801:56:
note: place parentheses around the '&&' expression to silence this
warning
return tag_len == 4 || tag_len == 8 || tag_len >= 12 && tag_len <= 16;
                                                     ^
../src/node_crypto.cc:2925:51:
warning: '&&' within '||' [-Wlogical-op-parentheses]
    if (cipher->auth_tag_len_ != kNoAuthTagLength &&
        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~
../src/node_crypto.cc:2925:51:
note: place parentheses around the '&&' expression to silence this
warning
    if (cipher->auth_tag_len_ != kNoAuthTagLength &&
                                                  ^

This commit adds parenthesis around these expressions to silence the
warnings.

PR-URL: #20216
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
@danbev @tniessen
danbev authored and tniessen committed May 13, 2018
commit 1ae5218e252f2b37cf69b0cf092286a7931a0b9f
2 changes: 1 addition & 1 deletion src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2791,7 +2791,7 @@ void CipherBase::InitIv(const FunctionCallbackInfo<Value>& 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,
Expand Down