wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-01-27 06:52:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes for various wolfcrypt -Wconversions visible only on compilers that promote byte and word16 to signed int, then warn of a sign conflict when an intrinsically safe result is assigned back to the original type.

Browse Source
This commit is contained in:
Daniel Pouzzner
2023-05-09 23:55:08 -05:00
parent ec9beaab41
commit f2c97d5d35
6 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/src/coding.c
View File

@@ -100,11 +100,11 @@ static WC_INLINE byte Base64_Char2Val(byte c)
byte mask;
c -= BASE64_MIN;
mask = (((byte)(0x3f - c)) >> 7) - 1;
mask = (byte)((((byte)(0x3f - c)) >> 7) - 1);
/* Load a value from the first cache line and use when mask set. */
v = base64Decode[ c & 0x3f ] & mask ;
v = (byte)(base64Decode[ c & 0x3f ] & mask);
/* Load a value from the second cache line and use when mask not set. */
v |= base64Decode[(c & 0x0f) | 0x40] & (~mask);
v |= (byte)(base64Decode[(c & 0x0f) | 0x40] & (~mask));
return v;
#else
@@ -236,8 +236,8 @@ int Base64_Decode(const byte* in, word32 inLen, byte* out, word32* outLen)
e1 = Base64_Char2Val(e1);
e2 = Base64_Char2Val(e2);
e3 = (e3 == PAD) ? 0 : Base64_Char2Val(e3);
e4 = (e4 == PAD) ? 0 : Base64_Char2Val(e4);
e3 = (byte)((e3 == PAD) ? 0 : Base64_Char2Val(e3));
e4 = (byte)((e4 == PAD) ? 0 : Base64_Char2Val(e4));
if (e1 == BAD || e2 == BAD || e3 == BAD || e4 == BAD) {
WOLFSSL_MSG("Bad Base64 Decode bad character");