diff --git a/wolfcrypt/src/port/aria/aria-crypt.c b/wolfcrypt/src/port/aria/aria-crypt.c index 6a86efd94..502f51af4 100644 --- a/wolfcrypt/src/port/aria/aria-crypt.c +++ b/wolfcrypt/src/port/aria/aria-crypt.c @@ -199,16 +199,18 @@ int wc_AriaEncrypt(wc_Aria* aria, byte* out, byte* in, word32 inSz, { MC_RV rv = MC_OK; - MC_ALGPARAM param = { - .pNonce = iv, - .nNonce = ivSz, - .pAData = aad, - .nAData = aadSz, - .nTLen = authTagSz, - .nDataLen = inSz - }; + MC_ALGPARAM param; MC_UINT outSz = inSz + authTagSz; - MC_ALGORITHM mcAlg = {aria->algo, NULL, 0}; + MC_ALGORITHM mcAlg; + XMEMSET(¶m,0,sizeof(MC_ALGPARAM)); + param.pNonce = iv; + param.pAData = aad; + param.nNonce = ivSz; + param.nAData = aadSz; + param.nTLen = authTagSz; + param.nDataLen = inSz; + XMEMSET(&mcAlg,0,sizeof(MC_ALGORITHM)); + mcAlg.mcAlgId = aria->algo; mcAlg.pParam = (MC_UCHAR*)¶m; mcAlg.nParam = sizeof(param); @@ -248,16 +250,18 @@ int wc_AriaDecrypt(wc_Aria* aria, byte* out, byte* in, word32 inSz, { MC_RV rv = MC_OK; - MC_ALGPARAM param = { - .pNonce = iv, - .nNonce = ivSz, - .pAData = aad, - .nAData = aadSz, - .nTLen = authTagSz, - .nDataLen = inSz - }; + MC_ALGPARAM param; MC_UINT outSz = inSz; - MC_ALGORITHM mcAlg = {aria->algo, NULL, 0}; + MC_ALGORITHM mcAlg; + XMEMSET(¶m,0,sizeof(MC_ALGPARAM)); + param.pNonce = iv; + param.pAData = aad; + param.nNonce = ivSz; + param.nAData = aadSz; + param.nTLen = authTagSz; + param.nDataLen = inSz; + XMEMSET(&mcAlg,0,sizeof(MC_ALGORITHM)); + mcAlg.mcAlgId = aria->algo; mcAlg.pParam = (MC_UCHAR*)¶m; mcAlg.nParam = sizeof(param);