Skip to content

Commit 1a783fc

Browse files
youknowoneyouknowone
authored
Replace SSL backend to rustls (#6244)
1 parent 7c4c1ea commit 1a783fc

File tree

21 files changed

+12700
-3076
lines changed

21 files changed

+12700
-3076
lines changed

‎.cspell.dict/cpython.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ argtypes
22
asdl
33
asname
44
augassign
5+
badcert
56
badsyntax
67
basetype
78
boolop
89
bxor
910
cached_tsver
11+
cadata
12+
cafile
1013
cellarg
1114
cellvar
1215
cellvars
@@ -23,8 +26,8 @@ freevars
2326
fromlist
2427
heaptype
2528
HIGHRES
26-
Itertool
2729
IMMUTABLETYPE
30+
Itertool
2831
kwonlyarg
2932
kwonlyargs
3033
lasti
@@ -47,6 +50,7 @@ stackdepth
4750
stringlib
4851
structseq
4952
subparams
53+
ticketer
5054
tok_oldval
5155
tvars
5256
unaryop
@@ -56,6 +60,7 @@ VARKEYWORDS
5660
varkwarg
5761
wbits
5862
weakreflist
63+
webpki
5964
withitem
6065
withs
6166
xstat

‎.cspell.dict/rust-more.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ nanos
5050
nonoverlapping
5151
objclass
5252
peekable
53+
pemfile
5354
powc
5455
powf
5556
powi
@@ -61,6 +62,7 @@ rposition
6162
rsplitn
6263
rustc
6364
rustfmt
65+
rustls
6466
rustyline
6567
seedable
6668
seekfrom

‎.github/workflows/ci.yaml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ concurrency:
1616
cancel-in-progress: true
1717

1818
env:
19-
CARGO_ARGS: --no-default-features --features stdlib,importlib,stdio,encodings,sqlite,ssl
19+
CARGO_ARGS: --no-default-features --features stdlib,importlib,stdio,encodings,sqlite,ssl-rustls
20+
CARGO_ARGS_NO_SSL: --no-default-features --features stdlib,importlib,stdio,encodings,sqlite
2021
# Skip additional tests on Windows. They are checked on Linux and MacOS.
2122
# test_glob: many failing tests
2223
# test_io: many failing tests
@@ -169,7 +170,7 @@ jobs:
169170
target: aarch64-apple-ios
170171
if: runner.os == 'macOS'
171172
- name: Check compilation for iOS
172-
run: cargo check --target aarch64-apple-ios
173+
run: cargo check --target aarch64-apple-ios ${{ env.CARGO_ARGS_NO_SSL }}
173174
if: runner.os == 'macOS'
174175

175176
exotic_targets:
@@ -186,14 +187,14 @@ jobs:
186187
- name: Install gcc-multilib and musl-tools
187188
run: sudo apt-get update && sudo apt-get install gcc-multilib musl-tools
188189
- name: Check compilation for x86 32bit
189-
run: cargo check --target i686-unknown-linux-gnu
190+
run: cargo check --target i686-unknown-linux-gnu ${{ env.CARGO_ARGS_NO_SSL }}
190191

191192
- uses: dtolnay/rust-toolchain@stable
192193
with:
193194
target: aarch64-linux-android
194195

195196
- name: Check compilation for android
196-
run: cargo check --target aarch64-linux-android
197+
run: cargo check --target aarch64-linux-android ${{ env.CARGO_ARGS_NO_SSL }}
197198

198199
- uses: dtolnay/rust-toolchain@stable
199200
with:
@@ -202,28 +203,28 @@ jobs:
202203
- name: Install gcc-aarch64-linux-gnu
203204
run: sudo apt install gcc-aarch64-linux-gnu
204205
- name: Check compilation for aarch64 linux gnu
205-
run: cargo check --target aarch64-unknown-linux-gnu
206+
run: cargo check --target aarch64-unknown-linux-gnu ${{ env.CARGO_ARGS_NO_SSL }}
206207

207208
- uses: dtolnay/rust-toolchain@stable
208209
with:
209210
target: i686-unknown-linux-musl
210211

211212
- name: Check compilation for musl
212-
run: cargo check --target i686-unknown-linux-musl
213+
run: cargo check --target i686-unknown-linux-musl ${{ env.CARGO_ARGS_NO_SSL }}
213214

214215
- uses: dtolnay/rust-toolchain@stable
215216
with:
216217
target: x86_64-unknown-freebsd
217218

218219
- name: Check compilation for freebsd
219-
run: cargo check --target x86_64-unknown-freebsd
220+
run: cargo check --target x86_64-unknown-freebsd ${{ env.CARGO_ARGS_NO_SSL }}
220221

221222
- uses: dtolnay/rust-toolchain@stable
222223
with:
223224
target: x86_64-unknown-freebsd
224225

225226
- name: Check compilation for freeBSD
226-
run: cargo check --target x86_64-unknown-freebsd
227+
run: cargo check --target x86_64-unknown-freebsd ${{ env.CARGO_ARGS_NO_SSL }}
227228

228229
# - name: Prepare repository for redox compilation
229230
# run: bash scripts/redox/uncomment-cargo.sh

0 commit comments

Comments
 (0)