Skip to content

security: Replace memset with memory_cleanse for sensitive data clearing #34600

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
embetrix wants to merge 1 commit into from
+8 −5
Closed

security: Replace memset with memory_cleanse for sensitive data clearing #34600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions src/crypto/aes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

#include <crypto/aes.h>

#include <support/cleanse.h>

#include <cstring>

extern "C" {
Expand All @@ -17,7 +19,7 @@ AES256Encrypt::AES256Encrypt(const unsigned char key[32])

AES256Encrypt::~AES256Encrypt()
{
memset(&ctx, 0, sizeof(ctx));
memory_cleanse(&ctx, sizeof(ctx));
}

void AES256Encrypt::Encrypt(unsigned char ciphertext[16], const unsigned char plaintext[16]) const
Expand All @@ -32,7 +34,7 @@ AES256Decrypt::AES256Decrypt(const unsigned char key[32])

AES256Decrypt::~AES256Decrypt()
{
memset(&ctx, 0, sizeof(ctx));
memory_cleanse(&ctx, sizeof(ctx));
}

void AES256Decrypt::Decrypt(unsigned char plaintext[16], const unsigned char ciphertext[16]) const
Expand Down Expand Up @@ -131,7 +133,7 @@ int AES256CBCEncrypt::Encrypt(const unsigned char* data, int size, unsigned char

AES256CBCEncrypt::~AES256CBCEncrypt()
{
memset(iv, 0, sizeof(iv));
memory_cleanse(iv, sizeof(iv));
}

AES256CBCDecrypt::AES256CBCDecrypt(const unsigned char key[AES256_KEYSIZE], const unsigned char ivIn[AES_BLOCKSIZE], bool padIn)
Expand All @@ -148,5 +150,5 @@ int AES256CBCDecrypt::Decrypt(const unsigned char* data, int size, unsigned char

AES256CBCDecrypt::~AES256CBCDecrypt()
{
memset(iv, 0, sizeof(iv));
memory_cleanse(iv, sizeof(iv));
}
3 changes: 2 additions & 1 deletion src/key.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <crypto/hmac_sha512.h>
#include <hash.h>
#include <random.h>
#include <support/cleanse.h>

#include <secp256k1.h>
#include <secp256k1_ellswift.h>
Expand Down Expand Up @@ -77,7 +78,7 @@ int ec_seckey_import_der(const secp256k1_context* ctx, unsigned char *out32, con
}
memcpy(out32 + (32 - oslen), seckey, oslen);
if (!secp256k1_ec_seckey_verify(ctx, out32)) {
memset(out32, 0, 32);
memory_cleanse(out32, 32);
return 0;
}
return 1;
Expand Down