Skip to content

Commit 844c54a

Browse files
nhormannhorman
authored
Introduce breaking change to inform users of openssl->quictls naming changes (#4985)
1 parent 28c12d8 commit 844c54a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+349
-340
lines changed

‎.dockerignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
!src
55
!cmake
66
!submodules/clog
7-
!submodules/openssl
7+
!submodules/quictls
88
!submodules/CMakeLists.txt
9-
submodules/openssl/pyca-cryptography
10-
submodules/openssl/boringssl
9+
submodules/quictls/pyca-cryptography
10+
submodules/quictls/boringssl
1111
**/*.o
1212
**/*.a
1313
**/*.d

‎.github/workflows/build-reuse-darwin-framework.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ on:
2020
# - Release
2121
tls:
2222
required: false
23-
default: 'openssl'
23+
default: 'quictls'
2424
type: string
2525
# options:
26-
# - openssl
27-
# - openssl3
26+
# - quictls
27+
# - quictls3
2828
static:
2929
required: false
3030
default: ''
@@ -126,17 +126,17 @@ jobs:
126126
- name: Download Build Artifacts (iOS x64)
127127
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
128128
with:
129-
name: Framework-${{ inputs.config }}-ios-macos-13-x64-openssl
129+
name: Framework-${{ inputs.config }}-ios-macos-13-x64-quictls
130130
path: artifacts
131131
- name: Download Build Artifacts (iOS arm64)
132132
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
133133
with:
134-
name: Framework-${{ inputs.config }}-ios-macos-13-arm64-openssl
134+
name: Framework-${{ inputs.config }}-ios-macos-13-arm64-quictls
135135
path: artifacts
136136
- name: Download Build Artifacts (MacOS Universal)
137137
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
138138
with:
139-
name: Framework-${{ inputs.config }}-macos-macos-13-universal-openssl
139+
name: Framework-${{ inputs.config }}-macos-macos-13-universal-quictls
140140
path: artifacts
141141
- name: Build XCFramework
142142
shell: pwsh

‎.github/workflows/build-reuse-unix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ on:
4848
# - arm64
4949
tls:
5050
required: false
51-
default: 'openssl'
51+
default: 'quictls'
5252
type: string
5353
# options:
54-
# - openssl
55-
# - openssl3
54+
# - quictls
55+
# - quictls3
5656
static:
5757
required: false
5858
default: ''

‎.github/workflows/build-reuse-win.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ on:
4949
default: 'schannel'
5050
type: string
5151
# options:
52-
# - openssl
53-
# - openssl3
52+
# - quictls
53+
# - quictls3
5454
# - schannel
5555
static:
5656
required: false

‎.github/workflows/build-reuse-winkernel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ on:
4646
default: 'schannel'
4747
type: string
4848
# options:
49-
# - openssl
50-
# - openssl3
49+
# - quictls
50+
# - quictls3
5151
# - schannel
5252
build:
5353
required: false

‎.github/workflows/build.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ jobs:
3030
plat: [windows, uwp] # TODO: Support gamecore_console
3131
os: ['windows-2022']
3232
arch: [x86, x64, arm64]
33-
tls: [schannel, openssl, openssl3]
33+
tls: [schannel, quictls, quictls3]
3434
static: ['', '-Static']
3535
exclude:
3636
# OpenSSL doesn't support arm64
37-
- tls: openssl
37+
- tls: quictls
3838
arch: arm64
3939
# OpenSSL3 doesn't support arm64
40-
- tls: openssl3
40+
- tls: quictls3
4141
arch: arm64
4242
# TODO: FIX: OpenSSL3 build fails with UWP
4343
- plat: uwp
44-
tls: openssl3
44+
tls: quictls3
4545
# TODO: FIX: Static builds fail with UWP
4646
- plat: uwp
4747
static: '-Static'
@@ -102,7 +102,7 @@ jobs:
102102
plat: [linux]
103103
os: ['ubuntu-22.04', 'ubuntu-24.04']
104104
arch: [arm, arm64]
105-
tls: [openssl, openssl3]
105+
tls: [quictls, quictls3]
106106
static: ['', '-Static']
107107
uses: ./.github/workflows/build-reuse-unix.yml
108108
with:
@@ -124,7 +124,7 @@ jobs:
124124
plat: [linux, android]
125125
os: ['ubuntu-22.04', 'ubuntu-24.04']
126126
arch: [x86, x64]
127-
tls: [openssl, openssl3]
127+
tls: [quictls, quictls3]
128128
systemcrypto: ['', '-UseSystemOpenSSLCrypto']
129129
static: ['', '-Static']
130130
clang: ['', '-Clang']
@@ -140,12 +140,12 @@ jobs:
140140
# No openssl system crypto on ubuntu-22.04
141141
- plat: linux
142142
os: 'ubuntu-22.04'
143-
tls: 'openssl'
143+
tls: 'quictls'
144144
systemcrypto: '-UseSystemOpenSSLCrypto'
145145
# No openssl system crypto on ubuntu-24.04
146146
- plat: linux
147147
os: 'ubuntu-24.04'
148-
tls: 'openssl'
148+
tls: 'quictls'
149149
systemcrypto: '-UseSystemOpenSSLCrypto'
150150
# linux xdp is for ubuntu24.04 only for now
151151
- plat: android
@@ -199,7 +199,7 @@ jobs:
199199
plat: [macos, ios]
200200
os: ['macos-13']
201201
arch: [x64, arm64]
202-
tls: [openssl, openssl3]
202+
tls: [quictls, quictls3]
203203
static: ['', '-Static']
204204
uses: ./.github/workflows/build-reuse-unix.yml
205205
with:
@@ -218,8 +218,8 @@ jobs:
218218
fail-fast: false
219219
matrix:
220220
vec: [
221-
{ plat: "uwp", tls: "openssl", arg: "-UWP" },
222-
{ plat: "windows", tls: "openssl" },
221+
{ plat: "uwp", tls: "quictls", arg: "-UWP" },
222+
{ plat: "windows", tls: "quictls" },
223223
{ plat: "windows", tls: "schannel" },
224224
]
225225
runs-on: windows-2022
@@ -229,18 +229,21 @@ jobs:
229229
- name: Download Build Artifacts
230230
uses: dawidd6/action-download-artifact@07ab29fd4a977ae4d2b275087cf67563dfdf0295
231231
with:
232+
run_id: ${{github.run_id}}
232233
name: Release-${{ matrix.vec.plat }}-windows-2022-x86-${{ matrix.vec.tls }}
233234
path: artifacts
234235
if_no_artifact_found: ignore
235236
- name: Download Build Artifacts
236237
uses: dawidd6/action-download-artifact@07ab29fd4a977ae4d2b275087cf67563dfdf0295
237238
with:
239+
run_id: ${{github.run_id}}
238240
name: Release-${{ matrix.vec.plat }}-windows-2022-x64-${{ matrix.vec.tls }}
239241
path: artifacts
240242
if_no_artifact_found: ignore
241243
- name: Download Build Artifacts
242244
uses: dawidd6/action-download-artifact@07ab29fd4a977ae4d2b275087cf67563dfdf0295
243245
with:
246+
run_id: ${{github.run_id}}
244247
name: Release-${{ matrix.vec.plat }}-windows-2022-arm64-${{ matrix.vec.tls }}
245248
path: artifacts
246249
if_no_artifact_found: ignore

‎.github/workflows/cargo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
os: [ubuntu-latest, windows-latest, macos-latest, macos-latest-xlarge]
24-
features: ["", "--features static", "--features openssl", "--features openssl,static", "--features overwrite"]
24+
features: ["", "--features static", "--features quictls", "--features quictls,static", "--features overwrite"]
2525
runs-on: ${{ matrix.os }}
2626
name: Cargo
2727
steps:
@@ -32,7 +32,7 @@ jobs:
3232
- name: Checkout repository
3333
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
3434
- name: Prepare Machine
35-
run: scripts/prepare-machine.ps1 -Tls openssl -ForBuild -InstallTestCertificates
35+
run: scripts/prepare-machine.ps1 -Tls quictls -ForBuild -InstallTestCertificates
3636
shell: pwsh
3737
- name: Install Perl
3838
if: runner.os == 'Windows'

‎.github/workflows/code-coverage.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
vec: [
29-
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl", build: "-Test" },
29+
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "quictls", build: "-Test" },
3030
]
3131
uses: ./.github/workflows/build-reuse-win.yml
3232
with:
@@ -46,8 +46,8 @@ jobs:
4646
fail-fast: false
4747
matrix:
4848
vec: [
49-
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl", build: "-Test" },
50-
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl", build: "-Test", xdp: "-UseXdp" },
49+
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "quictls", build: "-Test" },
50+
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "quictls", build: "-Test", xdp: "-UseXdp" },
5151
]
5252
runs-on:
5353
- self-hosted
@@ -90,7 +90,7 @@ jobs:
9090
fail-fast: false
9191
matrix:
9292
vec: [
93-
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl", build: "-Test" },
93+
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "quictls", build: "-Test" },
9494
]
9595
runs-on:
9696
- self-hosted
@@ -140,7 +140,7 @@ jobs:
140140
fail-fast: false
141141
matrix:
142142
vec: [
143-
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl", build: "-Test" },
143+
{ config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "quictls", build: "-Test" },
144144
]
145145
runs-on:
146146
- self-hosted
@@ -194,39 +194,39 @@ jobs:
194194
- name: Create Folder for Artifacts
195195
shell: pwsh
196196
run: |
197-
New-Item -ItemType Directory -Force -Path artifacts\coverage\windows\x64_Debug_openssl
197+
New-Item -ItemType Directory -Force -Path artifacts\coverage\windows\x64_Debug_quictls
198198
- uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
199199
name: Download BVT Coverage Results
200200
with:
201-
name: BVT-Debug-windows-windows-2022-x64-openssl
202-
path: artifacts\coverage\windows\x64_Debug_openssl
201+
name: BVT-Debug-windows-windows-2022-x64-quictls
202+
path: artifacts\coverage\windows\x64_Debug_quictls
203203
- uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
204204
name: Download BVT (XDP) Coverage Results
205205
with:
206-
name: BVT-Debug-windows-windows-2022-x64-openssl-UseXdp
207-
path: artifacts\coverage\windows\x64_Debug_openssl
206+
name: BVT-Debug-windows-windows-2022-x64-quictls-UseXdp
207+
path: artifacts\coverage\windows\x64_Debug_quictls
208208
- uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
209209
name: Download SpinQuic Coverage Results
210210
with:
211-
name: Spin-Debug-windows-windows-2022-x64-openssl
212-
path: artifacts\coverage\windows\x64_Debug_openssl
211+
name: Spin-Debug-windows-windows-2022-x64-quictls
212+
path: artifacts\coverage\windows\x64_Debug_quictls
213213
- uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
214214
name: Download RecvFuzz Coverage Results
215215
with:
216-
name: RecvFuzz-Debug-windows-windows-2022-x64-openssl
217-
path: artifacts\coverage\windows\x64_Debug_openssl
216+
name: RecvFuzz-Debug-windows-windows-2022-x64-quictls
217+
path: artifacts\coverage\windows\x64_Debug_quictls
218218
- name: Dir Folder for Artifacts
219219
shell: pwsh
220220
run: |
221-
dir artifacts\coverage\windows\x64_Debug_openssl
221+
dir artifacts\coverage\windows\x64_Debug_quictls
222222
- name: Merge
223223
shell: pwsh
224-
run: scripts/merge-coverage.ps1 -Config Debug -Arch x64 -Tls openssl
224+
run: scripts/merge-coverage.ps1 -Config Debug -Arch x64 -Tls quictls
225225
- name: Upload Results
226226
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
227227
with:
228228
name: merged
229-
path: artifacts\coverage\windows\x64_Debug_openssl\msquiccoverage.xml
229+
path: artifacts\coverage\windows\x64_Debug_quictls\msquiccoverage.xml
230230

231231
publish-coverage:
232232
name: Generate Summary

‎.github/workflows/dotnet-test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
fail-fast: false
3535
matrix:
3636
vec: [
37-
{ plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3" },
38-
{ plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "openssl3", xdp: "-UseXdp" },
37+
{ plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "quictls3" },
38+
{ plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "quictls3", xdp: "-UseXdp" },
3939
]
4040
uses: ./.github/workflows/build-reuse-unix.yml
4141
with:
@@ -54,8 +54,8 @@ jobs:
5454
fail-fast: false
5555
matrix:
5656
vec: [
57-
{ plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl" },
58-
{ plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3" },
57+
{ plat: "windows", os: "windows-2022", arch: "x64", tls: "quictls" },
58+
{ plat: "windows", os: "windows-2022", arch: "x64", tls: "quictls3" },
5959
]
6060
uses: ./.github/workflows/build-reuse-win.yml
6161
with:
@@ -73,11 +73,11 @@ jobs:
7373
fail-fast: false
7474
matrix:
7575
vec: [
76-
{ plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl" },
77-
{ plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3" },
78-
{ plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3" },
79-
{ plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "openssl3", xdp: "-UseXdp" },
80-
{ plat: "macos", os: "macos-13", arch: "universal", tls: "openssl" },
76+
{ plat: "windows", os: "windows-2022", arch: "x64", tls: "quictls" },
77+
{ plat: "windows", os: "windows-2022", arch: "x64", tls: "quictls3" },
78+
{ plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "quictls3" },
79+
{ plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "quictls3", xdp: "-UseXdp" },
80+
{ plat: "macos", os: "macos-13", arch: "universal", tls: "quictls" },
8181
]
8282
runs-on: ${{ matrix.vec.os }}
8383
steps:

‎.github/workflows/netperf.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ on:
1717
- src/core/**
1818
- src/platform/**
1919
- src/perf/**
20-
- submodules/openssl/**
21-
- submodules/openssl3/**
20+
- submodules/quictls/**
21+
- submodules/quictls3/**
2222
- submodules/xdp-for-windows/**
2323
pull_request:
2424
branches:
@@ -35,8 +35,8 @@ on:
3535
- src/core/**
3636
- src/platform/**
3737
- src/perf/**
38-
- submodules/openssl/**
39-
- submodules/openssl3/**
38+
- submodules/quictls/**
39+
- submodules/quictls3/**
4040
- submodules/xdp-for-windows/**
4141

4242
concurrency:

‎.github/workflows/package-alpine-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
fail-fast: false
2828
matrix:
2929
vec: [
30-
{ friendlyName: "Alpine-3.20-x64", config: "Release", arch: "x64", tls: "openssl3", image: "mcr.microsoft.com/dotnet/sdk:8.0-alpine3.20-amd64" },
30+
{ friendlyName: "Alpine-3.20-x64", config: "Release", arch: "x64", tls: "quictls3", image: "mcr.microsoft.com/dotnet/sdk:8.0-alpine3.20-amd64" },
3131
]
3232
runs-on: ubuntu-latest
3333
steps:
@@ -59,7 +59,7 @@ jobs:
5959
fail-fast: false
6060
matrix:
6161
vec: [
62-
{ friendlyName: "Alpine-3.20-x64", config: "Release", arch: "x64", tls: "openssl3", image: "mcr.microsoft.com/dotnet/runtime:9.0-alpine3.20-amd64", dotnetVersion: "9.0" },
62+
{ friendlyName: "Alpine-3.20-x64", config: "Release", arch: "x64", tls: "quictls3", image: "mcr.microsoft.com/dotnet/runtime:9.0-alpine3.20-amd64", dotnetVersion: "9.0" },
6363
]
6464
runs-on: ubuntu-latest
6565
steps:

0 commit comments

Comments
 (0)