Update OpenSSL (3.0.13) and libssh (0.10.6)

[libssh] [openssl]
amnezia-vpn · Apr 3, 2024 · d6c938e · d6c938e
1 parent 596bf3c
commit d6c938e
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 25 deletions.
diff --git a/.github/workflows/build_libssh_android.yml b/.github/workflows/build_libssh_android.yml
@@ -4,12 +4,12 @@ on: [push]
 
 env:
   # Expected filename: https://zlib.net/zlib-${{env.ZLIB_VERSION}}.tar.gz
-  ZLIB_VERSION: 1.3
+  ZLIB_VERSION: 1.3.1
   # Expected filename: https://www.openssl.org/source/openssl-${{env.OPENSSL_VERSION}}.tar.gz
-  OPENSSL_VERSION: 1.1.1t
+  OPENSSL_VERSION: 3.0.13
   # Exoected filename: ${{env.LIBSSH_SOURCE}}libssh-${{env.LIBSSH_VERSION}}.tar.xz
   LIBSSH_SOURCE: https://www.libssh.org/files/0.10/
-  LIBSSH_VERSION: 0.10.3
+  LIBSSH_VERSION: 0.10.6
 
 jobs:
   Build-LibSSH-Android:
@@ -84,7 +84,9 @@ jobs:
         esac  
     - name: Build libssh
       run: |
-        cd libssh-${{env.LIBSSH_VERSION}}/src
+        cd libssh-${{env.LIBSSH_VERSION}}
+        sed -i 's/add_c_compiler_flag("-Werror=strict-prototypes" SUPPORTED_COMPILER_FLAGS)/#add_c_compiler_flag("-Werror=strict-prototypes" SUPPORTED_COMPILER_FLAGS)/g' ./CompilerChecks.cmake        
+        cd src
         export OPENSSL_ROOT_DIR=${{github.workspace}}/openssl-${{env.OPENSSL_VERSION}}
         export ZLIB_ROOT_DIR=${{github.workspace}}/zlib-${{env.ZLIB_VERSION}}
         export OPENSSL_CRYPTO_LIBRARY=${{github.workspace}}/openssl-${{env.OPENSSL_VERSION}}/libcrypto.a:${{github.workspace}}/openssl-${{env.OPENSSL_VERSION}}/libssl.a 

diff --git a/.github/workflows/build_libssh_ios.yml b/.github/workflows/build_libssh_ios.yml
@@ -4,12 +4,12 @@ on: [push]
 
 env:
   # Expected filename: https://zlib.net/zlib-${{env.ZLIB_VERSION}}.tar.gz
-  ZLIB_VERSION: 1.2.13
+  ZLIB_VERSION: 1.3.1
   # Expected filename: https://www.openssl.org/source/openssl-${{env.OPENSSL_VERSION}}.tar.gz
-  OPENSSL_VERSION: 1.1.1t
+  OPENSSL_VERSION: 3.0.13
   # Exoected filename: ${{env.LIBSSH_SOURCE}}libssh-${{env.LIBSSH_VERSION}}.tar.xz
   LIBSSH_SOURCE: https://www.libssh.org/files/0.10/
-  LIBSSH_VERSION: 0.10.3
+  LIBSSH_VERSION: 0.10.6
 
 jobs:
   Build-LibSSH-MacOS:
@@ -62,7 +62,7 @@ jobs:
         export CROSS_SDK="${PLATFORM}${IOS_SDK_VERSION}.sdk"
         export ARCH="arm64"
         export BUILD_TOOLS="${DEVELOPER}"
-        export CC="${BUILD_TOOLS}/usr/bin/gcc -fembed-bitcode -arch ${ARCH}" 
+        export CC="${BUILD_TOOLS}/usr/bin/gcc -arch ${ARCH}" 
         echo "+ Activate Static Engine"
         sed -ie 's/\"engine/\"dynamic-engine/' ./Configurations/15-ios.conf
         ./Configure iphoneos-cross no-tests no-shared 

diff --git a/.github/workflows/build_libssh_linux.yml b/.github/workflows/build_libssh_linux.yml
@@ -4,12 +4,12 @@ on: [push]
 
 env:
   # Expected filename: https://zlib.net/zlib-${{env.ZLIB_VERSION}}.tar.gz
-  ZLIB_VERSION: 1.2.13
+  ZLIB_VERSION: 1.3.1
   # Expected filename: https://www.openssl.org/source/openssl-${{env.OPENSSL_VERSION}}.tar.gz
-  OPENSSL_VERSION: 1.1.1t
+  OPENSSL_VERSION: 3.0.13
   # Exoected filename: ${{env.LIBSSH_SOURCE}}libssh-${{env.LIBSSH_VERSION}}.tar.xz
   LIBSSH_SOURCE: https://www.libssh.org/files/0.10/
-  LIBSSH_VERSION: 0.10.3
+  LIBSSH_VERSION: 0.10.6
 
 jobs:
   Build-LibSSH-Linux:

diff --git a/.github/workflows/build_libssh_macos.yml b/.github/workflows/build_libssh_macos.yml
@@ -4,12 +4,12 @@ on: [push]
 
 env:
   # Expected filename: https://zlib.net/zlib-${{env.ZLIB_VERSION}}.tar.gz
-  ZLIB_VERSION: 1.2.13
+  ZLIB_VERSION: 1.3.1
   # Expected filename: https://www.openssl.org/source/openssl-${{env.OPENSSL_VERSION}}.tar.gz
-  OPENSSL_VERSION: 1.1.1t
+  OPENSSL_VERSION: 3.0.13
   # Exoected filename: ${{env.LIBSSH_SOURCE}}libssh-${{env.LIBSSH_VERSION}}.tar.xz
   LIBSSH_SOURCE: https://www.libssh.org/files/0.10/
-  LIBSSH_VERSION: 0.10.3
+  LIBSSH_VERSION: 0.10.6
 
 jobs:
   Build-LibSSH-MacOS:

diff --git a/.github/workflows/build_libssh_windows.yml b/.github/workflows/build_libssh_windows.yml
@@ -4,12 +4,12 @@ on: [push]
 
 env:
   # Expected filename: https://zlib.net/zlib-${{env.ZLIB_VERSION}}.tar.gz
-  ZLIB_VERSION: 1.2.13
+  ZLIB_VERSION: 1.3.1
   # Expected filename: https://www.openssl.org/source/openssl-${{env.OPENSSL_VERSION}}.tar.gz
-  OPENSSL_VERSION: 1.1.1t
+  OPENSSL_VERSION: 3.0.13
   # Exoected filename: ${{env.LIBSSH_SOURCE}}libssh-${{env.LIBSSH_VERSION}}.tar.xz
   LIBSSH_SOURCE: https://www.libssh.org/files/0.10/
-  LIBSSH_VERSION: 0.10.3
+  LIBSSH_VERSION: 0.10.6
 
 jobs:
   Build-VisualCxx:

diff --git a/.github/workflows/build_openssl_android.yml b/.github/workflows/build_openssl_android.yml
@@ -23,7 +23,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         repository: openssl/openssl
-        ref: OpenSSL_1_1_1t
+        ref: openssl-3.0.13
         path: openssl
 
     - name: 'Build OpenSSL Android'

diff --git a/.github/workflows/build_openssl_linux.yml b/.github/workflows/build_openssl_linux.yml
@@ -44,7 +44,7 @@ jobs:
       uses: actions/checkout@v3
       with:
         repository: openssl/openssl
-        ref: OpenSSL_1_1_1t
+        ref: openssl-3.0.13
         path: openssl
 
     - name: Build OpenSSL

diff --git a/.github/workflows/build_openssl_macos_ios.yml b/.github/workflows/build_openssl_macos_ios.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ssllib: [ 1.1.1t ]
+        ssllib: [ 3.0.13 ]
 
     runs-on: macos-12
     if: |
@@ -30,11 +30,11 @@ jobs:
           path: Build-OpenSSL-cURL
 
       - name: 'Run build script'
-        working-directory: Build-OpenSSL-cURL/openssl
         run: |
-          sed -i '' 's/openssl-3.0.9/openssl-${{matrix.ssllib}}/' openssl-build.sh
-          sed -i '' 's/3.0.9/${{matrix.ssllib}}/' openssl-build-phase1.sh
-          sed -i '' 's/3.0.9/${{matrix.ssllib}}/' openssl-build-phase2.sh
+          cd Build-OpenSSL-cURL/openssl
+          sed -i '' 's/openssl-3.0.9/openssl-${{matrix.ssllib}}/' ./openssl-build.sh
+          sed -i '' 's/3.0.9/${{matrix.ssllib}}/' ./openssl-build-phase1.sh
+          sed -i '' 's/3.0.9/${{matrix.ssllib}}/' ./openssl-build-phase2.sh
           ./openssl-build.sh -e
       
       - name: Archive artifacts

diff --git a/.github/workflows/build_openssl_windows.yml b/.github/workflows/build_openssl_windows.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: openssl/openssl
-          ref: OpenSSL_1_1_1t
+          ref: openssl-3.0.13
           path: openssl
 
       - name: Setup msbuild environment