1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
|
Revert upstream update of test-cert-gen from 0.1 to 0.9, we patch out the
use of test-cert-gen in a later patch, but this is needed so that said patch
has the correct baseline to work with.
This patch is based on a revert of upstream commits
7493a48efe60b05d2caa7995e865da291059f06b,
f5e5e6d6be8b66e16da4efcb2c614f835dfd2849, and part of
a30fedc051b3eb2c17d3d2508b63485b6fc230d3 adapted for use in the Debian package
by Peter Michael Green.
Index: native-tls/src/test.rs
===================================================================
--- native-tls.orig/src/test.rs
+++ native-tls/src/test.rs
@@ -56,8 +56,8 @@ fn server_no_root_certs() { 1
let keys = test_cert_gen::keys();
let identity = p!(Identity::from_pkcs12(
- &keys.server.cert_and_key_pkcs12.pkcs12.0,
- &keys.server.cert_and_key_pkcs12.password
+ &keys.server.pkcs12,
+ &keys.server.pkcs12_password
));
let builder = p!(TlsAcceptor::new(identity));
@@ -75,7 +75,7 @@ fn server_no_root_certs() { 2
p!(socket.write_all(b"world"));
});
- let root_ca = Certificate::from_der(keys.client.ca.get_der()).unwrap();
+ let root_ca = Certificate::from_der(&keys.client.cert_der).unwrap();
let socket = p!(TcpStream::connect(("localhost", port)));
let builder = p!(TlsConnector::builder()
@@ -97,8 +97,8 @@ fn server() { 3
let keys = test_cert_gen::keys();
let identity = p!(Identity::from_pkcs12(
- &keys.server.cert_and_key_pkcs12.pkcs12.0,
- &keys.server.cert_and_key_pkcs12.password
+ &keys.server.pkcs12,
+ &keys.server.pkcs12_password
));
let builder = p!(TlsAcceptor::new(identity));
@@ -116,7 +116,7 @@ fn server() { 4
p!(socket.write_all(b"world"));
});
- let root_ca = Certificate::from_der(keys.client.ca.get_der()).unwrap();
+ let root_ca = Certificate::from_der(&keys.client.cert_der).unwrap();
let socket = p!(TcpStream::connect(("localhost", port)));
let builder = p!(TlsConnector::builder()
@@ -138,7 +138,7 @@ fn certificate_from_pem() { 5
let keys = test_cert_gen::keys();
let der_path = dir.path().join("cert.der");
- fs::write(&der_path, keys.client.ca.get_der()).unwrap();
+ fs::write(&der_path, &keys.client.cert_der).unwrap();
let output = Command::new("openssl")
.arg("x509")
.arg("-in")
@@ -152,7 +152,7 @@ fn certificate_from_pem() {
assert!(output.status.success());
let cert = Certificate::from_pem(&output.stdout).unwrap();
- assert_eq!(cert.to_der().unwrap(), keys.client.ca.get_der());
+ assert_eq!(cert.to_der().unwrap(), keys.client.cert_der);
}
#[test]
@@ -160,8 +160,8 @@ fn peer_certificate() {
let keys = test_cert_gen::keys();
let identity = p!(Identity::from_pkcs12(
- &keys.server.cert_and_key_pkcs12.pkcs12.0,
- &keys.server.cert_and_key_pkcs12.password
+ &keys.server.pkcs12,
+ &keys.server.pkcs12_password
));
let builder = p!(TlsAcceptor::new(identity));
@@ -174,7 +174,7 @@ fn peer_certificate() {
assert!(socket.peer_certificate().unwrap().is_none());
});
- let root_ca = Certificate::from_der(keys.client.ca.get_der()).unwrap();
+ let root_ca = Certificate::from_der(&keys.client.cert_der).unwrap();
let socket = p!(TcpStream::connect(("localhost", port)));
let builder = p!(TlsConnector::builder()
@@ -183,10 +183,7 @@ fn peer_certificate() {
let socket = p!(builder.connect("localhost", socket));
let cert = socket.peer_certificate().unwrap().unwrap();
- assert_eq!(
- cert.to_der().unwrap(),
- keys.server.cert_and_key.cert.get_der()
- );
+ assert_eq!(cert.to_der().unwrap(), keys.client.cert_der);
p!(j.join());
}
@@ -196,8 +193,8 @@ fn server_tls11_only() {
let keys = test_cert_gen::keys();
let identity = p!(Identity::from_pkcs12(
- &keys.server.cert_and_key_pkcs12.pkcs12.0,
- &keys.server.cert_and_key_pkcs12.password
+ &keys.server.pkcs12,
+ &keys.server.pkcs12_password
));
let builder = p!(TlsAcceptor::builder(identity)
.min_protocol_version(Some(Protocol::Tlsv12))
@@ -218,7 +215,7 @@ fn server_tls11_only() {
p!(socket.write_all(b"world"));
});
- let root_ca = Certificate::from_der(keys.client.ca.get_der()).unwrap();
+ let root_ca = Certificate::from_der(&keys.client.cert_der).unwrap();
let socket = p!(TcpStream::connect(("localhost", port)));
let builder = p!(TlsConnector::builder()
@@ -241,8 +238,8 @@ fn server_no_shared_protocol() {
let keys = test_cert_gen::keys();
let identity = p!(Identity::from_pkcs12(
- &keys.server.cert_and_key_pkcs12.pkcs12.0,
- &keys.server.cert_and_key_pkcs12.password
+ &keys.server.pkcs12,
+ &keys.server.pkcs12_password
));
let builder = p!(TlsAcceptor::builder(identity)
.min_protocol_version(Some(Protocol::Tlsv12))
@@ -256,7 +253,7 @@ fn server_no_shared_protocol() {
assert!(builder.accept(socket).is_err());
});
- let root_ca = Certificate::from_der(keys.client.ca.get_der()).unwrap();
+ let root_ca = Certificate::from_der(&keys.client.cert_der).unwrap();
let socket = p!(TcpStream::connect(("localhost", port)));
let builder = p!(TlsConnector::builder()
@@ -274,8 +271,8 @@ fn server_untrusted() {
let keys = test_cert_gen::keys();
let identity = p!(Identity::from_pkcs12(
- &keys.server.cert_and_key_pkcs12.pkcs12.0,
- &keys.server.cert_and_key_pkcs12.password
+ &keys.server.pkcs12,
+ &keys.server.pkcs12_password
));
let builder = p!(TlsAcceptor::new(identity));
@@ -301,8 +298,8 @@ fn server_untrusted_unverified() {
let keys = test_cert_gen::keys();
let identity = p!(Identity::from_pkcs12(
- &keys.server.cert_and_key_pkcs12.pkcs12.0,
- &keys.server.cert_and_key_pkcs12.password
+ &keys.server.pkcs12,
+ &keys.server.pkcs12_password
));
let builder = p!(TlsAcceptor::new(identity));
@@ -339,12 +336,12 @@ fn import_same_identity_multiple_times()
let keys = test_cert_gen::keys();
let _ = p!(Identity::from_pkcs12(
- &keys.server.cert_and_key_pkcs12.pkcs12.0,
- &keys.server.cert_and_key_pkcs12.password
+ &keys.server.pkcs12,
+ &keys.server.pkcs12_password
));
let _ = p!(Identity::from_pkcs12(
- &keys.server.cert_and_key_pkcs12.pkcs12.0,
- &keys.server.cert_and_key_pkcs12.password
+ &keys.server.pkcs12,
+ &keys.server.pkcs12_password
));
let p8buf = include_bytes!("../test/chain.pem");
@@ -368,8 +365,8 @@ fn shutdown() {
let keys = test_cert_gen::keys();
let identity = p!(Identity::from_pkcs12(
- &keys.server.cert_and_key_pkcs12.pkcs12.0,
- &keys.server.cert_and_key_pkcs12.password
+ &keys.server.pkcs12,
+ &keys.server.pkcs12_password
));
let builder = p!(TlsAcceptor::new(identity));
@@ -388,7 +385,7 @@ fn shutdown() {
p!(socket.shutdown());
});
- let root_ca = Certificate::from_der(keys.client.ca.get_der()).unwrap();
+ let root_ca = Certificate::from_der(&keys.client.cert_der).unwrap();
let socket = p!(TcpStream::connect(("localhost", port)));
let builder = p!(TlsConnector::builder()
Index: native-tls/Cargo.toml
===================================================================
--- native-tls.orig/Cargo.toml
+++ native-tls/Cargo.toml
@@ -32,7 +32,7 @@ version = "1.0"
version = "3.0"
[dev-dependencies.test-cert-gen]
-version = "0.9"
+version = "0.1"
[features]
alpn = []
|
