Rewrite aes encryption #257 #264
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
imay
requested changes
Nov 1, 2018
be/src/aes/aes.cpp
Outdated
| @@ -0,0 +1,171 @@ | |||
| // Copyright (c) 2018, Baidu.com, Inc. All Rights Reserved | |||
be/CMakeLists.txt
Outdated
| @@ -585,6 +585,7 @@ if (${MAKE_TEST} STREQUAL "ON") | |||
| add_subdirectory(${TEST_DIR}/exprs) | |||
| add_subdirectory(${TEST_DIR}/runtime) | |||
| add_subdirectory(${TEST_DIR}/http) | |||
| add_subdirectory(${TEST_DIR}/aes) | |||
There was a problem hiding this comment.
I think we don't need this 'aes' directory
you can put aes.h and aes.cpp to be/src/util, and rename these to aes_util.h??
be/src/aes/aes.cpp
Outdated
| } | ||
| } | ||
|
|
||
| int do_decrypt(EVP_CIPHER_CTX* aes_ctx, const EVP_CIPHER* cipher, |
There was a problem hiding this comment.
this function should be static
kangpinghuang
force-pushed
the
master
branch
3 times, most recently
from
1b04f7b to
c5a9a59
Compare
imay
requested changes
Nov 1, 2018
be/src/util/aes_util.cpp
Outdated
| unsigned char encrypt_key[AES_MAX_KEY_LENGTH / 8]; | ||
| aes_create_key(key, key_length, encrypt_key, mode); | ||
|
|
||
| if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv)) { |
There was a problem hiding this comment.
when compare pointer use "cipher != nullptr", compare integer use "ret != 0", check bool use "!is_success"
| aes_create_key(key, key_length, encrypt_key, mode); | ||
|
|
||
| if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv)) { | ||
| return AES_BAD_DATA; |
There was a problem hiding this comment.
when cipher is not null, cipher's memory leak
There was a problem hiding this comment.
cipher can not be delete by manually or it will core dump
be/src/util/aes_util.cpp
Outdated
|
|
||
| const EVP_CIPHER* get_evp_type(const AesMode mode) { | ||
| switch (mode) { | ||
| case AES_128_ECB: |
There was a problem hiding this comment.
the indent is not right, 'case" align with switch, no need to indent
kangpinghuang
force-pushed
the
master
branch
3 times, most recently
from
144219d to
6b97f89
Compare
kangpinghuang
changed the title
Resolve apache#257
imay
approved these changes
Nov 2, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.