skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

bzero is nonstandard. Replace with memset_s.

Browse Source
This commit is contained in:
Maarten Billemont
2017-09-24 13:14:16 -04:00
parent 0a024b2594
commit fafe56166e
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/c/aes.c
View File

@@ -487,7 +487,7 @@ void AES_ECB_encrypt(uint8_t *output, const uint8_t *input, const uint32_t lengt
// The next function call encrypts the PlainText with the Key using AES algorithm.
Cipher();
bzero( RoundKey, keyExpSize );
memset_s( RoundKey, keyExpSize, 0, keyExpSize );
}
void AES_ECB_decrypt(uint8_t *output, const uint8_t *input, const uint32_t length, const uint8_t *key)
@@ -502,7 +502,7 @@ void AES_ECB_decrypt(uint8_t *output, const uint8_t *input, const uint32_t lengt
InvCipher();
bzero( RoundKey, keyExpSize );
memset_s( RoundKey, keyExpSize, 0, keyExpSize );
}
@@ -560,7 +560,7 @@ void AES_CBC_encrypt_buffer(uint8_t* output, uint8_t* input, uint32_t length, co
Cipher();
}
bzero( RoundKey, keyExpSize );
memset_s( RoundKey, keyExpSize, 0, keyExpSize );
}
void AES_CBC_decrypt_buffer(uint8_t* output, uint8_t* input, uint32_t length, const uint8_t* key, const uint8_t* iv)
@@ -599,7 +599,7 @@ void AES_CBC_decrypt_buffer(uint8_t* output, uint8_t* input, uint32_t length, co
InvCipher();
}
bzero( RoundKey, keyExpSize );
memset_s( RoundKey, keyExpSize, 0, keyExpSize );
}
#endif // #if defined(AES_CBC) && (AES_CBC == 1)

10
core/c/mpw-util.c
View File

@@ -217,12 +217,12 @@ uint8_t const *mpw_kdf_blake2b(const size_t subkeySize, const uint8_t *key, cons
}
uint8_t saltBuf[crypto_generichash_blake2b_SALTBYTES];
bzero( saltBuf, sizeof saltBuf );
memset( saltBuf, 0, sizeof saltBuf );
if (id)
mpw_uint64( id, saltBuf );
uint8_t personalBuf[crypto_generichash_blake2b_PERSONALBYTES];
bzero( personalBuf, sizeof saltBuf );
memset( personalBuf, 0, sizeof personalBuf );
if (personal && strlen( personal ))
memcpy( personalBuf, personal, strlen( personal ) );
@@ -274,7 +274,7 @@ static uint8_t const *mpw_aes(bool encrypt, const uint8_t *key, const size_t key
// IV = zero
uint8_t iv[16];
bzero( (void *)iv, sizeof( iv ) );
memset( iv, 0, sizeof iv );
// Add PKCS#7 padding
uint32_t aesSize = (uint32_t)*bufSize;
@@ -289,8 +289,8 @@ static uint8_t const *mpw_aes(bool encrypt, const uint8_t *key, const size_t key
AES_CBC_encrypt_buffer( resultBuf, aesBuf, aesSize, key, iv );
else
AES_CBC_decrypt_buffer( resultBuf, aesBuf, aesSize, key, iv );
bzero( aesBuf, aesSize );
bzero( iv, 16 );
memset_s( aesBuf, aesSize, 0, aesSize );
memset_s( iv, 16, 0, 16 );
// Truncate PKCS#7 padding
if (encrypt)