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

fix some misindentation in wolfcrypt/src/coding.c.

Browse Source 
force lower CMAKE_POLICY_VERSION_MINIMUM to try to work around obsolete cmake config syntax in several OSP workflows.
This commit is contained in:
Daniel Pouzzner
2025-04-01 17:20:31 -05:00
parent 51c6848340
commit c2b486ce53
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/grpc.yml vendored
View File

@@ -99,7 +99,7 @@ jobs:
git submodule update --init git submodule update --init
mkdir cmake/build mkdir cmake/build
cd cmake/build cd cmake/build
cmake -DgRPC_BUILD_TESTS=ON -DgRPC_SSL_PROVIDER=wolfssl \ cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.1 -DgRPC_BUILD_TESTS=ON -DgRPC_SSL_PROVIDER=wolfssl \
-DWOLFSSL_INSTALL_DIR=$GITHUB_WORKSPACE/build-dir ../.. -DWOLFSSL_INSTALL_DIR=$GITHUB_WORKSPACE/build-dir ../..
make -j $(nproc) ${{ matrix.tests }} make -j $(nproc) ${{ matrix.tests }}

2
.github/workflows/jwt-cpp.yml vendored
View File

@@ -92,7 +92,7 @@ jobs:
run: | run: |
patch -p1 < ../osp/jwt-cpp/${{ matrix.config.ref }}.patch patch -p1 < ../osp/jwt-cpp/${{ matrix.config.ref }}.patch
PKG_CONFIG_PATH=$GITHUB_WORKSPACE/build-dir/lib/pkgconfig \ PKG_CONFIG_PATH=$GITHUB_WORKSPACE/build-dir/lib/pkgconfig \
cmake -B build -DJWT_SSL_LIBRARY:STRING=wolfSSL -DJWT_BUILD_TESTS=ON . cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -B build -DJWT_SSL_LIBRARY:STRING=wolfSSL -DJWT_BUILD_TESTS=ON .
make -j -C build make -j -C build
ldd ./build/tests/jwt-cpp-test | grep wolfssl ldd ./build/tests/jwt-cpp-test | grep wolfssl

2
.github/workflows/libvncserver.yml vendored
View File

@@ -81,7 +81,7 @@ jobs:
run: | run: |
patch -p1 < ../osp/libvncserver/${{ matrix.ref }}.patch patch -p1 < ../osp/libvncserver/${{ matrix.ref }}.patch
PKG_CONFIG_PATH=$GITHUB_WORKSPACE/build-dir/lib/pkgconfig \ PKG_CONFIG_PATH=$GITHUB_WORKSPACE/build-dir/lib/pkgconfig \
cmake -B build -DWITH_GNUTLS=OFF -DWITH_OPENSSL=OFF -DWITH_GCRYPT=OFF -DWITH_WOLFSSL=ON . cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -B build -DWITH_GNUTLS=OFF -DWITH_OPENSSL=OFF -DWITH_GCRYPT=OFF -DWITH_WOLFSSL=ON .
make -j -C build VERBOSE=1 make -j -C build VERBOSE=1
ldd build/libvncclient.so | grep wolfssl ldd build/libvncclient.so | grep wolfssl
ldd build/libvncserver.so | grep wolfssl ldd build/libvncserver.so | grep wolfssl

5
.github/workflows/zephyr.yml vendored
View File

@@ -23,8 +23,9 @@ jobs:
zephyr-sdk: 0.16.1 zephyr-sdk: 0.16.1
- zephyr-ref: v3.5.0 - zephyr-ref: v3.5.0
zephyr-sdk: 0.16.3 zephyr-sdk: 0.16.3
- zephyr-ref: v2.7.4 # 20250401 -- disable v2.7.4 due to obsolete cmake version requirements.
zephyr-sdk: 0.16.3 # - zephyr-ref: v2.7.4
# zephyr-sdk: 0.16.3
if: github.repository_owner == 'wolfssl' if: github.repository_owner == 'wolfssl'
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
# This should be a safe limit for the tests to run. # This should be a safe limit for the tests to run.

6
wolfcrypt/src/coding.c
View File

@@ -259,7 +259,8 @@ int Base64_Decode_nonCT(const byte* in, word32 inLen, byte* out, word32* outLen)
else else
break; break;
} }
/* If the output buffer has a room for an extra byte, add a null terminator */
/* If the output buffer has a room for an extra byte, add a null terminator */
if (out && *outLen > i) if (out && *outLen > i)
out[i]= '\0'; out[i]= '\0';
@@ -347,7 +348,8 @@ int Base64_Decode(const byte* in, word32 inLen, byte* out, word32* outLen)
else else
break; break;
} }
/* If the output buffer has a room for an extra byte, add a null terminator */
/* If the output buffer has a room for an extra byte, add a null terminator */
if (out && *outLen > i) if (out && *outLen > i)
out[i]= '\0'; out[i]= '\0';