Skip to content

der: rename Encode::to_vec => ::to_der #898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tarcieri merged 1 commit into from
Feb 27, 2023
Merged

der: rename Encode::to_vec => ::to_der #898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmpv2/tests/cert_req.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ fn cr_req_message_test() {
protection.as_bytes().unwrap()
);

let reencoded_req_01 = message.to_vec().unwrap();
let reencoded_req_01 = message.to_der().unwrap();
println!("Original : {:02X?}", req_01);
println!("Reencoded: {:02X?}", reencoded_req_01);
assert_eq!(req_01, reencoded_req_01.as_slice());
Expand Down Expand Up @@ -172,7 +172,7 @@ fn cr_rsp_message_test() {
let protection = message.protection.as_ref().unwrap();
assert_eq!(105u32, protection.encoded_len().unwrap().into());

let reencoded_req_01 = message.to_vec().unwrap();
let reencoded_req_01 = message.to_der().unwrap();
println!("Original : {:02X?}", req_01);
println!("Reencoded: {:02X?}", reencoded_req_01);
assert_eq!(req_01, reencoded_req_01.as_slice());
Expand Down
8 changes: 4 additions & 4 deletions cmpv2/tests/genm_req.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn genm_req_header_test() {
let header = result.unwrap();
assert_eq!(header.pvno, Pvno::Cmp2000);

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

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

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

let reencoded_req_01 = message.to_vec().unwrap();
let reencoded_req_01 = message.to_der().unwrap();
println!("Original : {:02X?}", req_01);
println!("Reencoded: {:02X?}", reencoded_req_01);
assert_eq!(req_01, reencoded_req_01.as_slice());
Expand Down
18 changes: 9 additions & 9 deletions cmpv2/tests/init_req.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fn ir_req_header_test() {
let header = result.unwrap();
assert_eq!(header.pvno, Pvno::Cmp2000);

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

let reencoded_body_01 = body.to_vec().unwrap();
let reencoded_body_01 = body.to_der().unwrap();
println!("Original : {:02X?}", body_01);
println!("Reencoded: {:02X?}", reencoded_body_01);
assert_eq!(body_01, reencoded_body_01.as_slice());
Expand Down Expand Up @@ -131,7 +131,7 @@ fn ir_req_message_test() {
protection.as_bytes().unwrap()
);

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

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

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

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

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

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

let reencoded_req_01 = message.to_vec().unwrap();
let reencoded_req_01 = message.to_der().unwrap();
println!("Original : {:02X?}", req_01);
println!("Reencoded: {:02X?}", reencoded_req_01);
assert_eq!(req_01, reencoded_req_01.as_slice());
Expand Down
10 changes: 5 additions & 5 deletions cmpv2/tests/key_update_req.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn kur_req_header_test() {
let header = result.unwrap();
assert_eq!(header.pvno, Pvno::Cmp2000);

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

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

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

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

let reencoded_req_01 = message.to_vec().unwrap();
let reencoded_req_01 = message.to_der().unwrap();
println!("Original : {:02X?}", req_01);
println!("Reencoded: {:02X?}", reencoded_req_01);
assert_eq!(req_01, reencoded_req_01.as_slice());
Expand Down
4 changes: 2 additions & 2 deletions cmpv2/tests/p10cr_req.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ fn p10cr_req_message_test() {
protection.as_bytes().unwrap()
);

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

let reencoded_req_01 = message.to_vec().unwrap();
let reencoded_req_01 = message.to_der().unwrap();
println!("Original : {:02X?}", req_01);
println!("Reencoded: {:02X?}", reencoded_req_01);
assert_eq!(req_01, reencoded_req_01.as_slice());
Expand Down
8 changes: 4 additions & 4 deletions cmpv2/tests/rr_req.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn rr_rsp_header_test() {
let header = result.unwrap();
assert_eq!(header.pvno, Pvno::Cmp2000);

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

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

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

let reencoded_req_01 = message.to_vec().unwrap();
let reencoded_req_01 = message.to_der().unwrap();
println!("Original : {:02X?}", req_01);
println!("Reencoded: {:02X?}", reencoded_req_01);
assert_eq!(req_01, reencoded_req_01.as_slice());
Expand Down
2 changes: 1 addition & 1 deletion cms/src/cert.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ impl ValueOrd for CertificateChoices {
fn value_cmp(&self, other: &Self) -> der::Result<Ordering> {
use der::DerOrd;
use der::Encode;
self.to_vec()?.der_cmp(&other.to_vec()?)
self.to_der()?.der_cmp(&other.to_der()?)
}
}

Expand Down
2 changes: 1 addition & 1 deletion cms/src/enveloped_data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ impl ValueOrd for RecipientInfo {
fn value_cmp(&self, other: &Self) -> der::Result<Ordering> {
use der::DerOrd;
use der::Encode;
self.to_vec()?.der_cmp(&other.to_vec()?)
self.to_der()?.der_cmp(&other.to_der()?)
}
}

Expand Down
2 changes: 1 addition & 1 deletion cms/src/revocation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ impl ValueOrd for RevocationInfoChoice {
fn value_cmp(&self, other: &Self) -> der::Result<Ordering> {
use der::DerOrd;
use der::Encode;
self.to_vec()?.der_cmp(&other.to_vec()?)
self.to_der()?.der_cmp(&other.to_der()?)
}
}

Expand Down
2 changes: 1 addition & 1 deletion cms/src/signed_data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ pub enum SignerIdentifier {
impl ValueOrd for SignerIdentifier {
fn value_cmp(&self, other: &Self) -> der::Result<Ordering> {
use der::Encode;
self.to_vec()?.der_cmp(&other.to_vec()?)
self.to_der()?.der_cmp(&other.to_der()?)
}
}

Expand Down
6 changes: 3 additions & 3 deletions cms/tests/compressed_data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fn reencode_compressed_data_test() {
);

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

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

let reencoded_data = data.to_vec().unwrap();
let reencoded_data = data.to_der().unwrap();

// assemble a new ContentInfo and encode it
let ci2 = ContentInfo {
Expand All @@ -45,7 +45,7 @@ fn reencode_compressed_data_test() {
.try_into()
.unwrap(),
};
let reencoded_data_inci = ci2.to_vec().unwrap();
let reencoded_data_inci = ci2.to_der().unwrap();

// should match the original
assert_eq!(reencoded_data_inci, der_ci)
Expand Down
6 changes: 3 additions & 3 deletions cms/tests/digested_data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fn reencode_digested_data_test() {
assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_DIGESTED_DATA);

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

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

let reencoded_data = data.to_vec().unwrap();
let reencoded_data = data.to_der().unwrap();

// assemble a new ContentInfo and encode it
let ci2 = ContentInfo {
Expand All @@ -49,7 +49,7 @@ fn reencode_digested_data_test() {
.try_into()
.unwrap(),
};
let reencoded_data_inci = ci2.to_vec().unwrap();
let reencoded_data_inci = ci2.to_der().unwrap();

// should match the original
assert_eq!(reencoded_data_inci, der_ci)
Expand Down
6 changes: 3 additions & 3 deletions cms/tests/encrypted_data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fn reencode_encrypted_data_test() {
assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_ENCRYPTED_DATA);

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

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

let reencoded_data = data.to_vec().unwrap();
let reencoded_data = data.to_der().unwrap();

// assemble a new ContentInfo and encode it
let ci2 = ContentInfo {
Expand All @@ -51,7 +51,7 @@ fn reencode_encrypted_data_test() {
.try_into()
.unwrap(),
};
let reencoded_data_inci = ci2.to_vec().unwrap();
let reencoded_data_inci = ci2.to_der().unwrap();

// should match the original
assert_eq!(reencoded_data_inci, der_ci)
Expand Down
Loading