feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #786 from JacobBarthelmeh/Testing

Browse Source 
Testing
This commit is contained in:
toddouska
2017-03-10 17:03:24 -08:00
committed by GitHub
parent 5a803730b8 93f1e7cf2e
commit 91737ceb3f
3 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wolfcrypt/src/port/arm/armv8-aes.c
View File

@@ -4658,5 +4658,31 @@ int wc_AesGcmSetKey(Aes* aes, const byte* key, word32 len)
#endif /* HAVE_AES_DECRYPT */
#endif /* WOLFSSL_AES_DIRECT */
int wc_AesGetKeySize(Aes* aes, word32* keySize)
{
int ret = 0;
if (aes == NULL || keySize == NULL) {
return BAD_FUNC_ARG;
}
switch (aes->rounds) {
case 10:
*keySize = 16;
break;
case 12:
*keySize = 24;
break;
case 14:
*keySize = 32;
break;
default:
*keySize = 0;
ret = BAD_FUNC_ARG;
}
return ret;
}
#endif /* NO_AES */

10
wolfcrypt/test/test.c
View File

@@ -381,7 +381,7 @@ int wolfcrypt_test(void* args)
else
printf( "error test passed!\n");
#ifndef NO_CODING
#if !defined(NO_CODING) && defined(WOLFSSL_BASE64_ENCODE)
if ( (ret = base64_test()) != 0)
return err_sys("base64 test failed!\n", ret);
else
@@ -914,7 +914,7 @@ int error_test()
return 0;
}
#ifndef NO_CODING
#if !defined(NO_CODING) && defined(WOLFSSL_BASE64_ENCODE)
int base64_test()
{
int ret;
@@ -1883,7 +1883,7 @@ int hash_test(void)
ret = wc_HashUpdate(&hash, typesBad[i], data, sizeof(data));
if (ret != BAD_FUNC_ARG)
return -4120 - i;
ret = wc_HashFinal(&hash, typesBad[i], data);
ret = wc_HashFinal(&hash, typesBad[i], out);
if (ret != BAD_FUNC_ARG)
return -4130 - i;
}
@@ -1902,7 +1902,7 @@ int hash_test(void)
ret = wc_HashUpdate(&hash, typesGood[i], data, sizeof(data));
if (ret != exp_ret)
return -4150 - i;
ret = wc_HashFinal(&hash, typesGood[i], data);
ret = wc_HashFinal(&hash, typesGood[i], out);
if (ret != exp_ret)
return -4160 - i;
ret = wc_HashGetOID(typesGood[i]);
@@ -10178,7 +10178,7 @@ static int ecc_sig_test(WC_RNG* rng, ecc_key* key)
int ret;
word32 sigSz;
int size;
byte out[65];
byte out[ECC_MAX_SIG_SIZE];
byte in[] = "Everyone gets Friday off.";
word32 inLen = (word32)XSTRLEN((char*)in);

4
wolfcrypt/user-crypto/src/rsa.c
View File

@@ -1956,7 +1956,7 @@ int wc_RsaFlattenPublicKey(RsaKey* key, byte* e, word32* eSz, byte* n,
return USER_CRYPTO_ERROR;
/* sz is in bits change to bytes */
sz = (sz / bytSz) + (sz % bytSz);
sz = (sz / bytSz) + ((sz % bytSz)? 1 : 0);
if (*eSz < (word32)sz)
return USER_CRYPTO_ERROR;
@@ -1973,7 +1973,7 @@ int wc_RsaFlattenPublicKey(RsaKey* key, byte* e, word32* eSz, byte* n,
return USER_CRYPTO_ERROR;
/* sz is in bits change to bytes */
sz = (sz / bytSz) + (sz % bytSz);
sz = (sz / bytSz) + ((sz % bytSz)? 1: 0);
if (*nSz < (word32)sz)
return USER_CRYPTO_ERROR;