Skip to content

Commit e10afe6

Browse files
tarcieritarcieri
authored
der: rename Encode::to_vec => ::to_der (#898)
We've had complaints that the name `to_vec` is too ambiguous. The name `to_der` provides more clarity, and also better matches `Decode::from_der`.
1 parent 54aaa05 commit e10afe6

39 files changed

+184
-184
lines changed

‎cmpv2/tests/cert_req.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ fn cr_req_message_test() {
9999
protection.as_bytes().unwrap()
100100
);
101101

102-
let reencoded_req_01 = message.to_vec().unwrap();
102+
let reencoded_req_01 = message.to_der().unwrap();
103103
println!("Original : {:02X?}", req_01);
104104
println!("Reencoded: {:02X?}", reencoded_req_01);
105105
assert_eq!(req_01, reencoded_req_01.as_slice());
@@ -172,7 +172,7 @@ fn cr_rsp_message_test() {
172172
let protection = message.protection.as_ref().unwrap();
173173
assert_eq!(105u32, protection.encoded_len().unwrap().into());
174174

175-
let reencoded_req_01 = message.to_vec().unwrap();
175+
let reencoded_req_01 = message.to_der().unwrap();
176176
println!("Original : {:02X?}", req_01);
177177
println!("Reencoded: {:02X?}", reencoded_req_01);
178178
assert_eq!(req_01, reencoded_req_01.as_slice());

‎cmpv2/tests/genm_req.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn genm_req_header_test() {
1212
let header = result.unwrap();
1313
assert_eq!(header.pvno, Pvno::Cmp2000);
1414

15-
let reencoded_header_01 = header.to_vec().unwrap();
15+
let reencoded_header_01 = header.to_der().unwrap();
1616
println!("Original : {:02X?}", header_01);
1717
println!("Reencoded: {:02X?}", reencoded_header_01);
1818
assert_eq!(header_01, reencoded_header_01.as_slice());
@@ -28,7 +28,7 @@ fn genm_req_body_test() {
2828
assert!(result.is_ok());
2929
let body = result.unwrap();
3030

31-
let reencoded_body_01 = body.to_vec().unwrap();
31+
let reencoded_body_01 = body.to_der().unwrap();
3232
println!("Original : {:02X?}", body_01);
3333
println!("Reencoded: {:02X?}", reencoded_body_01);
3434
assert_eq!(body_01, reencoded_body_01.as_slice());
@@ -52,7 +52,7 @@ fn genm_req_message_test() {
5252
assert!(result.is_ok());
5353
let message = result.unwrap();
5454

55-
let reencoded_req_01 = message.to_vec().unwrap();
55+
let reencoded_req_01 = message.to_der().unwrap();
5656
println!("Original : {:02X?}", req_01);
5757
println!("Reencoded: {:02X?}", reencoded_req_01);
5858
assert_eq!(req_01, reencoded_req_01.as_slice());
@@ -76,7 +76,7 @@ fn genm_rsp_message_test() {
7676
assert!(result.is_ok());
7777
let message = result.unwrap();
7878

79-
let reencoded_req_01 = message.to_vec().unwrap();
79+
let reencoded_req_01 = message.to_der().unwrap();
8080
println!("Original : {:02X?}", req_01);
8181
println!("Reencoded: {:02X?}", reencoded_req_01);
8282
assert_eq!(req_01, reencoded_req_01.as_slice());

‎cmpv2/tests/init_req.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn ir_req_header_test() {
1919
let header = result.unwrap();
2020
assert_eq!(header.pvno, Pvno::Cmp2000);
2121

22-
let reencoded_header_01 = header.to_vec().unwrap();
22+
let reencoded_header_01 = header.to_der().unwrap();
2323
println!("Original : {:02X?}", header_01);
2424
println!("Reencoded: {:02X?}", reencoded_header_01);
2525
assert_eq!(header_01, reencoded_header_01.as_slice());
@@ -34,7 +34,7 @@ fn ir_req_body_test() {
3434
assert!(result.is_ok());
3535
let body = result.unwrap();
3636

37-
let reencoded_body_01 = body.to_vec().unwrap();
37+
let reencoded_body_01 = body.to_der().unwrap();
3838
println!("Original : {:02X?}", body_01);
3939
println!("Reencoded: {:02X?}", reencoded_body_01);
4040
assert_eq!(body_01, reencoded_body_01.as_slice());
@@ -131,7 +131,7 @@ fn ir_req_message_test() {
131131
protection.as_bytes().unwrap()
132132
);
133133

134-
let reencoded_req_01 = message.to_vec().unwrap();
134+
let reencoded_req_01 = message.to_der().unwrap();
135135
println!("Original : {:02X?}", req_01);
136136
println!("Reencoded: {:02X?}", reencoded_req_01);
137137
assert_eq!(req_01, reencoded_req_01.as_slice());
@@ -146,7 +146,7 @@ fn ir_rsp_header_test() {
146146
let header = result.unwrap();
147147
assert_eq!(header.pvno, Pvno::Cmp2000);
148148

149-
let reencoded_header_01 = header.to_vec().unwrap();
149+
let reencoded_header_01 = header.to_der().unwrap();
150150
println!("Original : {:02X?}", header_01);
151151
println!("Reencoded: {:02X?}", reencoded_header_01);
152152
assert_eq!(header_01, reencoded_header_01.as_slice());
@@ -161,7 +161,7 @@ fn ir_rsp_body_test() {
161161
assert!(result.is_ok());
162162
let body = result.unwrap();
163163

164-
let reencoded_body_01 = body.to_vec().unwrap();
164+
let reencoded_body_01 = body.to_der().unwrap();
165165
println!("Original : {:02X?}", body_01);
166166
println!("Reencoded: {:02X?}", reencoded_body_01);
167167
assert_eq!(body_01, reencoded_body_01.as_slice());
@@ -176,7 +176,7 @@ fn ir_certrepmessage_test() {
176176
assert!(result.is_ok());
177177
let cert_response = result.unwrap();
178178

179-
let reencoded_cert_response = cert_response.to_vec().unwrap();
179+
let reencoded_cert_response = cert_response.to_der().unwrap();
180180
println!("Original : {:02X?}", orig_cert_response);
181181
println!("Reencoded: {:02X?}", reencoded_cert_response);
182182
assert_eq!(orig_cert_response, reencoded_cert_response.as_slice());
@@ -191,7 +191,7 @@ fn ir_cert_responses_test() {
191191
assert!(result.is_ok());
192192
let cert_response = result.unwrap();
193193

194-
let reencoded_cert_response = cert_response.to_vec().unwrap();
194+
let reencoded_cert_response = cert_response.to_der().unwrap();
195195
println!("Original : {:02X?}", orig_cert_responses);
196196
println!("Reencoded: {:02X?}", reencoded_cert_response);
197197
assert_eq!(orig_cert_responses, reencoded_cert_response.as_slice());
@@ -206,7 +206,7 @@ fn ir_cert_response_test() {
206206
assert!(result.is_ok());
207207
let cert_response = result.unwrap();
208208

209-
let reencoded_cert_response = cert_response.to_vec().unwrap();
209+
let reencoded_cert_response = cert_response.to_der().unwrap();
210210
println!("Original : {:02X?}", orig_cert_response);
211211
println!("Reencoded: {:02X?}", reencoded_cert_response);
212212
assert_eq!(orig_cert_response, reencoded_cert_response.as_slice());
@@ -279,7 +279,7 @@ fn ir_rsp_message_test() {
279279
let protection = message.protection.as_ref().unwrap();
280280
assert_eq!(107u32, protection.encoded_len().unwrap().into());
281281

282-
let reencoded_req_01 = message.to_vec().unwrap();
282+
let reencoded_req_01 = message.to_der().unwrap();
283283
println!("Original : {:02X?}", req_01);
284284
println!("Reencoded: {:02X?}", reencoded_req_01);
285285
assert_eq!(req_01, reencoded_req_01.as_slice());

‎cmpv2/tests/key_update_req.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn kur_req_header_test() {
1212
let header = result.unwrap();
1313
assert_eq!(header.pvno, Pvno::Cmp2000);
1414

15-
let reencoded_header_01 = header.to_vec().unwrap();
15+
let reencoded_header_01 = header.to_der().unwrap();
1616
println!("Original : {:02X?}", header_01);
1717
println!("Reencoded: {:02X?}", reencoded_header_01);
1818
assert_eq!(header_01, reencoded_header_01.as_slice());
@@ -27,7 +27,7 @@ fn kur_req_body_test() {
2727
assert!(result.is_ok());
2828
let body = result.unwrap();
2929

30-
let reencoded_body_01 = body.to_vec().unwrap();
30+
let reencoded_body_01 = body.to_der().unwrap();
3131
println!("Original : {:02X?}", body_01);
3232
println!("Reencoded: {:02X?}", reencoded_body_01);
3333
assert_eq!(body_01, reencoded_body_01.as_slice());
@@ -51,7 +51,7 @@ fn kur_req_message_test() {
5151
assert!(result.is_ok());
5252
let message = result.unwrap();
5353

54-
let reencoded_req_01 = message.to_vec().unwrap();
54+
let reencoded_req_01 = message.to_der().unwrap();
5555
println!("Original : {:02X?}", req_01);
5656
println!("Reencoded: {:02X?}", reencoded_req_01);
5757
assert_eq!(req_01, reencoded_req_01.as_slice());
@@ -75,7 +75,7 @@ fn kur_rsp_message_test() {
7575
assert!(result.is_ok());
7676
let message = result.unwrap();
7777

78-
let reencoded_req_01 = message.to_vec().unwrap();
78+
let reencoded_req_01 = message.to_der().unwrap();
7979
println!("Original : {:02X?}", req_01);
8080
println!("Reencoded: {:02X?}", reencoded_req_01);
8181
assert_eq!(req_01, reencoded_req_01.as_slice());
@@ -99,7 +99,7 @@ fn failed_kur_rsp_message_test() {
9999
assert!(result.is_ok());
100100
let message = result.unwrap();
101101

102-
let reencoded_req_01 = message.to_vec().unwrap();
102+
let reencoded_req_01 = message.to_der().unwrap();
103103
println!("Original : {:02X?}", req_01);
104104
println!("Reencoded: {:02X?}", reencoded_req_01);
105105
assert_eq!(req_01, reencoded_req_01.as_slice());

‎cmpv2/tests/p10cr_req.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ fn p10cr_req_message_test() {
7171
protection.as_bytes().unwrap()
7272
);
7373

74-
let reencoded_req_01 = message.to_vec().unwrap();
74+
let reencoded_req_01 = message.to_der().unwrap();
7575
println!("Original : {:02X?}", req_01);
7676
println!("Reencoded: {:02X?}", reencoded_req_01);
7777
assert_eq!(req_01, reencoded_req_01.as_slice());
@@ -95,7 +95,7 @@ fn p10cr_rsp_message_test() {
9595
assert!(result.is_ok());
9696
let message = result.unwrap();
9797

98-
let reencoded_req_01 = message.to_vec().unwrap();
98+
let reencoded_req_01 = message.to_der().unwrap();
9999
println!("Original : {:02X?}", req_01);
100100
println!("Reencoded: {:02X?}", reencoded_req_01);
101101
assert_eq!(req_01, reencoded_req_01.as_slice());

‎cmpv2/tests/rr_req.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn rr_rsp_header_test() {
1212
let header = result.unwrap();
1313
assert_eq!(header.pvno, Pvno::Cmp2000);
1414

15-
let reencoded_header_01 = header.to_vec().unwrap();
15+
let reencoded_header_01 = header.to_der().unwrap();
1616
println!("Original : {:02X?}", header_01);
1717
println!("Reencoded: {:02X?}", reencoded_header_01);
1818
assert_eq!(header_01, reencoded_header_01.as_slice());
@@ -27,7 +27,7 @@ fn rr_rsp_body_test() {
2727
assert!(result.is_ok());
2828
let body = result.unwrap();
2929

30-
let reencoded_body_01 = body.to_vec().unwrap();
30+
let reencoded_body_01 = body.to_der().unwrap();
3131
println!("Original : {:02X?}", body_01);
3232
println!("Reencoded: {:02X?}", reencoded_body_01);
3333
assert_eq!(body_01, reencoded_body_01.as_slice());
@@ -51,7 +51,7 @@ fn rr_req_message_test() {
5151
assert!(result.is_ok());
5252
let message = result.unwrap();
5353

54-
let reencoded_req_01 = message.to_vec().unwrap();
54+
let reencoded_req_01 = message.to_der().unwrap();
5555
println!("Original : {:02X?}", req_01);
5656
println!("Reencoded: {:02X?}", reencoded_req_01);
5757
assert_eq!(req_01, reencoded_req_01.as_slice());
@@ -75,7 +75,7 @@ fn rr_rsp_message_test() {
7575
assert!(result.is_ok());
7676
let message = result.unwrap();
7777

78-
let reencoded_req_01 = message.to_vec().unwrap();
78+
let reencoded_req_01 = message.to_der().unwrap();
7979
println!("Original : {:02X?}", req_01);
8080
println!("Reencoded: {:02X?}", reencoded_req_01);
8181
assert_eq!(req_01, reencoded_req_01.as_slice());

‎cms/src/cert.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl ValueOrd for CertificateChoices {
3737
fn value_cmp(&self, other: &Self) -> der::Result<Ordering> {
3838
use der::DerOrd;
3939
use der::Encode;
40-
self.to_vec()?.der_cmp(&other.to_vec()?)
40+
self.to_der()?.der_cmp(&other.to_der()?)
4141
}
4242
}
4343

‎cms/src/enveloped_data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ impl ValueOrd for RecipientInfo {
138138
fn value_cmp(&self, other: &Self) -> der::Result<Ordering> {
139139
use der::DerOrd;
140140
use der::Encode;
141-
self.to_vec()?.der_cmp(&other.to_vec()?)
141+
self.to_der()?.der_cmp(&other.to_der()?)
142142
}
143143
}
144144

‎cms/src/revocation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ impl ValueOrd for RevocationInfoChoice {
4343
fn value_cmp(&self, other: &Self) -> der::Result<Ordering> {
4444
use der::DerOrd;
4545
use der::Encode;
46-
self.to_vec()?.der_cmp(&other.to_vec()?)
46+
self.to_der()?.der_cmp(&other.to_der()?)
4747
}
4848
}
4949

‎cms/src/signed_data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ pub enum SignerIdentifier {
159159
impl ValueOrd for SignerIdentifier {
160160
fn value_cmp(&self, other: &Self) -> der::Result<Ordering> {
161161
use der::Encode;
162-
self.to_vec()?.der_cmp(&other.to_vec()?)
162+
self.to_der()?.der_cmp(&other.to_der()?)
163163
}
164164
}
165165

‎cms/tests/compressed_data.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fn reencode_compressed_data_test() {
1818
);
1919

2020
// re-encode the AnyRef to get the SignedData bytes
21-
let bytes = ci.content.to_vec().unwrap();
21+
let bytes = ci.content.to_der().unwrap();
2222

2323
// parse as DigestedData then re-encode
2424
let data = CompressedData::from_der(bytes.as_slice()).unwrap();
@@ -35,7 +35,7 @@ fn reencode_compressed_data_test() {
3535
);
3636
assert_eq!(None, data.compression_alg.parameters);
3737

38-
let reencoded_data = data.to_vec().unwrap();
38+
let reencoded_data = data.to_der().unwrap();
3939

4040
// assemble a new ContentInfo and encode it
4141
let ci2 = ContentInfo {
@@ -45,7 +45,7 @@ fn reencode_compressed_data_test() {
4545
.try_into()
4646
.unwrap(),
4747
};
48-
let reencoded_data_inci = ci2.to_vec().unwrap();
48+
let reencoded_data_inci = ci2.to_der().unwrap();
4949

5050
// should match the original
5151
assert_eq!(reencoded_data_inci, der_ci)

‎cms/tests/digested_data.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fn reencode_digested_data_test() {
1515
assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_DIGESTED_DATA);
1616

1717
// re-encode the AnyRef to get the SignedData bytes
18-
let bytes = ci.content.to_vec().unwrap();
18+
let bytes = ci.content.to_der().unwrap();
1919

2020
// parse as DigestedData then re-encode
2121
let data = DigestedData::from_der(bytes.as_slice()).unwrap();
@@ -39,7 +39,7 @@ fn reencode_digested_data_test() {
3939
assert_eq!(None, data.digest_alg.parameters);
4040
assert_eq!(data.digest.as_bytes(), hash);
4141

42-
let reencoded_data = data.to_vec().unwrap();
42+
let reencoded_data = data.to_der().unwrap();
4343

4444
// assemble a new ContentInfo and encode it
4545
let ci2 = ContentInfo {
@@ -49,7 +49,7 @@ fn reencode_digested_data_test() {
4949
.try_into()
5050
.unwrap(),
5151
};
52-
let reencoded_data_inci = ci2.to_vec().unwrap();
52+
let reencoded_data_inci = ci2.to_der().unwrap();
5353

5454
// should match the original
5555
assert_eq!(reencoded_data_inci, der_ci)

‎cms/tests/encrypted_data.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fn reencode_encrypted_data_test() {
1515
assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_ENCRYPTED_DATA);
1616

1717
// re-encode the AnyRef to get the SignedData bytes
18-
let bytes = ci.content.to_vec().unwrap();
18+
let bytes = ci.content.to_der().unwrap();
1919

2020
// parse as EncryptedData then re-encode
2121
let data = EncryptedData::from_der(bytes.as_slice()).unwrap();
@@ -41,7 +41,7 @@ fn reencode_encrypted_data_test() {
4141
iv
4242
);
4343

44-
let reencoded_data = data.to_vec().unwrap();
44+
let reencoded_data = data.to_der().unwrap();
4545

4646
// assemble a new ContentInfo and encode it
4747
let ci2 = ContentInfo {
@@ -51,7 +51,7 @@ fn reencode_encrypted_data_test() {
5151
.try_into()
5252
.unwrap(),
5353
};
54-
let reencoded_data_inci = ci2.to_vec().unwrap();
54+
let reencoded_data_inci = ci2.to_der().unwrap();
5555

5656
// should match the original
5757
assert_eq!(reencoded_data_inci, der_ci)

0 commit comments

Comments
 (0)