Skip to content

Commit 994ef83

Browse files
committed
update rustls patch
1 parent bc19cc8 commit 994ef83

File tree

1 file changed

+12
-23
lines changed

1 file changed

+12
-23
lines changed

tests/0001-Patch-openssl-into-rustls.patch

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,40 @@
1-
From 8431dc07cc69fda5d6e74f916a1e6ac37a652465 Mon Sep 17 00:00:00 2001
1+
From 3d19ba6b88f43b8281a346bb9b5e07c9598d8513 Mon Sep 17 00:00:00 2001
22
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
55

66
---
7-
.gitignore | 1 +
87
rustls/Cargo.toml | 8 +++++++-
98
rustls/src/crypto/mod.rs | 2 ++
109
rustls/src/lib.rs | 2 +-
1110
rustls/src/test_macros.rs | 7 +++++++
1211
rustls/src/tls13/key_schedule.rs | 3 ++-
13-
6 files changed, 20 insertions(+), 3 deletions(-)
12+
5 files changed, 19 insertions(+), 3 deletions(-)
1413

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/
2414
diff --git a/rustls/Cargo.toml b/rustls/Cargo.toml
25-
index b264ce9a..606a505f 100644
15+
index 2192377f..071d9036 100644
2616
--- a/rustls/Cargo.toml
2717
+++ 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
3019
zeroize = "1.7"
31-
zlib-rs = { version = "0.3", optional = true }
20+
zlib-rs = { version = "0.4", optional = true }
21+
3222
+openssl = {version = "0.10"}
3323
+openssl-sys = "0.9"
3424
+foreign-types-shared = "0.1.1"
35-
25+
+
3626
[features]
3727
-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"]
3929
std = ["webpki/std", "pki-types/std", "once_cell/std"]
4030
logging = ["log"]
4131
aws_lc_rs = ["dep:aws-lc-rs", "webpki/aws_lc_rs"]
42-
@@ -45,6 +48,9 @@ tls12 = []
32+
@@ -45,6 +49,8 @@ tls12 = []
4333
read_buf = ["rustversion", "std"]
4434
fips = ["aws_lc_rs", "aws-lc-rs?/fips"]
4535
zlib = ["dep:zlib-rs"]
4636
+chacha = []
4737
+x25519 = []
48-
+
4938

5039
[dev-dependencies]
5140
base64 = "0.22"
@@ -63,7 +52,7 @@ index d970b545..ccb5424e 100644
6352
pub mod cipher;
6453

6554
diff --git a/rustls/src/lib.rs b/rustls/src/lib.rs
66-
index 05356279..7635521d 100644
55+
index 2c9b515a..8d11c8b7 100644
6756
--- a/rustls/src/lib.rs
6857
+++ b/rustls/src/lib.rs
6958
@@ -311,7 +311,7 @@

0 commit comments

Comments
 (0)