From c2b486ce534700af26d9d4d991dd05257e766ecd Mon Sep 17 00:00:00 2001
From: Daniel Pouzzner <douzzer@wolfssl.com>
Date: Tue, 1 Apr 2025 17:20:31 -0500
Subject: [PATCH] fix some misindentation in wolfcrypt/src/coding.c.

force lower CMAKE_POLICY_VERSION_MINIMUM to try to work around obsolete cmake config syntax in several OSP workflows.
---
 .github/workflows/grpc.yml         | 2 +-
 .github/workflows/jwt-cpp.yml      | 2 +-
 .github/workflows/libvncserver.yml | 2 +-
 .github/workflows/zephyr.yml       | 5 +++--
 wolfcrypt/src/coding.c             | 6 ++++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/grpc.yml b/.github/workflows/grpc.yml
index 7effad6e3..4259b2a93 100644
--- a/.github/workflows/grpc.yml
+++ b/.github/workflows/grpc.yml
@@ -99,7 +99,7 @@ jobs:
           git submodule update --init
           mkdir 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 ../..
           make -j $(nproc) ${{ matrix.tests }}
 
diff --git a/.github/workflows/jwt-cpp.yml b/.github/workflows/jwt-cpp.yml
index d648044c6..2dcb209b5 100644
--- a/.github/workflows/jwt-cpp.yml
+++ b/.github/workflows/jwt-cpp.yml
@@ -92,7 +92,7 @@ jobs:
         run: |
           patch -p1 < ../osp/jwt-cpp/${{ matrix.config.ref }}.patch
           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
           ldd ./build/tests/jwt-cpp-test | grep wolfssl
 
diff --git a/.github/workflows/libvncserver.yml b/.github/workflows/libvncserver.yml
index 2c0fba584..87a772bf9 100644
--- a/.github/workflows/libvncserver.yml
+++ b/.github/workflows/libvncserver.yml
@@ -81,7 +81,7 @@ jobs:
         run: |
           patch -p1 < ../osp/libvncserver/${{ matrix.ref }}.patch
           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
           ldd build/libvncclient.so | grep wolfssl
           ldd build/libvncserver.so | grep wolfssl
diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml
index fb7f0d2b3..c6abc71c4 100644
--- a/.github/workflows/zephyr.yml
+++ b/.github/workflows/zephyr.yml
@@ -23,8 +23,9 @@ jobs:
             zephyr-sdk: 0.16.1
           - zephyr-ref: v3.5.0
             zephyr-sdk: 0.16.3
-          - zephyr-ref: v2.7.4
-            zephyr-sdk: 0.16.3
+# 20250401 -- disable v2.7.4 due to obsolete cmake version requirements.
+#          - zephyr-ref: v2.7.4
+#            zephyr-sdk: 0.16.3
     if: github.repository_owner == 'wolfssl'
     runs-on: ubuntu-22.04
     # This should be a safe limit for the tests to run.
diff --git a/wolfcrypt/src/coding.c b/wolfcrypt/src/coding.c
index 1bed7598a..39a77799e 100644
--- a/wolfcrypt/src/coding.c
+++ b/wolfcrypt/src/coding.c
@@ -259,7 +259,8 @@ int Base64_Decode_nonCT(const byte* in, word32 inLen, byte* out, word32* outLen)
         else
             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)
         out[i]= '\0';
 
@@ -347,7 +348,8 @@ int Base64_Decode(const byte* in, word32 inLen, byte* out, word32* outLen)
         else
             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)
         out[i]= '\0';