WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

add AES get key to ARMv8 port and add check for BASE 64 encode to tests

pull/786/head
Jacob Barthelmeh 2017-03-10 09:55:27 -07:00
parent dee3159f0f
commit bb81ea804c
2 changed files with 28 additions and 2 deletions
Show Stats 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 /* HAVE_AES_DECRYPT */
#endif /* WOLFSSL_AES_DIRECT */ #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 */ #endif /* NO_AES */

4
wolfcrypt/test/test.c
View File

@ -381,7 +381,7 @@ int wolfcrypt_test(void* args)
else else
printf( "error test passed!\n"); printf( "error test passed!\n");
#ifndef NO_CODING #if !defined(NO_CODING) && defined(WOLFSSL_BASE64_ENCODE)
if ( (ret = base64_test()) != 0) if ( (ret = base64_test()) != 0)
return err_sys("base64 test failed!\n", ret); return err_sys("base64 test failed!\n", ret);
else else
@ -914,7 +914,7 @@ int error_test()
return 0; return 0;
} }
#ifndef NO_CODING #if !defined(NO_CODING) && defined(WOLFSSL_BASE64_ENCODE)
int base64_test() int base64_test()
{ {
int ret; int ret;