wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Addressing PR comments typos and cleanup and support HAVE_AES_ECB, Sha1, and Sha224

Browse Source
This commit is contained in:
night1rider
2024-08-01 10:32:08 -06:00
committed by ZackLabPC
parent 2e8cf39feb
commit d714e55a2b
8 changed files with 291 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wolfcrypt/benchmark/benchmark.c
View File

@ -14259,6 +14259,7 @@ void bench_sphincsKeySign(byte level, byte optim)
double current_time(int reset)
{
(void)reset;
return wc_MXC_RTC_Time();
}

42
wolfcrypt/src/aes.c
View File

@ -11508,6 +11508,48 @@ int wc_AesGetKeySize(Aes* aes, word32* keySize)
#elif defined(WOLFSSL_RISCV_ASM)
/* implemented in wolfcrypt/src/port/riscv/riscv-64-aes.c */
#elif defined(MAX3266X_AES)
int wc_AesEcbEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
{
int status;
word32 keySize;
if ((in == NULL) || (out == NULL) || (aes == NULL))
return BAD_FUNC_ARG;
status = wc_AesGetKeySize(aes, &keySize);
if (status != 0) {
return status;
}
status = wc_MXC_TPU_AesEncrypt(in, aes->reg, aes->key, MXC_TPU_MODE_ECB,
sz, out, keySize);
return status;
}
#ifdef HAVE_AES_DECRYPT
int wc_AesEcbDecrypt(Aes* aes, byte* out, const byte* in, word32 sz)
{
int status;
word32 keySize;
if ((in == NULL) || (out == NULL) || (aes == NULL))
return BAD_FUNC_ARG;
status = wc_AesGetKeySize(aes, &keySize);
if (status != 0) {
return status;
}
status = wc_MXC_TPU_AesDecrypt(in, aes->reg, aes->key, MXC_TPU_MODE_ECB,
sz, out, keySize);
return status;
}
#endif /* HAVE_AES_DECRYPT */
#elif defined(WOLFSSL_SCE) && !defined(WOLFSSL_SCE_NO_AES)
/* Software AES - ECB */

10
wolfcrypt/src/port/maxim/README.md
View File

@ -6,7 +6,7 @@ wolfSSL using Analog Devices MAXQ1065, MAX1080, MAX32665 or MAX32666
wolfSSL can be configured to use the MAXQ1065 or MAX1080 cryptographic
controllers. wolfSSL can also be configure to utilize the TPU
(crypto accelerator), MAA (math accelerator), and TRNG available on select
MAX32665 and MAX32666 microcontrollers.
MAX32665 and MAX32666 microcontroller.
Product datasheets, user guides and other resources can be found at
Analog Devices website:
@ -41,7 +41,7 @@ all other operations will use the default software implementations.
The other prerequisite is that a change needs to be made to the Maxim SDK. This
is to use the MAA Math Accelerator, this change only needs to be made if you are
using `#define WOLFSSL_MAX3266X` or `define WOLFSSL_MAX3266X_OLD` by themselves
or you are specifing `#define MAX3266X_MATH`.
or you are specifying `#define MAX3266X_MATH`.
In the SDK you will need to find the underlying function that
`MXC_TPU_MAA_Compute()` from `tpu.h` compute calls in the newer SDK. In the
@ -68,7 +68,7 @@ if you want to know more details on the issue.
## Supported Algos
Using these defines will replace software implentations with a call to the
Using these defines will replace software implementations with a call to the
hardware.
`#define MAX3266X_RNG`
@ -95,7 +95,7 @@ like RSA and ECC key generation):
## Extra Information
For more Verbose info you can use `#define DEBUG_WOLFSSL` in combination with
`#define MAX3266X_VERBOSE` to see if errors are occuring during the hardware
`#define MAX3266X_VERBOSE` to see if errors are occurring during the hardware
setup/
To reproduce benchmark numbers you can use `#define MAX3266X_RTC`.
@ -104,7 +104,7 @@ Do note that this will only work with `#define WOLFSSL_MAX3266X` and not
and not for any other application. Please implement your own rtc/time code for
anything else.
For more infromation about the TPU, MAA, and TRNG please refer to the
For more information about the TPU, MAA, and TRNG please refer to the
[MAX32665/MAX32666 User Guide: UG6971](https://www.analog.com/media/en/technical-documentation/user-guides/max32665max32666-user-guide.pdf)
# MAXQ1065/MAX1080

280
wolfcrypt/src/port/maxim/max3266x.c
View File

@ -42,13 +42,15 @@
#include <wolfcrypt/src/misc.c>
#endif
#if defined(USE_FAST_MATH)
#error MXC Not Compatible with Fast Math
#if defined(USE_FAST_MATH) || defined(USE_INTEGER_HEAP_MATH)
#error MXC Not Compatible with Fast Math or Heap Math
#include <wolfssl/wolfcrypt/tfm.h>
#define MXC_WORD_SIZE DIGIT_BIT
#elif defined(WOLFSSL_SP_MATH_ALL)
#include <wolfssl/wolfcrypt/sp_int.h>
#define MXC_WORD_SIZE SP_WORD_SIZE
#else
#error MXC HW port needs #define WOLFSSL_SP_MATH_ALL
#endif
#define MXC_MAA_MAX_SIZE (2048 / MXC_WORD_SIZE)
@ -79,37 +81,45 @@ int wc_MXC_TPU_Shutdown(void)
}
/* Convert Error Codes Correctly */
/* TODO: Convert to correct wolfCrypt Codes */
/* TODO: Add wolfssl Message Statements to report HW issue on bad return */
/* Convert Error Codes Correctly and Report HW error when */
/* using #define MAX3266X_VERBOSE */
int wc_MXC_error(int *ret)
{
switch(*ret){
case E_SUCCESS:
return 0;
case E_NULL_PTR:
return E_NULL_PTR;
case E_INVALID: /* Process Failed */
return E_INVALID;
MAX3266X_MSG("HW Reported: E_INVALID Error");
*ret = WC_HW_E;
break;
case E_NULL_PTR:
MAX3266X_MSG("HW Reported: E_NULL_PTR Error");
*ret = BAD_FUNC_ARG;
break;
case E_BAD_PARAM:
return BAD_FUNC_ARG;
MAX3266X_MSG("HW Reported: E_BAD_PARAM Error");
*ret = BAD_FUNC_ARG;
break;
case E_BAD_STATE:
return E_BAD_STATE;
MAX3266X_MSG("HW Reported: E_BAD_STATE Error");
*ret = WC_HW_E;
break;
default:
MAX3266X_MSG("HW Reported an Unknown Error");
*ret = WC_HW_E; /* If something else return HW Error */
return *ret;
break;
}
return *ret;
}
#if defined(MAX3266X_RNG)
/* Use this RNG_FAILURE_E for RNG Errors*/
int wc_MXC_TRNG_Random(unsigned char* output, unsigned int sz)
{
if (MXC_TPU_Init(MXC_SYS_PERIPH_CLOCK_TRNG) != 0) {
@ -121,7 +131,7 @@ int wc_MXC_TRNG_Random(unsigned char* output, unsigned int sz)
MAX3266X_MSG("TRNG Hardware Used");
return 0;
}
#endif /* MAX3266x_RNG */
#endif /* MAX3266X_RNG */
#if defined(MAX3266X_AES)
int wc_MXC_TPU_AesEncrypt(const unsigned char* in, const unsigned char* iv,
@ -132,46 +142,46 @@ int wc_MXC_TPU_AesEncrypt(const unsigned char* in, const unsigned char* iv,
int status;
status = wolfSSL_CryptHwMutexLock();
MAX3266X_MSG("AES HW Encryption");
if (status != 0) {
MAX3266X_MSG("Hardware Mutex Failure");
return status;
}
switch (keySize) {
case MXC_AES_KEY_128_LEN:
MXC_TPU_Cipher_Config(mode, MXC_TPU_CIPHER_AES128);
status = MXC_TPU_Cipher_AES_Encrypt((const char*)in,
(const char*)iv, (const char*)enc_key,
MXC_TPU_CIPHER_AES128, mode, data_size, (char*)out);
MAX3266X_MSG("AES HW Acceleration Used: 128 Bit");
break;
case MXC_AES_KEY_192_LEN:
MXC_TPU_Cipher_Config(mode, MXC_TPU_CIPHER_AES192);
status = MXC_TPU_Cipher_AES_Encrypt((const char*)in,
(const char*)iv, (const char*)enc_key,
MXC_TPU_CIPHER_AES192, mode, data_size, (char*)out);
MAX3266X_MSG("AES HW Acceleration Used: 192 Bit");
break;
case MXC_AES_KEY_256_LEN:
MXC_TPU_Cipher_Config(mode, MXC_TPU_CIPHER_AES256);
status = MXC_TPU_Cipher_AES_Encrypt((const char*)in,
(const char*)iv, (const char*)enc_key,
MXC_TPU_CIPHER_AES256, mode, data_size, (char*)out);
MAX3266X_MSG("AES HW Acceleration Used: 256 Bit");
break;
default:
MAX3266X_MSG("AES HW ERROR: Length Not Supported");
wolfSSL_CryptHwMutexUnLock();
return WC_HW_E;
if (status != 0) {
MAX3266X_MSG("Hardware Mutex Failure");
return status;
}
switch (keySize) {
case MXC_AES_KEY_128_LEN:
MXC_TPU_Cipher_Config(mode, MXC_TPU_CIPHER_AES128);
status = MXC_TPU_Cipher_AES_Encrypt((const char*)in,
(const char*)iv, (const char*)enc_key,
MXC_TPU_CIPHER_AES128, mode, data_size, (char*)out);
MAX3266X_MSG("AES HW Acceleration Used: 128 Bit");
break;
case MXC_AES_KEY_192_LEN:
MXC_TPU_Cipher_Config(mode, MXC_TPU_CIPHER_AES192);
status = MXC_TPU_Cipher_AES_Encrypt((const char*)in,
(const char*)iv, (const char*)enc_key,
MXC_TPU_CIPHER_AES192, mode, data_size, (char*)out);
MAX3266X_MSG("AES HW Acceleration Used: 192 Bit");
break;
case MXC_AES_KEY_256_LEN:
MXC_TPU_Cipher_Config(mode, MXC_TPU_CIPHER_AES256);
status = MXC_TPU_Cipher_AES_Encrypt((const char*)in,
(const char*)iv, (const char*)enc_key,
MXC_TPU_CIPHER_AES256, mode, data_size, (char*)out);
MAX3266X_MSG("AES HW Acceleration Used: 256 Bit");
break;
default:
MAX3266X_MSG("AES HW ERROR: Length Not Supported");
wolfSSL_CryptHwMutexUnLock();
return WC_HW_E;
break;
}
wolfSSL_CryptHwMutexUnLock();
if (status != 0) {
MAX3266X_MSG("AES HW Acceleration Error Occured");
MAX3266X_MSG("AES HW Acceleration Error Occurred");
return WC_HW_E;
}
return 0;
}
#ifdef HAVE_AES_DECRYPT
int wc_MXC_TPU_AesDecrypt(const unsigned char* in, const unsigned char* iv,
const unsigned char* dec_key,
MXC_TPU_MODE_TYPE mode, unsigned int data_size,
@ -212,13 +222,13 @@ int wc_MXC_TPU_AesDecrypt(const unsigned char* in, const unsigned char* iv,
}
wolfSSL_CryptHwMutexUnLock();
if (status != 0) {
MAX3266X_MSG("AES HW Acceleration Error Occured");
MAX3266X_MSG("AES HW Acceleration Error Occurred");
return WC_HW_E;
}
return 0;
}
#endif
#endif /* HAVE_AES_DECRYPT */
#endif /* MAX3266X_AES */
#if defined(MAX3266X_SHA)
@ -296,11 +306,11 @@ int wc_MXC_TPU_SHA_GetHash(wc_MXC_Sha *hash, unsigned char* digest,
MAX3266X_MSG("SHA HW Acceleration Used");
wolfSSL_CryptHwMutexUnLock();
if (wc_MXC_error(&status) != 0) {
MAX3266X_MSG("SHA HW Error Occured");
MAX3266X_MSG("SHA HW Error Occurred");
return status;
}
}
/* Error Occured */
/* Error Occurred */
return status;
}
@ -345,11 +355,21 @@ int wc_MXC_TPU_SHA_GetDigest(wc_MXC_Sha *hash, unsigned char* digest,
{
if (hash->msg == 0 && hash->size == 0 && digest != NULL) {
switch(algo) {
#ifndef NO_SHA
case MXC_TPU_HASH_SHA1:
XMEMCPY(digest, MXC_EMPTY_DIGEST_SHA1, WC_SHA_DIGEST_SIZE);
break;
#endif /* NO_SHA */
#ifndef NO_SHA256
case MXC_TPU_HASH_SHA256:
XMEMCPY(digest, MXC_EMPTY_DIGEST_SHA256, WC_SHA256_DIGEST_SIZE);
break;
#endif
#endif /* NO_SHA256 */
#ifdef WOLFSSL_SHA224
case MXC_TPU_HASH_SHA224:
XMEMCPY(digest, MXC_EMPTY_DIGEST_SHA224, WC_SHA224_DIGEST_SIZE);
break;
#endif /* WOLFSSL_SHA224 */
default:
return BAD_FUNC_ARG;
}
@ -358,6 +378,97 @@ int wc_MXC_TPU_SHA_GetDigest(wc_MXC_Sha *hash, unsigned char* digest,
return 0; /* False */
}
#if !defined(NO_SHA)
WOLFSSL_API int wc_InitSha_ex(wc_Sha* sha, void* heap, int devId)
{
if (sha == NULL) {
return BAD_FUNC_ARG;
}
(void)heap;
(void)devId;
return wc_MXC_TPU_SHA_Init((wc_MXC_Sha *)sha);
}
WOLFSSL_API int wc_ShaUpdate(wc_Sha* sha, const unsigned char* data,
unsigned int len)
{
return wc_MXC_TPU_SHA_Update(sha, data, len);
}
WOLFSSL_API int wc_ShaFinal(wc_Sha* sha, unsigned char* hash)
{
return wc_MXC_TPU_SHA_Final((wc_MXC_Sha *)sha, hash,
MXC_TPU_HASH_SHA1);
}
WOLFSSL_API int wc_ShaGetHash(wc_Sha* sha, unsigned char* hash)
{
return wc_MXC_TPU_SHA_GetHash((wc_MXC_Sha *)sha, hash,
MXC_TPU_HASH_SHA1);
}
WOLFSSL_API int wc_ShaCopy(wc_Sha* src, wc_Sha* dst)
{
return wc_MXC_TPU_SHA_Copy((wc_MXC_Sha *)src, (wc_MXC_Sha *)dst);
}
WOLFSSL_API void wc_ShaFree(wc_Sha* sha)
{
wc_MXC_TPU_SHA_Free((wc_MXC_Sha *)sha);
return;
}
#endif /* NO_SHA */
#if defined(WOLFSSL_SHA224)
WOLFSSL_API int wc_InitSha224_ex(wc_Sha224* sha224, void* heap, int devId)
{
if (sha224 == NULL) {
return BAD_FUNC_ARG;
}
(void)heap;
(void)devId;
return wc_MXC_TPU_SHA_Init((wc_MXC_Sha *)sha224);
}
WOLFSSL_API int wc_InitSha224(wc_Sha224* sha224)
{
return wc_InitSha224_ex(sha224, NULL, INVALID_DEVID);
}
WOLFSSL_API int wc_Sha224Update(wc_Sha224* sha224, const unsigned char* data,
unsigned int len)
{
return wc_MXC_TPU_SHA_Update(sha224, data, len);
}
WOLFSSL_API int wc_Sha224Final(wc_Sha224* sha224, unsigned char* hash)
{
return wc_MXC_TPU_SHA_Final((wc_MXC_Sha *)sha224, hash,
MXC_TPU_HASH_SHA224);
}
WOLFSSL_API int wc_Sha224GetHash(wc_Sha224* sha224, unsigned char* hash)
{
return wc_MXC_TPU_SHA_GetHash((wc_MXC_Sha *)sha224, hash,
MXC_TPU_HASH_SHA224);
}
WOLFSSL_API int wc_Sha224Copy(wc_Sha224* src, wc_Sha224* dst)
{
return wc_MXC_TPU_SHA_Copy((wc_MXC_Sha *)src, (wc_MXC_Sha *)dst);
}
WOLFSSL_API void wc_Sha224Free(wc_Sha224* sha224)
{
wc_MXC_TPU_SHA_Free((wc_MXC_Sha *)sha224);
return;
}
#endif /* WOLFSSL_SHA224 */
#if !defined(NO_SHA256)
WOLFSSL_API int wc_InitSha256_ex(wc_Sha256* sha256, void* heap, int devId)
@ -404,13 +515,13 @@ WOLFSSL_API void wc_Sha256Free(wc_Sha256* sha256)
return;
}
#endif
#endif /* NO_SHA256 */
#endif /* MAX3266X_SHA */
#if defined(MAX3266X_MATH)
/* Sets mutex and initializes hardware according to need operation size */
/* Sets mutex and initializes hardware according to needed operation size */
int wc_MXC_MAA_init(unsigned int len)
{
int status;
@ -511,17 +622,20 @@ int wc_MXC_MAA_zeroPad(mp_int* multiplier, mp_int* multiplicand,
/* Create an array to compare values to to check edge for error edge case */
zero_tmp = (mp_digit*)XMALLOC(multiplier->size*sizeof(mp_digit), NULL,
DYNAMIC_TYPE_TMP_BUFFER);
if(zero_tmp == NULL){
MAX3266X_MSG("NULL pointer found after XMALLOC call");
return WC_HW_E;
}
XMEMSET(zero_tmp, 0x00, multiplier->size*sizeof(mp_digit));
/* Check for invalid arguments befor padding */
switch((char)clc){
switch ((char)clc) {
case WC_MXC_TPU_MAA_EXP:
/* Cannot be 0 for a^e mod m operation */
if (XMEMCMP(zero_tmp, exp, (exp->used*sizeof(mp_digit))) == 0) {
XFREE(zero_tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
MAX3266X_MSG("Cannot use Value 0 for Exp");
return BAD_FUNC_ARG;
break;
}
/* Padd out rest of data if used != length to ensure no */
@ -545,13 +659,12 @@ int wc_MXC_MAA_zeroPad(mp_int* multiplier, mp_int* multiplicand,
XFREE(zero_tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
MAX3266X_MSG("Cannot use Value 0 for Exp");
return BAD_FUNC_ARG;
break;
}
/* Padd out rest of data if used != length to ensure no */
/* Pad out rest of data if used != length to ensure no */
/* garbage is used in calculation */
if ((multiplier->dp != NULL) && (multiplier->used < length)) {
MAX3266X_MSG("Zero Padding Multipler Buffer");
MAX3266X_MSG("Zero Padding Multiplier Buffer");
XMEMSET(multiplier->dp + multiplier->used, 0x00,
sizeof(int) * (length - multiplier->used));
}
@ -567,6 +680,8 @@ int wc_MXC_MAA_zeroPad(mp_int* multiplier, mp_int* multiplicand,
}
break;
default:
/* Free the zero array used to check values */
XFREE(zero_tmp, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return BAD_FUNC_ARG; /* Invalid clc given */
}
/* Free the zero array used to check values */
@ -586,7 +701,7 @@ int wc_MXC_MAA_zeroPad(mp_int* multiplier, mp_int* multiplicand,
/* General Control Over MAA Hardware to handle all needed Cases */
int wc_MXC_MAA_math(mp_int* multipler, mp_int* multiplicand, mp_int* exp,
int wc_MXC_MAA_math(mp_int* multiplier, mp_int* multiplicand, mp_int* exp,
mp_int* mod, mp_int* result,
MXC_TPU_MAA_TYPE clc)
{
@ -595,7 +710,7 @@ int wc_MXC_MAA_math(mp_int* multipler, mp_int* multiplicand, mp_int* exp,
mp_int* result_tmp_ptr;
mp_int result_tmp;
/* Check if result shares struct pointer */
if ((multipler == result) || (multiplicand == result) || (exp == result) ||
if ((multiplier == result) || (multiplicand == result) || (exp == result) ||
(mod == result)) {
MAX3266X_MSG("Creating Temp Result Buffer for Hardware");
result_tmp_ptr = &result_tmp; /* Assign point to temp struct */
@ -609,16 +724,16 @@ int wc_MXC_MAA_math(mp_int* multipler, mp_int* multiplicand, mp_int* exp,
}
if (clc == WC_MXC_TPU_MAA_EXP) {
length = wc_MXC_MAA_Largest(5, multipler->used, multiplicand->used,
length = wc_MXC_MAA_Largest(5, multiplier->used, multiplicand->used,
exp->used, mod->used, result->used);
}
else {
length = wc_MXC_MAA_Largest(4, multipler->used, multiplicand->used,
length = wc_MXC_MAA_Largest(4, multiplier->used, multiplicand->used,
mod->used, result->used);
}
/* Zero Pad everything if needed */
ret = wc_MXC_MAA_zeroPad(multipler, multiplicand, exp, mod, result_tmp_ptr,
ret = wc_MXC_MAA_zeroPad(multiplier, multiplicand, exp, mod, result_tmp_ptr,
clc, length);
if (ret != 0) {
MAX3266X_MSG("Zero Padding Failed");
@ -635,7 +750,7 @@ int wc_MXC_MAA_math(mp_int* multipler, mp_int* multiplicand, mp_int* exp,
/* Start Math And Cast to expect types for SDK */
MAX3266X_MSG("Starting Computation in MAA");
ret = MXC_TPU_MAA_Compute(clc, (char *)(multipler->dp),
ret = MXC_TPU_MAA_Compute(clc, (char *)(multiplier->dp),
(char *)(multiplicand->dp),
(char *)(exp->dp), (char *)(mod->dp),
(int *)(result_tmp_ptr->dp),
@ -655,7 +770,7 @@ int wc_MXC_MAA_math(mp_int* multipler, mp_int* multiplicand, mp_int* exp,
}
/* Copy tmp result if needed */
if ((multipler == result) || (multiplicand == result) || (exp == result) ||
if ((multiplier == result) || (multiplicand == result) || (exp == result) ||
(mod == result)) {
mp_copy(result_tmp_ptr, result);
ForceZero(result_tmp_ptr, sizeof(result_tmp_ptr)); /* force zero */
@ -679,51 +794,51 @@ int wc_MXC_MAA_expmod(mp_int* base, mp_int* exp, mp_int* mod,
WC_MXC_TPU_MAA_EXP);
}
int wc_MXC_MAA_sqrmod(mp_int* multipler, mp_int* mod, mp_int* result)
int wc_MXC_MAA_sqrmod(mp_int* multiplier, mp_int* mod, mp_int* result)
{
mp_int multiplicand;
XMEMSET(&multiplicand, 0, sizeof(mp_int));
multiplicand.dp[0] = 0x01;
multiplicand.used = mod->used;
MAX3266X_MSG("Preparing sqrmod MAA HW Call");
return wc_MXC_MAA_math(multipler, &multiplicand, NULL, mod, result,
return wc_MXC_MAA_math(multiplier, &multiplicand, NULL, mod, result,
WC_MXC_TPU_MAA_SQ);
}
int wc_MXC_MAA_mulmod(mp_int* multipler, mp_int* multiplicand, mp_int* mod,
int wc_MXC_MAA_mulmod(mp_int* multiplier, mp_int* multiplicand, mp_int* mod,
mp_int* result)
{
MAX3266X_MSG("Preparing mulmod MAA HW Call");
return wc_MXC_MAA_math(multipler, multiplicand, NULL, mod, result,
return wc_MXC_MAA_math(multiplier, multiplicand, NULL, mod, result,
WC_MXC_TPU_MAA_MUL);
}
int wc_MXC_MAA_sqrmulmod(mp_int* multipler, mp_int* multiplicand,
int wc_MXC_MAA_sqrmulmod(mp_int* multiplier, mp_int* multiplicand,
mp_int* exp, mp_int* mod, mp_int* result)
{
MAX3266X_MSG("Preparing sqrmulmod MAA HW Call");
return wc_MXC_MAA_math(multipler, multiplicand, NULL, mod, result,
return wc_MXC_MAA_math(multiplier, multiplicand, NULL, mod, result,
WC_MXC_TPU_MAA_SQMUL);
}
int wc_MXC_MAA_addmod(mp_int* multipler, mp_int* multiplicand, mp_int* mod,
int wc_MXC_MAA_addmod(mp_int* multiplier, mp_int* multiplicand, mp_int* mod,
mp_int* result)
{
MAX3266X_MSG("Preparing addmod MAA HW Call");
return wc_MXC_MAA_math(multipler, multiplicand, NULL, mod, result,
return wc_MXC_MAA_math(multiplier, multiplicand, NULL, mod, result,
WC_MXC_TPU_MAA_ADD);
}
int wc_MXC_MAA_submod(mp_int* multipler, mp_int* multiplicand, mp_int* mod,
int wc_MXC_MAA_submod(mp_int* multiplier, mp_int* multiplicand, mp_int* mod,
mp_int* result)
{
MAX3266X_MSG("Preparing submod MAA HW Call");
if ((mod->used < multipler->used) || (mod->used < multiplicand->used)) {
if ((mod->used < multiplier->used) || (mod->used < multiplicand->used)) {
MAX3266X_MSG("HW Limitation: Defaulting back to software");
return mxc_submod(multipler, multiplicand, mod, result);
return mxc_submod(multiplier, multiplicand, mod, result);
}
else {
return wc_MXC_MAA_math(multipler, multiplicand, NULL, mod, result,
return wc_MXC_MAA_math(multiplier, multiplicand, NULL, mod, result,
WC_MXC_TPU_MAA_SUB);
}
}
@ -807,7 +922,7 @@ int hw_exptmod(mp_int* base, mp_int* exp, mp_int* mod, mp_int* result)
}
/* No mod function avaliable with hardware, however preform a submod */
/* No mod function available with hardware, however preform a submod */
/* (a - 0) mod m will essentially preform the same operation as a mod m */
int hw_mod(mp_int* a, mp_int* mod, mp_int* result)
{
@ -829,8 +944,7 @@ int hw_sqrmod(mp_int* base, mp_int* mod, mp_int* result)
return wc_MXC_MAA_sqrmod(base, mod, result);
}
#endif
#endif /* MAX3266X_MATH */
#if defined(MAX3266X_RTC)
/* Initialize the RTC */
@ -880,6 +994,7 @@ void wc_MXC_RTC_GetRTCValue(int32_t (*rtcGetFunction)(uint32_t*),
}
/* Function to provide the current time as a double */
/* Returns seconds and millisecond */
double wc_MXC_RTC_Time(void)
{
int32_t err;
@ -897,10 +1012,11 @@ double wc_MXC_RTC_Time(void)
if (err != E_NO_ERROR) {
return (double)err;
}
/* Per the device documentation, subsecond register holds up to 1 second */
/* subsecond register is size 2^12, so divide by 4096 to get milliseconds */
return ((double)rtc_seconds + ((double)rtc_subseconds / 4096));
}
#endif /* MAX3266X_RTC */
#endif /* WOLFSSL_MAX32665 || WOLFSSL_MAX32666 */

10
wolfcrypt/src/sha.c
View File

@ -308,6 +308,10 @@
!defined(WOLFSSL_QNX_CAAM)
/* wolfcrypt/src/port/caam/caam_sha.c */
#elif defined(MAX3266X_SHA)
/* Already brought in by sha.h */
/* #include <wolfssl/wolfcrypt/port/maxim/max3266x.h> */
#elif defined(WOLFSSL_USE_ESP32_CRYPT_HASH_HW) || \
defined(WOLFSSL_USE_ESP32C3_CRYPT_HASH_HW)
@ -1035,6 +1039,8 @@ int wc_InitSha(wc_Sha* sha)
#if !defined(WOLFSSL_HAVE_PSA) || defined(WOLFSSL_PSA_NO_HASH)
#ifndef MAX3266X_SHA
void wc_ShaFree(wc_Sha* sha)
{
if (sha == NULL)
@ -1066,6 +1072,7 @@ void wc_ShaFree(wc_Sha* sha)
#endif
}
#endif /* !MAX3266X_SHA */
#endif /* !defined(WOLFSSL_HAVE_PSA) || defined(WOLFSSL_PSA_NO_HASH) */
#endif /* !WOLFSSL_TI_HASH */
@ -1080,6 +1087,8 @@ void wc_ShaFree(wc_Sha* sha)
#if !defined(WOLFSSL_HAVE_PSA) || defined(WOLFSSL_PSA_NO_HASH)
#ifndef MAX3266X_SHA
/* wc_ShaGetHash get hash value */
int wc_ShaGetHash(wc_Sha* sha, byte* hash)
{
@ -1150,6 +1159,7 @@ int wc_ShaCopy(wc_Sha* src, wc_Sha* dst)
return ret;
}
#endif /* WOLFSSL_RENESAS_RX64_HASH */
#endif /* !MAX3266X_SHA */
#endif /* !defined(WOLFSSL_HAVE_PSA) || defined(WOLFSSL_PSA_NO_HASH) */
#endif /* !defined(WOLFSSL_RENESAS_TSIP_TLS) && \
!defined(WOLFSSL_RENESAS_TSIP_CRYPTONLY) ||

6
wolfcrypt/src/sha256.c
View File

@ -1965,6 +1965,9 @@ static int InitSha256(wc_Sha256* sha256)
#elif defined(WOLFSSL_HAVE_PSA) && !defined(WOLFSSL_PSA_NO_HASH)
/* implemented in wolfcrypt/src/port/psa/psa_hash.c */
#elif defined(MAX3266X_SHA)
/* implemented in wolfcrypt/src/port/maxim/max3266x.c */
#elif defined(WOLFSSL_RENESAS_RX64_HASH)
/* implemented in wolfcrypt/src/port/Renesas/renesas_rx64_hw_sha.c */
@ -2355,6 +2358,9 @@ int wc_Sha224_Grow(wc_Sha224* sha224, const byte* in, int inSz)
#elif defined(WOLFSSL_HAVE_PSA) && !defined(WOLFSSL_PSA_NO_HASH)
/* implemented in wolfcrypt/src/port/psa/psa_hash.c */
#elif defined(MAX3266X_SHA)
/* implemented in wolfcrypt/src/port/maxim/max3266x.c */
#else
int wc_Sha224GetHash(wc_Sha224* sha224, byte* hash)

2
wolfcrypt/src/wc_port.c
View File

@ -257,7 +257,7 @@ int wolfCrypt_Init(void)
#if defined(MAX3266X_RTC)
ret = wc_MXC_RTC_Init();
if (ret != 0){
if (ret != 0) {
WOLFSSL_MSG("MXC RTC Init Failed");
return WC_HW_E;
}

29
wolfssl/wolfcrypt/port/maxim/max3266x.h
View File

@ -224,6 +224,33 @@
unsigned char hash[WOLFSSL_MAX_HASH_SIZE];
} wc_MXC_Sha;
#if !defined(NO_SHA)
typedef wc_MXC_Sha wc_Sha;
#define WC_SHA_TYPE_DEFINED
/* Define the SHA digest for an empty string */
/* as a constant byte array */
static const unsigned char MXC_EMPTY_DIGEST_SHA1[20] = {
0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, 0x0d,
0x32, 0x55, 0xbf, 0xef, 0x95, 0x60, 0x18, 0x90,
0xaf, 0xd8, 0x07, 0x09};
#endif /* NO_SHA */
#if defined(WOLFSSL_SHA224)
typedef wc_MXC_Sha wc_Sha224;
#define WC_SHA224_TYPE_DEFINED
/* Define the SHA-224 digest for an empty string */
/* as a constant byte array */
static const unsigned char MXC_EMPTY_DIGEST_SHA224[28] = {
0xd1, 0x4a, 0x02, 0x8c, 0x2a, 0x3a, 0x2b, 0xc9,
0x47, 0x61, 0x02, 0xbb, 0x28, 0x82, 0x34, 0xc4,
0x15, 0xa2, 0xb0, 0x1f, 0x82, 0x8e, 0xa6, 0x2a,
0xc5, 0xb3, 0xe4, 0x2f};
#endif /* WOLFSSL_SHA224 */
#if !defined(NO_SHA256)
typedef wc_MXC_Sha wc_Sha256;
#define WC_SHA256_TYPE_DEFINED
@ -236,7 +263,7 @@
0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c,
0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55};
#endif
#endif /* NO_SHA256 */
WOLFSSL_LOCAL int wc_MXC_TPU_SHA_Init(wc_MXC_Sha *hash);