Skip to content

Commit

Permalink
Update OpenSSL to 3.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmy-park committed Oct 22, 2024
1 parent 2653886 commit 60558ae
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ccache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: push

env:
cpm-path: .cpm
cpm-key: openssl-3.3.2-cpm
cpm-key: openssl-3.4.0-cpm

jobs:
build:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
fail-fast: false
matrix:
preset: [android, ios, linux, macos, windows]
version: [1.1.1w, 3.0.15, 3.1.7, 3.2.3, 3.3.2]
version: [1.1.1w, 3.0.15, 3.1.7, 3.2.3, 3.3.2, 3.4.0]
include:
- { os: macos, preset: ios }
- { os: macos, preset: macos }
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [1.1.1w, 3.0.15, 3.1.7, 3.2.3, 3.3.2]
version: [1.1.1w, 3.0.15, 3.1.7, 3.2.3, 3.3.2, 3.4.0]
name: freebsd-${{ matrix.version }}
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [1.1.1w, 3.0.15, 3.1.7, 3.2.3, 3.3.2]
version: [1.1.1w, 3.0.15, 3.1.7, 3.2.3, 3.3.2, 3.4.0]
name: mingw64-${{ matrix.version }}
runs-on: windows-latest
defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/detect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: push

env:
cpm-path: .cpm
cpm-key: openssl-3.3.2-cpm
cpm-key: openssl-3.4.0-cpm

jobs:
android:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.25)

project(
openssl-cmake
VERSION 3.3.2
VERSION 3.4.0
DESCRIPTION "Build OpenSSL in parallel within CMake"
HOMEPAGE_URL "https://github.com/jimmy-park/openssl-cmake"
LANGUAGES C
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Build OpenSSL in parallel within CMake

## Features

- Support OpenSSL versions from `1.1.1` to the latest `3.3.x`
- Support OpenSSL versions from `1.1.1` to the latest `3.4.x`
- Detect the target platform (`Linux`, `macOS`, `Windows`, `Android`, `iOS`, and more)
- Download the source code only once (thanks [CPM.cmake](https://github.com/cpm-cmake/CPM.cmake)!)
- Don't reconfigure if same options are used
Expand All @@ -30,7 +30,7 @@ Build OpenSSL in parallel within CMake
| `OPENSSL_PATCH` | list | `(undefined)` | Apply patches to OpenSSL source |
| `OPENSSL_SOURCE` | path | `(undefined)` | Specify the location of OpenSSL source (URL or path) |
| `OPENSSL_TARGET_PLATFORM` | string | `(undefined)` | Use OpenSSL's Configure target (see below) |
| `OPENSSL_TARGET_VERSION` | string | `3.3.x` | Use the latest OpenSSL version by default |
| `OPENSSL_TARGET_VERSION` | string | `3.4.x` | Use the latest OpenSSL version by default |
| `OPENSSL_TEST` | bool | `OFF` | Enable testing and build OpenSSL self tests |
| `OPENSSL_USE_CCACHE` | bool | `ON` | Use ccache if available |

Expand Down
2 changes: 1 addition & 1 deletion cmake/FetchOpenSSL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function(fetch_openssl)
endif()

if(OPENSSL_TARGET_VERSION VERSION_EQUAL PROJECT_VERSION)
list(APPEND CPM_OPTIONS URL_HASH SHA256=2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281)
list(APPEND CPM_OPTIONS URL_HASH SHA256=e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf)
endif()

if(OPENSSL_TARGET_VERSION MATCHES "^1\.1\.1[a-w]$")
Expand Down

0 comments on commit 60558ae

Please sign in to comment.