feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #8763 from douzzer/20250511-fixes

Browse Source 
20250511-fixes
This commit is contained in:
David Garske
2025-05-12 08:48:37 -07:00
committed by GitHub
parent 110504acd6 e19295bb64
commit ed6f853b9c
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/wolfCrypt-Wconversion.yml vendored
View File

@ -22,7 +22,8 @@ jobs:
'--enable-intelasm --enable-cryptonly --enable-all-crypto --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-Wconversion -Warith-conversion -Wenum-conversion -Wfloat-conversion -Wsign-conversion"', '--enable-intelasm --enable-cryptonly --enable-all-crypto --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-Wconversion -Warith-conversion -Wenum-conversion -Wfloat-conversion -Wsign-conversion"',
'--enable-smallstack --disable-asm --enable-cryptonly --enable-all-crypto --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-Wconversion -Warith-conversion -Wenum-conversion -Wfloat-conversion -Wsign-conversion"', '--enable-smallstack --disable-asm --enable-cryptonly --enable-all-crypto --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-Wconversion -Warith-conversion -Wenum-conversion -Wfloat-conversion -Wsign-conversion"',
'--enable-smallstack --enable-intelasm --enable-cryptonly --enable-all-crypto --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-Wconversion -Warith-conversion -Wenum-conversion -Wfloat-conversion -Wsign-conversion"', '--enable-smallstack --enable-intelasm --enable-cryptonly --enable-all-crypto --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-Wconversion -Warith-conversion -Wenum-conversion -Wfloat-conversion -Wsign-conversion"',
'--enable-cryptonly --enable-all-crypto --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-Wconversion -Warith-conversion -Wenum-conversion -Wfloat-conversion -Wsign-conversion -DNO_INT128"' '--enable-cryptonly --enable-all-crypto --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-Wconversion -Warith-conversion -Wenum-conversion -Wfloat-conversion -Wsign-conversion -DNO_INT128"',
'--enable-cryptonly --enable-all-crypto --disable-examples --disable-benchmark --disable-crypttests CPPFLAGS="-Wdeclaration-after-statement -Wconversion -Warith-conversion -Wenum-conversion -Wfloat-conversion -Wsign-conversion" --enable-32bit CFLAGS=-m32'
] ]
name: build library name: build library
if: github.repository_owner == 'wolfssl' if: github.repository_owner == 'wolfssl'
@ -33,6 +34,9 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
name: Checkout wolfSSL name: Checkout wolfSSL
- name: install_multilib
run: sudo apt-get install -y gcc-multilib
- name: Build wolfCrypt with extra type conversion warnings - name: Build wolfCrypt with extra type conversion warnings
run: | run: |
./autogen.sh || $(exit 2) ./autogen.sh || $(exit 2)

4
wolfcrypt/src/curve25519.c
View File

@ -24,6 +24,10 @@
#include <wolfssl/wolfcrypt/libwolfssl_sources.h> #include <wolfssl/wolfcrypt/libwolfssl_sources.h>
#ifdef NO_CURVED25519_X64
#undef USE_INTEL_SPEEDUP
#endif
#ifdef HAVE_CURVE25519 #ifdef HAVE_CURVE25519
#include <wolfssl/wolfcrypt/curve25519.h> #include <wolfssl/wolfcrypt/curve25519.h>

6
wolfcrypt/src/fe_operations.c
View File

@ -192,7 +192,7 @@ int curve25519_blind(byte* q, const byte* n, const byte* mask, const byte* p,
fe z3 = {0}; fe z3 = {0};
fe tmp0 = {0}; fe tmp0 = {0};
fe tmp1 = {0}; fe tmp1 = {0};
int pos = 0; unsigned int pos;
unsigned int b; unsigned int b;
fe_frombytes(x1,p); fe_frombytes(x1,p);
@ -208,7 +208,7 @@ int curve25519_blind(byte* q, const byte* n, const byte* mask, const byte* p,
fe_cswap(x2,x3,(int)b); fe_cswap(x2,x3,(int)b);
fe_cswap(z2,z3,(int)b); fe_cswap(z2,z3,(int)b);
for (pos = 255;pos >= 1;--pos) { for (pos = 255;pos >= 1;--pos) {
b = n[pos / 8] >> (pos & 7); b = (unsigned int)n[pos / 8] >> (pos & 7);
b &= 1; b &= 1;
fe_cswap(x2,x3,(int)b); fe_cswap(x2,x3,(int)b);
fe_cswap(z2,z3,(int)b); fe_cswap(z2,z3,(int)b);
@ -233,7 +233,7 @@ int curve25519_blind(byte* q, const byte* n, const byte* mask, const byte* p,
fe_mul(z3,x1,z2); fe_mul(z3,x1,z2);
fe_mul(z2,tmp1,tmp0); fe_mul(z2,tmp1,tmp0);
b = mask[(pos-1) / 8] >> ((pos-1) & 7); b = (unsigned int)mask[(pos-1) / 8] >> ((pos-1) & 7);
b &= 1; b &= 1;
fe_cswap(x2,x3,(int)b); fe_cswap(x2,x3,(int)b);
fe_cswap(z2,z3,(int)b); fe_cswap(z2,z3,(int)b);

2
wolfssl/wolfcrypt/settings.h
View File

@ -3826,7 +3826,7 @@ extern void uITRON4_free(void *p) ;
/* Enable blinding by default for C-only, non-small curve25519 implementation */ /* Enable blinding by default for C-only, non-small curve25519 implementation */
#if defined(HAVE_CURVE25519) && !defined(CURVE25519_SMALL) && \ #if defined(HAVE_CURVE25519) && !defined(CURVE25519_SMALL) && \
!defined(FREESCALE_LTC_ECC) && !defined(WOLFSSL_ARMASM) && \ !defined(FREESCALE_LTC_ECC) && !defined(WOLFSSL_ARMASM) && \
!defined(USE_INTEL_SPEEDUP) && \ (!defined(USE_INTEL_SPEEDUP) || defined(NO_CURVED25519_X64)) && \
!defined(WOLFSSL_CURVE25519_BLINDING) && !defined(NO_CURVE25519_BLINDING) !defined(WOLFSSL_CURVE25519_BLINDING) && !defined(NO_CURVE25519_BLINDING)
#define WOLFSSL_CURVE25519_BLINDING #define WOLFSSL_CURVE25519_BLINDING
#endif #endif