Merge pull request #1219 from JacobBarthelmeh/master

fix unused variable warning
This commit is contained in:
dgarske
2017-11-09 14:33:49 -08:00
committed by GitHub
2 changed files with 9 additions and 0 deletions

View File

@ -7869,6 +7869,9 @@ int wc_AesXtsEncrypt(XtsAes* xaes, byte* out, const byte* in, word32 sz,
if (blocks > 0) { if (blocks > 0) {
byte tmp[AES_BLOCK_SIZE]; byte tmp[AES_BLOCK_SIZE];
XMEMSET(tmp, 0, AES_BLOCK_SIZE); /* set to 0's in case of improper AES
* key setup passed to encrypt direct*/
wc_AesEncryptDirect(tweak, tmp, i); wc_AesEncryptDirect(tweak, tmp, i);
while (blocks > 0) { while (blocks > 0) {
@ -7960,6 +7963,9 @@ int wc_AesXtsDecrypt(XtsAes* xaes, byte* out, const byte* in, word32 sz,
byte tmp[AES_BLOCK_SIZE]; byte tmp[AES_BLOCK_SIZE];
byte stl = (sz % AES_BLOCK_SIZE); byte stl = (sz % AES_BLOCK_SIZE);
XMEMSET(tmp, 0, AES_BLOCK_SIZE); /* set to 0's in case of improper AES
* key setup passed to decrypt direct*/
wc_AesEncryptDirect(tweak, tmp, i); wc_AesEncryptDirect(tweak, tmp, i);
/* if Stealing then break out of loop one block early to handle special /* if Stealing then break out of loop one block early to handle special

View File

@ -6916,8 +6916,11 @@ static const CertName certDefaultName = {
}; };
#ifdef WOLFSSL_CERT_EXT #ifdef WOLFSSL_CERT_EXT
#if (defined(HAVE_ED25519) && defined(WOLFSSL_TEST_CERT)) || \
defined(HAVE_ECC)
static const char certKeyUsage[] = static const char certKeyUsage[] =
"digitalSignature,nonRepudiation"; "digitalSignature,nonRepudiation";
#endif
#if defined(WOLFSSL_CERT_REQ) || defined(HAVE_NTRU) #if defined(WOLFSSL_CERT_REQ) || defined(HAVE_NTRU)
static const char certKeyUsage2[] = static const char certKeyUsage2[] =
"digitalSignature,nonRepudiation,keyEncipherment,keyAgreement"; "digitalSignature,nonRepudiation,keyEncipherment,keyAgreement";