1
- From 8431dc07cc69fda5d6e74f916a1e6ac37a652465 Mon Sep 17 00:00:00 2001
1
+ From 3d19ba6b88f43b8281a346bb9b5e07c9598d8513 Mon Sep 17 00:00:00 2001
2
2
From: Tom Fay <tom@teamfay.co.uk>
3
- Date: Wed, 13 Nov 2024 22:08:55 +0000
4
- Subject: [PATCH] Patch openssl provider for testing
3
+ Date: Thu, 14 Nov 2024 16:31:52 +0000
4
+ Subject: [PATCH] Patch openssl into rustls
5
5
6
6
---
7
- .gitignore | 1 +
8
7
rustls/Cargo.toml | 8 +++++++-
9
8
rustls/src/crypto/mod.rs | 2 ++
10
9
rustls/src/lib.rs | 2 +-
11
10
rustls/src/test_macros.rs | 7 +++++++
12
11
rustls/src/tls13/key_schedule.rs | 3 ++-
13
- 6 files changed, 20 insertions(+), 3 deletions(-)
12
+ 5 files changed, 19 insertions(+), 3 deletions(-)
14
13
15
- diff --git a/.gitignore b/.gitignore
16
- index 0351088b..6dd1392d 100644
17
- --- a/.gitignore
18
- +++ b/.gitignore
19
- @@ -10,3 +10,4 @@ admin/rustfmt
20
- **/._.DS_Store
21
- /.idea
22
- /default.profraw
23
- + rustls/src/crypto/openssl/
24
14
diff --git a/rustls/Cargo.toml b/rustls/Cargo.toml
25
- index b264ce9a..606a505f 100644
15
+ index 2192377f..071d9036 100644
26
16
--- a/rustls/Cargo.toml
27
17
+++ b/rustls/Cargo.toml
28
- @@ -31,9 +31,12 @@ webpki = { package = "rustls-webpki", version = "0.102.8", features = ["alloc"],
29
- pki-types = { package = "rustls-pki-types", version = "1.10", features = ["alloc"] }
18
+ @@ -32,8 +32,12 @@ pki-types = { package = "rustls-pki-types", version = "1.10", features = ["alloc
30
19
zeroize = "1.7"
31
- zlib-rs = { version = "0.3", optional = true }
20
+ zlib-rs = { version = "0.4", optional = true }
21
+
32
22
+ openssl = {version = "0.10"}
33
23
+ openssl-sys = "0.9"
34
24
+ foreign-types-shared = "0.1.1"
35
-
25
+ +
36
26
[features]
37
27
- default = ["aws_lc_rs", "logging", "std", "tls12"]
38
- + default = ["aws_lc_rs", "logging", "std", "tls12", "chacha", "x25519"]
28
+ + default = ["aws_lc_rs", "logging", "std", "tls12", "chacha", "x25519", "read_buf", "fips", "zlib" ]
39
29
std = ["webpki/std", "pki-types/std", "once_cell/std"]
40
30
logging = ["log"]
41
31
aws_lc_rs = ["dep:aws-lc-rs", "webpki/aws_lc_rs"]
42
- @@ -45,6 +48,9 @@ tls12 = []
32
+ @@ -45,6 +49,8 @@ tls12 = []
43
33
read_buf = ["rustversion", "std"]
44
34
fips = ["aws_lc_rs", "aws-lc-rs?/fips"]
45
35
zlib = ["dep:zlib-rs"]
46
36
+ chacha = []
47
37
+ x25519 = []
48
- +
49
38
50
39
[dev-dependencies]
51
40
base64 = "0.22"
@@ -63,7 +52,7 @@ index d970b545..ccb5424e 100644
63
52
pub mod cipher;
64
53
65
54
diff --git a/rustls/src/lib.rs b/rustls/src/lib.rs
66
- index 05356279..7635521d 100644
55
+ index 2c9b515a..8d11c8b7 100644
67
56
--- a/rustls/src/lib.rs
68
57
+++ b/rustls/src/lib.rs
69
58
@@ -311,7 +311,7 @@
0 commit comments