upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-25 10:34:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add RC4 error handling.

Browse Source
This commit is contained in:
Pentarctagon 2022-08-14 18:25:27 -05:00 committed by Pentarctagon
parent a380f9e489
commit e416d28f7f
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/preferences/credentials.cpp
View File

@ -27,6 +27,7 @@
#ifndef __APPLE__
#include <openssl/evp.h>
#include <openssl/err.h>
#else
#include <CommonCrypto/CommonCryptor.h>
#endif
@ -277,8 +278,20 @@ static secure_buffer rc4_crypt(const secure_buffer& text, const secure_buffer& k
// TODO: use EVP_EncryptInit_ex2 once openssl 3.0 is more widespread
EVP_EncryptInit_ex(ctx, EVP_rc4(), NULL, key.data(), NULL);
EVP_EncryptUpdate(ctx, result.data(), &outlen, text.data(), text.size());
EVP_EncryptFinal_ex(ctx, result.data() + outlen, &tmplen);
if(EVP_EncryptUpdate(ctx, result.data(), &outlen, text.data(), text.size()) == 0)
{
ERR_CFG << "EVP_EncryptUpdate failed with error:";
ERR_CFG << ERR_error_string(ERR_get_error(), NULL);
EVP_CIPHER_CTX_free(ctx);
return secure_buffer();
}
if(EVP_EncryptFinal_ex(ctx, result.data() + outlen, &tmplen) == 0)
{
ERR_CFG << "EVP_EncryptFinal failed with error:";
ERR_CFG << ERR_error_string(ERR_get_error(), NULL);
EVP_CIPHER_CTX_free(ctx);
return secure_buffer();
}
EVP_CIPHER_CTX_free(ctx);
#else