Skip to content
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

Taking out EVP_CipherFinal_ex and tiny extra checks #38

Merged
merged 2 commits into from
Apr 16, 2019
Merged

Taking out EVP_CipherFinal_ex and tiny extra checks #38

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf2e672
Logic error, EVP_CipherFinal_ex never happened
luigoalma Apr 16, 2019
f5ecae3
Also won't need this.
luigoalma Apr 16, 2019
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
13 changes: 7 additions & 6 deletions fuse3ds/hac/_crypto.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ int (WINAPI *EVP_CipherInit_ex)(void*, void*, void*, const void*, void*, int) =
int (WINAPI *EVP_CIPHER_CTX_key_length)(void*) = NULL;
void (WINAPI *EVP_CIPHER_CTX_set_padding)(void*, int) = NULL;
int (WINAPI *EVP_CipherUpdate)(void*, void*, int*, const void*, int) = NULL;
int (WINAPI *EVP_CipherFinal_ex)(void*, void*, int*) = NULL;
void (WINAPI *EVP_CIPHER_CTX_free)(void*) = NULL;
unsigned long (WINAPI *OpenSSL_version_num)() = NULL;

Expand All @@ -270,7 +269,7 @@ bool openssl_crypt(const u8* key, const u8* data, u8* out) {
if(EVP_CIPHER_CTX_key_length(ctx) != 16) break;
EVP_CIPHER_CTX_set_padding(ctx, 0);
int foo;
if(!EVP_CipherUpdate(ctx, out, &foo, data, 16) && !EVP_CipherFinal_ex(ctx, out + foo, &foo)) break;
if(!EVP_CipherUpdate(ctx, out, &foo, data, 16)) break;
ret = true;
} while(0);
EVP_CIPHER_CTX_free(ctx);
Expand Down Expand Up @@ -530,7 +529,11 @@ static void load_lcrypto() {
#else
static const char* const names[] = {};
#endif
loadlock.lock();
try {loadlock.lock();} catch(...) {return;}
if(!lib_to_load) {
loadlock.unlock();
return;
}
bool found = false;
try {
std::string *paths[2] = {nullptr, nullptr};
Expand All @@ -553,14 +556,12 @@ static void load_lcrypto() {
lcrypto.GetFunctionPtr("EVP_CIPHER_CTX_key_length", (void**)&EVP_CIPHER_CTX_key_length);
lcrypto.GetFunctionPtr("EVP_CIPHER_CTX_set_padding", (void**)&EVP_CIPHER_CTX_set_padding);
lcrypto.GetFunctionPtr("EVP_CipherUpdate", (void**)&EVP_CipherUpdate);
lcrypto.GetFunctionPtr("EVP_CipherFinal_ex", (void**)&EVP_CipherFinal_ex);
lcrypto.GetFunctionPtr("EVP_CIPHER_CTX_free", (void**)&EVP_CIPHER_CTX_free);
lcrypto.GetFunctionPtr("OpenSSL_version_num", (void**)&OpenSSL_version_num);

if(!EVP_CIPHER_CTX_new || !EVP_aes_128_ecb || !EVP_CipherInit_ex ||
!EVP_CIPHER_CTX_key_length || !EVP_CIPHER_CTX_set_padding ||
!EVP_CipherUpdate || !EVP_CipherFinal_ex || !EVP_CIPHER_CTX_free ||
!OpenSSL_version_num) {
!EVP_CipherUpdate || !EVP_CIPHER_CTX_free || !OpenSSL_version_num) {
lcrypto.Unload();
continue;
}
Expand Down