1
0
mirror of https://github.com/libssh2/libssh2.git synced 2025-09-04 04:42:10 +03:00

openssl: make it compatible with wolfSSL built without OPENSSL_ALL

Cherry-picked from #1484
This commit is contained in:
Viktor Szakats
2025-01-31 01:44:45 +01:00
parent 008e82c0f8
commit 2da28146a0
2 changed files with 3 additions and 4 deletions

View File

@@ -218,9 +218,7 @@ jobs:
WOLFSSLVER=${{ env.wolfssl-version }}
else
WOLFSSLVER=${{ env.wolfssl-version-prev }}
# Required to include `FIPS_mode()` API:
options='-DWOLFSSL_OPENSSLEXTRA=ON'
cppflags='-DOPENSSL_ALL'
fi
curl -fsS -L https://github.com/wolfSSL/wolfssl/archive/refs/tags/v$WOLFSSLVER-stable.tar.gz | tar -xzf -
cd wolfssl-$WOLFSSLVER-stable
@@ -230,7 +228,7 @@ jobs:
-DWOLFSSL_OPENSSLALL=ON \
-DWOLFSSL_EXAMPLES=OFF \
-DWOLFSSL_CRYPT_TESTS=OFF \
-DCMAKE_C_FLAGS="-fPIC -DWOLFSSL_AESGCM_STREAM ${cppflags}" \
-DCMAKE_C_FLAGS='-fPIC -DWOLFSSL_AESGCM_STREAM' \
-DCMAKE_INSTALL_PREFIX="$HOME/usr"
cmake --build bld --parallel 5
cmake --install bld

View File

@@ -3353,7 +3353,8 @@ _libssh2_md5_init(libssh2_md5_ctx *ctx)
*/
#if OPENSSL_VERSION_NUMBER >= 0x000907000L && \
!defined(USE_OPENSSL_3) && \
!defined(LIBRESSL_VERSION_NUMBER)
!defined(LIBRESSL_VERSION_NUMBER) && \
!defined(LIBSSH2_WOLFSSL)
if(FIPS_mode())
return 0;