Skip to content

Commit ecc138f

Browse files
author
Andras Fekete
committed
Fixed g++ shortcomings
1 parent a317ac2 commit ecc138f

1 file changed

Lines changed: 22 additions & 18 deletions

File tree

wolfcrypt/src/port/aria/aria-crypt.c

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -199,16 +199,18 @@ int wc_AriaEncrypt(wc_Aria* aria, byte* out, byte* in, word32 inSz,
199199
{
200200
MC_RV rv = MC_OK;
201201

202-
MC_ALGPARAM param = {
203-
.pNonce = iv,
204-
.nNonce = ivSz,
205-
.pAData = aad,
206-
.nAData = aadSz,
207-
.nTLen = authTagSz,
208-
.nDataLen = inSz
209-
};
202+
MC_ALGPARAM param;
210203
MC_UINT outSz = inSz + authTagSz;
211-
MC_ALGORITHM mcAlg = {aria->algo, NULL, 0};
204+
MC_ALGORITHM mcAlg;
205+
XMEMSET(&param,0,sizeof(MC_ALGPARAM));
206+
param.pNonce = iv;
207+
param.pAData = aad;
208+
param.nNonce = ivSz;
209+
param.nAData = aadSz;
210+
param.nTLen = authTagSz;
211+
param.nDataLen = inSz;
212+
XMEMSET(&mcAlg,0,sizeof(MC_ALGORITHM));
213+
mcAlg.mcAlgId = aria->algo;
212214
mcAlg.pParam = (MC_UCHAR*)&param;
213215
mcAlg.nParam = sizeof(param);
214216

@@ -248,16 +250,18 @@ int wc_AriaDecrypt(wc_Aria* aria, byte* out, byte* in, word32 inSz,
248250
{
249251
MC_RV rv = MC_OK;
250252

251-
MC_ALGPARAM param = {
252-
.pNonce = iv,
253-
.nNonce = ivSz,
254-
.pAData = aad,
255-
.nAData = aadSz,
256-
.nTLen = authTagSz,
257-
.nDataLen = inSz
258-
};
253+
MC_ALGPARAM param;
259254
MC_UINT outSz = inSz;
260-
MC_ALGORITHM mcAlg = {aria->algo, NULL, 0};
255+
MC_ALGORITHM mcAlg;
256+
XMEMSET(&param,0,sizeof(MC_ALGPARAM));
257+
param.pNonce = iv;
258+
param.pAData = aad;
259+
param.nNonce = ivSz;
260+
param.nAData = aadSz;
261+
param.nTLen = authTagSz;
262+
param.nDataLen = inSz;
263+
XMEMSET(&mcAlg,0,sizeof(MC_ALGORITHM));
264+
mcAlg.mcAlgId = aria->algo;
261265
mcAlg.pParam = (MC_UCHAR*)&param;
262266
mcAlg.nParam = sizeof(param);
263267

0 commit comments

Comments
 (0)