Update BfCrypt.cpp #2
Open
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
Cleaning up code using namespace
I needed to add additional namespace reductions from the other night
Updated the namespace using comments
arves100
reviewed
Oct 13, 2024
| @@ -13,7 +13,7 @@ using namespace CryptoPP; // for aes, modes, and filters | |||
| static const unsigned char SREE_KEY[] = { 0x37, 0x34, 0x31, 0x30, 0x39, 0x35, 0x38, 0x31, 0x36, 0x34, 0x33, 0x35, 0x34, 0x38, 0x37, 0x31 }; // 7410958164354871 | |||
| static const unsigned char SREE_IV[] = { 0x42, 0x66, 0x77, 0x34, 0x65, 0x6E, 0x63, 0x72, 0x79, 0x70, 0x65, 0x64, 0x50, 0x61, 0x73, 0x73 }; // Bfw4encrypedPass | |||
|
|
|||
| std::string BfCrypt::CryptSREE(const Json::Value& v) | |||
| string CryptSREE(const Json::Value& v) | |||
There was a problem hiding this comment.
I think automatilly setting the namespace for CryptSREE would make the function think it's not part of a class rather part of function outside of any namespace
| @@ -61,13 +59,13 @@ std::string BfCrypt::CryptGME(const Json::Value& v, const std::string& key) | |||
| byte aeskey[AES::MIN_KEYLENGTH] = { 0x00 }; | |||
| // keys are setted this way because we know that some keys might not have the minimum requirement | |||
| #ifdef _MSC_VER | |||
| memcpy_s(aeskey, _countof(aeskey), key.data(), std::min(key.size(), (size_t)sizeof(aeskey))); | |||
| memcpy_s(aeskey, _countof(aeskey), key.data(), min(key.size(), (size_t)sizeof(aeskey))); | |||
There was a problem hiding this comment.
I remember a compilation error might happend on Windows unless NOMINMAX is defined, is this code buildable with MSVC + Windows?
gimuserver/core/BfCrypt.cpp
Outdated
| #include <drogon/utils/Utilities.h> | ||
|
|
||
| using namespace std; | ||
| using namespace BfCrypt; // for CryptGME and DecryptGME |
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.
Cleaning up code using namespace.
I'm not going to go through an update everything like this. I'm just testing the waters first while I continue to learn C++.
I know the implications of obfuscating too much, but thought it easier to read the code and gave me a good entry point into understanding what you are achieving in the BFCrypt.cpp file.
Could you let me know on discord if something looks off in what I did?