fix for initialization of high value and funtction signature

This commit is contained in:
JacobBarthelmeh
2024-07-19 11:03:44 -06:00
parent 04ab561a65
commit 8a9c893c6f
2 changed files with 5 additions and 5 deletions

View File

@ -796,7 +796,7 @@ WC_MISC_STATIC WC_INLINE w64wrapper w64ShiftLeft(w64wrapper a, int shift)
return a; return a;
} }
WC_MISC_STATIC WC_INLINE w64wrapper w64Mul(unsigned int a, unsigned int b) WC_MISC_STATIC WC_INLINE w64wrapper w64Mul(word32 a, word32 b)
{ {
w64wrapper ret; w64wrapper ret;
ret.n = (word64)a * (word64)b; ret.n = (word64)a * (word64)b;
@ -838,7 +838,7 @@ WC_MISC_STATIC WC_INLINE void w64SetLow32(w64wrapper *n, word32 low)
WC_MISC_STATIC WC_INLINE w64wrapper w64Add32(w64wrapper a, word32 b, byte *wrap) WC_MISC_STATIC WC_INLINE w64wrapper w64Add32(w64wrapper a, word32 b, byte *wrap)
{ {
a.n[1] = a.n[1] + b; a.n[1] += b;
if (a.n[1] < b) { if (a.n[1] < b) {
a.n[0]++; a.n[0]++;
if (wrap != NULL && a.n[0] == 0) if (wrap != NULL && a.n[0] == 0)
@ -851,14 +851,14 @@ WC_MISC_STATIC WC_INLINE w64wrapper w64Add32(w64wrapper a, word32 b, byte *wrap)
WC_MISC_STATIC WC_INLINE w64wrapper w64Add(w64wrapper a, w64wrapper b, WC_MISC_STATIC WC_INLINE w64wrapper w64Add(w64wrapper a, w64wrapper b,
byte *wrap) byte *wrap)
{ {
a.n[1] = a.n[1] + b.n[1]; a.n[1] += b.n[1];
if (a.n[1] < b.n[1]) { if (a.n[1] < b.n[1]) {
a.n[0]++; a.n[0]++;
if (wrap != NULL && a.n[0] == 0) if (wrap != NULL && a.n[0] == 0)
*wrap = 1; *wrap = 1;
} }
a.n[0] = a.n[0] + b.n[0]; a.n[0] += b.n[0];
if (a.n[0] < b.n[0]) { if (a.n[0] < b.n[0]) {
*wrap = 1; *wrap = 1;
} }

View File

@ -739,7 +739,7 @@ int wc_Poly1305Final(Poly1305* ctx, byte* mac)
/* mac = (h + pad) % (2^128) */ /* mac = (h + pad) % (2^128) */
#ifdef WOLFSSL_W64_WRAPPER #ifdef WOLFSSL_W64_WRAPPER
w64SetLow32(&f, h0); f = w64From32(0, h0);
f = w64Add32(f, ctx->pad[0], NULL); f = w64Add32(f, ctx->pad[0], NULL);
h0 = w64GetLow32(f); h0 = w64GetLow32(f);