diff --git a/cmpv2/tests/cert_req.rs b/cmpv2/tests/cert_req.rs index b7dacd819..1dc38ad2f 100644 --- a/cmpv2/tests/cert_req.rs +++ b/cmpv2/tests/cert_req.rs @@ -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()); @@ -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()); diff --git a/cmpv2/tests/genm_req.rs b/cmpv2/tests/genm_req.rs index cd3dc466f..6781e6155 100644 --- a/cmpv2/tests/genm_req.rs +++ b/cmpv2/tests/genm_req.rs @@ -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()); @@ -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()); @@ -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()); @@ -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()); diff --git a/cmpv2/tests/init_req.rs b/cmpv2/tests/init_req.rs index dabfb70fd..3a9d0a98c 100644 --- a/cmpv2/tests/init_req.rs +++ b/cmpv2/tests/init_req.rs @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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()); diff --git a/cmpv2/tests/key_update_req.rs b/cmpv2/tests/key_update_req.rs index 9a57f7da2..1e8fe75de 100644 --- a/cmpv2/tests/key_update_req.rs +++ b/cmpv2/tests/key_update_req.rs @@ -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()); @@ -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()); @@ -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()); @@ -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()); @@ -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()); diff --git a/cmpv2/tests/p10cr_req.rs b/cmpv2/tests/p10cr_req.rs index 81ede9d50..0af25935c 100644 --- a/cmpv2/tests/p10cr_req.rs +++ b/cmpv2/tests/p10cr_req.rs @@ -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()); @@ -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()); diff --git a/cmpv2/tests/rr_req.rs b/cmpv2/tests/rr_req.rs index 5107f105f..d3bf23a43 100644 --- a/cmpv2/tests/rr_req.rs +++ b/cmpv2/tests/rr_req.rs @@ -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()); @@ -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()); @@ -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()); @@ -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()); diff --git a/cms/src/cert.rs b/cms/src/cert.rs index 50975b2fe..d4c4d7c9b 100644 --- a/cms/src/cert.rs +++ b/cms/src/cert.rs @@ -37,7 +37,7 @@ impl ValueOrd for CertificateChoices { fn value_cmp(&self, other: &Self) -> der::Result { use der::DerOrd; use der::Encode; - self.to_vec()?.der_cmp(&other.to_vec()?) + self.to_der()?.der_cmp(&other.to_der()?) } } diff --git a/cms/src/enveloped_data.rs b/cms/src/enveloped_data.rs index 3b327714a..8eaeed596 100644 --- a/cms/src/enveloped_data.rs +++ b/cms/src/enveloped_data.rs @@ -138,7 +138,7 @@ impl ValueOrd for RecipientInfo { fn value_cmp(&self, other: &Self) -> der::Result { use der::DerOrd; use der::Encode; - self.to_vec()?.der_cmp(&other.to_vec()?) + self.to_der()?.der_cmp(&other.to_der()?) } } diff --git a/cms/src/revocation.rs b/cms/src/revocation.rs index a4e522177..d1872fd65 100644 --- a/cms/src/revocation.rs +++ b/cms/src/revocation.rs @@ -43,7 +43,7 @@ impl ValueOrd for RevocationInfoChoice { fn value_cmp(&self, other: &Self) -> der::Result { use der::DerOrd; use der::Encode; - self.to_vec()?.der_cmp(&other.to_vec()?) + self.to_der()?.der_cmp(&other.to_der()?) } } diff --git a/cms/src/signed_data.rs b/cms/src/signed_data.rs index 982b044df..758c3a9d3 100644 --- a/cms/src/signed_data.rs +++ b/cms/src/signed_data.rs @@ -159,7 +159,7 @@ pub enum SignerIdentifier { impl ValueOrd for SignerIdentifier { fn value_cmp(&self, other: &Self) -> der::Result { use der::Encode; - self.to_vec()?.der_cmp(&other.to_vec()?) + self.to_der()?.der_cmp(&other.to_der()?) } } diff --git a/cms/tests/compressed_data.rs b/cms/tests/compressed_data.rs index 9528e4be1..5d569fea8 100644 --- a/cms/tests/compressed_data.rs +++ b/cms/tests/compressed_data.rs @@ -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(); @@ -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 { @@ -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) diff --git a/cms/tests/digested_data.rs b/cms/tests/digested_data.rs index 39f734ebe..e4187d7f0 100644 --- a/cms/tests/digested_data.rs +++ b/cms/tests/digested_data.rs @@ -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(); @@ -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 { @@ -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) diff --git a/cms/tests/encrypted_data.rs b/cms/tests/encrypted_data.rs index c1fdc5c08..c710d3426 100644 --- a/cms/tests/encrypted_data.rs +++ b/cms/tests/encrypted_data.rs @@ -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(); @@ -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 { @@ -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) diff --git a/cms/tests/enveloped_data.rs b/cms/tests/enveloped_data.rs index e195b6011..8d2886213 100644 --- a/cms/tests/enveloped_data.rs +++ b/cms/tests/enveloped_data.rs @@ -21,7 +21,7 @@ fn reencode_enveloped_data_ktri_test() { assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_ENVELOPED_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 EnvelopedData then re-encode let data = EnvelopedData::from_der(bytes.as_slice()).unwrap(); @@ -74,7 +74,7 @@ fn reencode_enveloped_data_ktri_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 { @@ -84,7 +84,7 @@ fn reencode_enveloped_data_ktri_test() { .try_into() .unwrap(), }; - let reencoded_data_in_ci = ci2.to_vec().unwrap(); + let reencoded_data_in_ci = ci2.to_der().unwrap(); // should match the original assert_eq!(reencoded_data_in_ci, der_ci) @@ -99,7 +99,7 @@ fn reencode_enveloped_data_kari_test() { assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_ENVELOPED_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 EnvelopedData then re-encode let data = EnvelopedData::from_der(bytes.as_slice()).unwrap(); @@ -136,7 +136,7 @@ fn reencode_enveloped_data_kari_test() { .parameters .as_ref() .unwrap() - .to_vec() + .to_der() .unwrap() .as_slice(), ) @@ -175,7 +175,7 @@ fn reencode_enveloped_data_kari_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 { @@ -185,7 +185,7 @@ fn reencode_enveloped_data_kari_test() { .try_into() .unwrap(), }; - let reencoded_data_in_ci = ci2.to_vec().unwrap(); + let reencoded_data_in_ci = ci2.to_der().unwrap(); // should match the original assert_eq!(reencoded_data_in_ci, der_ci) @@ -200,7 +200,7 @@ fn reencode_enveloped_data_pwri_test() { assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_ENVELOPED_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 EnvelopedData then re-encode let data = EnvelopedData::from_der(bytes.as_slice()).unwrap(); @@ -221,7 +221,7 @@ fn reencode_enveloped_data_pwri_test() { ObjectIdentifier::new_unwrap("1.2.840.113549.1.5.12"), kdf_alg.oid ); - let enc_pbkdf2 = kdf_alg.parameters.as_ref().unwrap().to_vec().unwrap(); + let enc_pbkdf2 = kdf_alg.parameters.as_ref().unwrap().to_der().unwrap(); let pbkdf2 = Pbkdf2Params::from_der(enc_pbkdf2.as_slice()).unwrap(); assert_eq!(hex!("7F EE A8 FD 56 8E 8F 07"), pbkdf2.salt); assert_eq!(2048, pbkdf2.iteration_count); @@ -234,7 +234,7 @@ fn reencode_enveloped_data_pwri_test() { .parameters .as_ref() .unwrap() - .to_vec() + .to_der() .unwrap() .as_slice(), ) @@ -265,7 +265,7 @@ fn reencode_enveloped_data_pwri_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 { @@ -275,7 +275,7 @@ fn reencode_enveloped_data_pwri_test() { .try_into() .unwrap(), }; - let reencoded_data_in_ci = ci2.to_vec().unwrap(); + let reencoded_data_in_ci = ci2.to_der().unwrap(); // should match the original assert_eq!(reencoded_data_in_ci, der_ci) @@ -290,7 +290,7 @@ fn reencode_enveloped_data_kek_test() { assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_ENVELOPED_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 EnvelopedData then re-encode let data = EnvelopedData::from_der(bytes.as_slice()).unwrap(); @@ -331,7 +331,7 @@ fn reencode_enveloped_data_kek_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 { @@ -341,7 +341,7 @@ fn reencode_enveloped_data_kek_test() { .try_into() .unwrap(), }; - let reencoded_data_in_ci = ci2.to_vec().unwrap(); + let reencoded_data_in_ci = ci2.to_der().unwrap(); // should match the original assert_eq!(reencoded_data_in_ci, der_ci) @@ -356,7 +356,7 @@ fn reencode_enveloped_data_multi_test() { assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_ENVELOPED_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 EnvelopedData then re-encode let data = EnvelopedData::from_der(bytes.as_slice()).unwrap(); @@ -414,7 +414,7 @@ fn reencode_enveloped_data_multi_test() { .parameters .as_ref() .unwrap() - .to_vec() + .to_der() .unwrap() .as_slice(), ) @@ -441,7 +441,7 @@ fn reencode_enveloped_data_multi_test() { ObjectIdentifier::new_unwrap("1.2.840.113549.1.5.12"), kdf_alg.oid ); - let enc_pbkdf2 = kdf_alg.parameters.as_ref().unwrap().to_vec().unwrap(); + let enc_pbkdf2 = kdf_alg.parameters.as_ref().unwrap().to_der().unwrap(); let pbkdf2 = Pbkdf2Params::from_der(enc_pbkdf2.as_slice()).unwrap(); assert_eq!(hex!("39 04 A7 33 A0 6A 1B 27"), pbkdf2.salt); assert_eq!(2048, pbkdf2.iteration_count); @@ -454,7 +454,7 @@ fn reencode_enveloped_data_multi_test() { .parameters .as_ref() .unwrap() - .to_vec() + .to_der() .unwrap() .as_slice(), ) @@ -493,7 +493,7 @@ fn reencode_enveloped_data_multi_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 { @@ -503,7 +503,7 @@ fn reencode_enveloped_data_multi_test() { .try_into() .unwrap(), }; - let reencoded_data_in_ci = ci2.to_vec().unwrap(); + let reencoded_data_in_ci = ci2.to_der().unwrap(); // should match the original assert_eq!(reencoded_data_in_ci, der_ci) diff --git a/cms/tests/signed_data.rs b/cms/tests/signed_data.rs index c02694d33..d1f778d13 100644 --- a/cms/tests/signed_data.rs +++ b/cms/tests/signed_data.rs @@ -16,11 +16,11 @@ fn trust_list_test() { assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_SIGNED_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 SignedData then re-encode let sd = SignedData::from_der(bytes.as_slice()).unwrap(); - let reencoded_signed_data = sd.to_vec().unwrap(); + let reencoded_signed_data = sd.to_der().unwrap(); assert_eq!( sd.encap_content_info.econtent_type.to_string(), "1.3.6.1.4.1.311.10.1" @@ -34,7 +34,7 @@ fn trust_list_test() { .try_into() .unwrap(), }; - let reencoded_der_signed_data_in_ci = ci2.to_vec().unwrap(); + let reencoded_der_signed_data_in_ci = ci2.to_der().unwrap(); // should match the original assert_eq!(reencoded_der_signed_data_in_ci, der_signed_data_in_ci) @@ -50,11 +50,11 @@ fn reencode_signed_data_test() { assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_SIGNED_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 SignedData then re-encode let sd = SignedData::from_der(bytes.as_slice()).unwrap(); - let reencoded_signed_data = sd.to_vec().unwrap(); + let reencoded_signed_data = sd.to_der().unwrap(); // assemble a new ContentInfo and encode it let ci2 = ContentInfo { @@ -64,7 +64,7 @@ fn reencode_signed_data_test() { .try_into() .unwrap(), }; - let reencoded_der_signed_data_in_ci = ci2.to_vec().unwrap(); + let reencoded_der_signed_data_in_ci = ci2.to_der().unwrap(); // should match the original assert_eq!(reencoded_der_signed_data_in_ci, der_signed_data_in_ci) diff --git a/cms/tests/tests_from_pkcs7_crate.rs b/cms/tests/tests_from_pkcs7_crate.rs index 130e9ef1c..8c75adf05 100644 --- a/cms/tests/tests_from_pkcs7_crate.rs +++ b/cms/tests/tests_from_pkcs7_crate.rs @@ -13,7 +13,7 @@ fn cms_decode_cert_example() { let ci = ContentInfo::from_der(enc_ci).unwrap(); assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_DATA); assert_eq!(ci.content.value().len(), 781); - let reencoded_ci = ci.to_vec().unwrap(); + let reencoded_ci = ci.to_der().unwrap(); assert_eq!(reencoded_ci, enc_ci) } @@ -22,7 +22,7 @@ fn cms_decode_encrypted_key_example() { let enc_ci = include_bytes!("../../pkcs7/tests/examples/keyEncryptedData.bin"); let ci = ContentInfo::from_der(enc_ci).unwrap(); assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_ENCRYPTED_DATA); - let data = EncryptedData::from_der(ci.content.to_vec().unwrap().as_slice()).unwrap(); + let data = EncryptedData::from_der(ci.content.to_der().unwrap().as_slice()).unwrap(); assert_eq!( data.enc_content_info.content_type, const_oid::db::rfc5911::ID_DATA @@ -37,7 +37,7 @@ fn cms_decode_encrypted_key_example() { .parameters .as_ref() .unwrap() - .to_vec() + .to_der() .unwrap(); let pbkdf2 = Pbkdf2Params::from_der(enc_pbkdf2.as_slice()).unwrap(); assert_eq!(hex!("ad2d4b4e87b34d67"), pbkdf2.salt); @@ -60,11 +60,11 @@ fn cms_decode_signed_mdm_example() { assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_SIGNED_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 SignedData then re-encode let sd = SignedData::from_der(bytes.as_slice()).unwrap(); - let reencoded_signed_data = sd.to_vec().unwrap(); + let reencoded_signed_data = sd.to_der().unwrap(); // assemble a new ContentInfo and encode it let ci2 = ContentInfo { @@ -74,7 +74,7 @@ fn cms_decode_signed_mdm_example() { .try_into() .unwrap(), }; - let reencoded_der_signed_data_in_ci = ci2.to_vec().unwrap(); + let reencoded_der_signed_data_in_ci = ci2.to_der().unwrap(); // should match the original assert_eq!(reencoded_der_signed_data_in_ci, der_signed_data_in_ci) @@ -87,12 +87,12 @@ fn cms_decode_signed_scep_example() { assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_SIGNED_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 SignedData then re-encode let sd = SignedData::from_der(bytes.as_slice()).unwrap(); assert_eq!(sd.version, CmsVersion::V1); - let reencoded_signed_data = sd.to_vec().unwrap(); + let reencoded_signed_data = sd.to_der().unwrap(); // assemble a new ContentInfo and encode it let ci2 = ContentInfo { @@ -102,7 +102,7 @@ fn cms_decode_signed_scep_example() { .try_into() .unwrap(), }; - let reencoded_der_signed_data_in_ci = ci2.to_vec().unwrap(); + let reencoded_der_signed_data_in_ci = ci2.to_der().unwrap(); // should match the original assert_eq!(reencoded_der_signed_data_in_ci, der_signed_data_in_ci) @@ -115,12 +115,12 @@ fn cms_decode_signed_der() { assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_SIGNED_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 SignedData then re-encode let sd = SignedData::from_der(bytes.as_slice()).unwrap(); - let reencoded_signed_data = sd.to_vec().unwrap(); + let reencoded_signed_data = sd.to_der().unwrap(); assert_eq!( sd.encap_content_info .econtent @@ -140,7 +140,7 @@ fn cms_decode_signed_der() { .try_into() .unwrap(), }; - let reencoded_der_signed_data_in_ci = ci2.to_vec().unwrap(); + let reencoded_der_signed_data_in_ci = ci2.to_der().unwrap(); // should match the original assert_eq!(reencoded_der_signed_data_in_ci, der_signed_data_in_ci) diff --git a/crmf/tests/controls.rs b/crmf/tests/controls.rs index 292516b0a..0aa21ceed 100644 --- a/crmf/tests/controls.rs +++ b/crmf/tests/controls.rs @@ -10,20 +10,20 @@ fn pki_archive_options_test() { assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_ENVELOPED_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 EnvelopedData then re-encode let data = EnvelopedData::from_der(bytes.as_slice()).unwrap(); let pao = PkiArchiveOptions::EncryptedPrivKey(EncryptedKey::EnvelopedData(Box::new(data))); - let encoded_data = pao.to_vec().unwrap(); + let encoded_data = pao.to_der().unwrap(); let pao2 = PkiArchiveOptions::from_der(encoded_data.as_slice()).unwrap(); - let encoded_data2 = pao2.to_vec().unwrap(); + let encoded_data2 = pao2.to_der().unwrap(); assert_eq!(encoded_data, encoded_data2); println!("Encoded : {:02X?}", encoded_data); match pao2 { PkiArchiveOptions::EncryptedPrivKey(EncryptedKey::EnvelopedData(ed2)) => { - let reencoded_ed = ed2.to_vec().unwrap(); + let reencoded_ed = ed2.to_der().unwrap(); assert_eq!(bytes, reencoded_ed); } _ => panic!(), diff --git a/crmf/tests/request.rs b/crmf/tests/request.rs index 9c413bc91..f85e21a52 100644 --- a/crmf/tests/request.rs +++ b/crmf/tests/request.rs @@ -21,7 +21,7 @@ fn certtemplate_test() { assert!(cert_template.subject_unique_id.is_none()); assert!(cert_template.extensions.is_none()); - let reencoded_header_01 = cert_template.to_vec().unwrap(); + let reencoded_header_01 = cert_template.to_der().unwrap(); println!("Original : {:02X?}", header_01); println!("Reencoded: {:02X?}", reencoded_header_01); assert_eq!(header_01, reencoded_header_01.as_slice()); @@ -36,7 +36,7 @@ fn certrequest_test() { assert!(result.is_ok()); let header = result.unwrap(); - 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()); @@ -51,7 +51,7 @@ fn certreqmsg_test() { assert!(result.is_ok()); let header = result.unwrap(); - 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()); @@ -66,7 +66,7 @@ fn certreqmsgs_test() { assert!(result.is_ok()); let header = result.unwrap(); - 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()); diff --git a/der/src/document.rs b/der/src/document.rs index 8d97d0a4a..78355a67a 100644 --- a/der/src/document.rs +++ b/der/src/document.rs @@ -72,7 +72,7 @@ impl Document { /// Encode the provided type as ASN.1 DER, storing the resulting encoded DER /// as a [`Document`]. pub fn encode_msg(msg: &T) -> Result { - msg.to_vec()?.try_into() + msg.to_der()?.try_into() } /// Decode ASN.1 DER document from PEM. diff --git a/der/src/encode.rs b/der/src/encode.rs index 7d581aab3..d480b7bbd 100644 --- a/der/src/encode.rs +++ b/der/src/encode.rs @@ -57,9 +57,9 @@ pub trait Encode { actual_len.try_into() } - /// Serialize this message as a byte vector. + /// Encode this type as DER, returning a byte vector. #[cfg(feature = "alloc")] - fn to_vec(&self) -> Result> { + fn to_der(&self) -> Result> { let mut buf = Vec::new(); self.encode_to_vec(&mut buf)?; Ok(buf) diff --git a/der/src/lib.rs b/der/src/lib.rs index c54176e74..ba5eb35ba 100644 --- a/der/src/lib.rs +++ b/der/src/lib.rs @@ -170,7 +170,7 @@ //! // If you would prefer to avoid allocations, you can create a byte array //! // as backing storage instead, pass that to `der::Encoder::new`, and then //! // encode the `parameters` value using `encoder.encode(parameters)`. -//! let der_encoded_parameters = parameters.to_vec().unwrap(); +//! let der_encoded_parameters = parameters.to_der().unwrap(); //! //! let algorithm_identifier = AlgorithmIdentifier { //! // OID for `id-ecPublicKey`, if you're curious @@ -189,7 +189,7 @@ //! // reference to it, then encode the message using //! // `encoder.encode(algorithm_identifier)`, then finally `encoder.finish()` //! // to obtain a byte slice containing the encoded message. -//! let der_encoded_algorithm_identifier = algorithm_identifier.to_vec().unwrap(); +//! let der_encoded_algorithm_identifier = algorithm_identifier.to_der().unwrap(); //! //! // Deserialize the `AlgorithmIdentifier` we just serialized from ASN.1 DER //! // using `der::Decode::from_bytes`. @@ -243,7 +243,7 @@ //! }; //! //! // Encode -//! let der_encoded_algorithm_identifier = algorithm_identifier.to_vec().unwrap(); +//! let der_encoded_algorithm_identifier = algorithm_identifier.to_der().unwrap(); //! //! // Decode //! let decoded_algorithm_identifier = AlgorithmIdentifier::from_der( diff --git a/der/tests/derive.rs b/der/tests/derive.rs index dac14f816..c0c81038a 100644 --- a/der/tests/derive.rs +++ b/der/tests/derive.rs @@ -453,7 +453,7 @@ mod sequence { assert_eq!( ALGORITHM_IDENTIFIER_DER, - algorithm_identifier.to_vec().unwrap() + algorithm_identifier.to_der().unwrap() ); } } diff --git a/pkcs8/src/private_key_info.rs b/pkcs8/src/private_key_info.rs index 02804e46f..ecae624df 100644 --- a/pkcs8/src/private_key_info.rs +++ b/pkcs8/src/private_key_info.rs @@ -140,7 +140,7 @@ impl<'a> PrivateKeyInfo<'a> { rng: impl CryptoRng + RngCore, password: impl AsRef<[u8]>, ) -> Result { - let der = Zeroizing::new(self.to_vec()?); + let der = Zeroizing::new(self.to_der()?); EncryptedPrivateKeyInfo::encrypt(rng, password, der.as_ref()) } @@ -152,7 +152,7 @@ impl<'a> PrivateKeyInfo<'a> { pbes2_params: pbes2::Parameters<'_>, password: impl AsRef<[u8]>, ) -> Result { - let der = Zeroizing::new(self.to_vec()?); + let der = Zeroizing::new(self.to_der()?); EncryptedPrivateKeyInfo::encrypt_with(pbes2_params, password, der.as_ref()) } diff --git a/pkcs8/tests/encrypted_private_key.rs b/pkcs8/tests/encrypted_private_key.rs index 2bd72aef9..1c11ca203 100644 --- a/pkcs8/tests/encrypted_private_key.rs +++ b/pkcs8/tests/encrypted_private_key.rs @@ -203,7 +203,7 @@ fn encode_ed25519_encpriv_aes256_pbkdf2_sha256_der() { let pk = EncryptedPrivateKeyInfo::try_from(ED25519_DER_AES256_PBKDF2_SHA256_EXAMPLE).unwrap(); assert_eq!( ED25519_DER_AES256_PBKDF2_SHA256_EXAMPLE, - &pk.to_vec().unwrap() + &pk.to_der().unwrap() ); } diff --git a/pkcs8/tests/private_key.rs b/pkcs8/tests/private_key.rs index 36f119f81..1ef0f7361 100644 --- a/pkcs8/tests/private_key.rs +++ b/pkcs8/tests/private_key.rs @@ -129,7 +129,7 @@ fn decode_x25519_der() { #[cfg(feature = "alloc")] fn encode_ec_p256_der() { let pk = PrivateKeyInfo::try_from(EC_P256_DER_EXAMPLE).unwrap(); - let pk_encoded = pk.to_vec().unwrap(); + let pk_encoded = pk.to_der().unwrap(); assert_eq!(EC_P256_DER_EXAMPLE, pk_encoded); } @@ -137,14 +137,14 @@ fn encode_ec_p256_der() { #[cfg(feature = "alloc")] fn encode_ed25519_der_v1() { let pk = PrivateKeyInfo::try_from(ED25519_DER_V1_EXAMPLE).unwrap(); - assert_eq!(ED25519_DER_V1_EXAMPLE, pk.to_vec().unwrap()); + assert_eq!(ED25519_DER_V1_EXAMPLE, pk.to_der().unwrap()); } #[test] #[cfg(all(feature = "alloc", feature = "subtle"))] fn encode_ed25519_der_v2() { let private_key = PrivateKeyInfo::try_from(ED25519_DER_V2_EXAMPLE).unwrap(); - let private_der = private_key.to_vec().unwrap(); + let private_der = private_key.to_der().unwrap(); assert_eq!( private_key, PrivateKeyInfo::try_from(private_der.as_ref()).unwrap() @@ -155,7 +155,7 @@ fn encode_ed25519_der_v2() { #[cfg(feature = "alloc")] fn encode_rsa_2048_der() { let pk = PrivateKeyInfo::try_from(RSA_2048_DER_EXAMPLE).unwrap(); - assert_eq!(RSA_2048_DER_EXAMPLE, &pk.to_vec().unwrap()); + assert_eq!(RSA_2048_DER_EXAMPLE, &pk.to_der().unwrap()); } #[test] diff --git a/pkcs8/tests/traits.rs b/pkcs8/tests/traits.rs index f1bc9f955..4a603bb94 100644 --- a/pkcs8/tests/traits.rs +++ b/pkcs8/tests/traits.rs @@ -40,7 +40,7 @@ impl TryFrom> for MockKey { type Error = Error; fn try_from(pkcs8: PrivateKeyInfo<'_>) -> Result { - Ok(MockKey(pkcs8.to_vec()?)) + Ok(MockKey(pkcs8.to_der()?)) } } diff --git a/spki/tests/spki.rs b/spki/tests/spki.rs index 0a3baa466..f6b3ba5b4 100644 --- a/spki/tests/spki.rs +++ b/spki/tests/spki.rs @@ -116,7 +116,7 @@ fn decode_rsa_2048_der() { #[cfg(feature = "alloc")] fn encode_ec_p256_der() { let pk = SubjectPublicKeyInfoRef::try_from(EC_P256_DER_EXAMPLE).unwrap(); - let pk_encoded = pk.to_vec().unwrap(); + let pk_encoded = pk.to_der().unwrap(); assert_eq!(EC_P256_DER_EXAMPLE, pk_encoded.as_slice()); } @@ -124,7 +124,7 @@ fn encode_ec_p256_der() { #[cfg(feature = "alloc")] fn encode_ed25519_der() { let pk = SubjectPublicKeyInfoRef::try_from(ED25519_DER_EXAMPLE).unwrap(); - let pk_encoded = pk.to_vec().unwrap(); + let pk_encoded = pk.to_der().unwrap(); assert_eq!(ED25519_DER_EXAMPLE, pk_encoded.as_slice()); } @@ -132,7 +132,7 @@ fn encode_ed25519_der() { #[cfg(feature = "alloc")] fn encode_rsa_2048_der() { let pk = SubjectPublicKeyInfoRef::try_from(RSA_2048_DER_EXAMPLE).unwrap(); - let pk_encoded = pk.to_vec().unwrap(); + let pk_encoded = pk.to_der().unwrap(); assert_eq!(RSA_2048_DER_EXAMPLE, pk_encoded.as_slice()); } diff --git a/spki/tests/traits.rs b/spki/tests/traits.rs index aa68921aa..111433343 100644 --- a/spki/tests/traits.rs +++ b/spki/tests/traits.rs @@ -40,7 +40,7 @@ impl TryFrom> for MockKey { type Error = Error; fn try_from(spki: SubjectPublicKeyInfoRef<'_>) -> Result { - Ok(MockKey(spki.to_vec()?)) + Ok(MockKey(spki.to_der()?)) } } diff --git a/x509-cert/src/attr.rs b/x509-cert/src/attr.rs index 04b851b51..c422aa89a 100644 --- a/x509-cert/src/attr.rs +++ b/x509-cert/src/attr.rs @@ -167,7 +167,7 @@ impl AttributeTypeAndValue { // Serialize. let value = Any::from_der(&bytes)?; let atv = AttributeTypeAndValue { oid, value }; - atv.to_vec() + atv.to_der() } /// Parses the string value in the `NAME=STRING` format. @@ -190,7 +190,7 @@ impl AttributeTypeAndValue { // Serialize. let value = Any::new(tag, parser.as_bytes())?; let atv = AttributeTypeAndValue { oid, value }; - atv.to_vec() + atv.to_der() } /// Converts an AttributeTypeAndValue string into an encoded AttributeTypeAndValue @@ -250,7 +250,7 @@ impl fmt::Display for AttributeTypeAndValue { } } } else { - let value = self.value.to_vec().or(Err(fmt::Error))?; + let value = self.value.to_der().or(Err(fmt::Error))?; write!(f, "{}=#", self.oid)?; for c in value { diff --git a/x509-cert/src/ext/pkix/name/other.rs b/x509-cert/src/ext/pkix/name/other.rs index 97f468a39..26b93bc9b 100644 --- a/x509-cert/src/ext/pkix/name/other.rs +++ b/x509-cert/src/ext/pkix/name/other.rs @@ -32,6 +32,6 @@ fn test() { let onval = Utf8StringRef::try_from(&decoded.value).unwrap(); assert_eq!(onval.to_string(), "Upn_214950130@mil"); - let encoded = decoded.to_vec().unwrap(); + let encoded = decoded.to_der().unwrap(); assert_eq!(&input[..], &encoded); } diff --git a/x509-cert/src/name.rs b/x509-cert/src/name.rs index f3250bcfe..59e56f776 100644 --- a/x509-cert/src/name.rs +++ b/x509-cert/src/name.rs @@ -41,7 +41,7 @@ impl RdnSequence { out.push(RelativeDistinguishedName::from_der(der)?); } - RdnSequence(out).to_vec() + RdnSequence(out).to_der() } } @@ -145,7 +145,7 @@ impl RelativeDistinguishedName { .map(|der| AttributeTypeAndValue::from_der(der)) .collect::, der::Error>>()?; - RelativeDistinguishedName(atvs.try_into()?).to_vec() + RelativeDistinguishedName(atvs.try_into()?).to_der() } } diff --git a/x509-cert/tests/certificate.rs b/x509-cert/tests/certificate.rs index 14933f839..05fdc43de 100644 --- a/x509-cert/tests/certificate.rs +++ b/x509-cert/tests/certificate.rs @@ -117,15 +117,15 @@ fn reencode_cert() { let defer_cert = DeferDecodeCertificate::from_der(der_encoded_cert).unwrap(); let parsed_tbs = TbsCertificate::from_der(defer_cert.tbs_certificate).unwrap(); - let reencoded_tbs = parsed_tbs.to_vec().unwrap(); + let reencoded_tbs = parsed_tbs.to_der().unwrap(); assert_eq!(defer_cert.tbs_certificate, reencoded_tbs); let parsed_sigalg = AlgorithmIdentifierRef::from_der(defer_cert.signature_algorithm).unwrap(); - let reencoded_sigalg = parsed_sigalg.to_vec().unwrap(); + let reencoded_sigalg = parsed_sigalg.to_der().unwrap(); assert_eq!(defer_cert.signature_algorithm, reencoded_sigalg); let parsed_sig = BitStringRef::from_der(defer_cert.signature).unwrap(); - let reencoded_sig = parsed_sig.to_vec().unwrap(); + let reencoded_sig = parsed_sig.to_der().unwrap(); assert_eq!(defer_cert.signature, reencoded_sig); let parsed_coverage_tbs = @@ -133,22 +133,22 @@ fn reencode_cert() { // TODO - defer decode then re-encode version field - let encoded_serial = parsed_tbs.serial_number.to_vec().unwrap(); + let encoded_serial = parsed_tbs.serial_number.to_der().unwrap(); assert_eq!(parsed_coverage_tbs.serial_number, encoded_serial); - let encoded_signature = parsed_tbs.signature.to_vec().unwrap(); + let encoded_signature = parsed_tbs.signature.to_der().unwrap(); assert_eq!(parsed_coverage_tbs.signature, encoded_signature); - let encoded_issuer = parsed_tbs.issuer.to_vec().unwrap(); + let encoded_issuer = parsed_tbs.issuer.to_der().unwrap(); assert_eq!(parsed_coverage_tbs.issuer, encoded_issuer); - let encoded_validity = parsed_tbs.validity.to_vec().unwrap(); + let encoded_validity = parsed_tbs.validity.to_der().unwrap(); assert_eq!(parsed_coverage_tbs.validity, encoded_validity); - let encoded_subject = parsed_tbs.subject.to_vec().unwrap(); + let encoded_subject = parsed_tbs.subject.to_der().unwrap(); assert_eq!(parsed_coverage_tbs.subject, encoded_subject); - let encoded_subject_public_key_info = parsed_tbs.subject_public_key_info.to_vec().unwrap(); + let encoded_subject_public_key_info = parsed_tbs.subject_public_key_info.to_der().unwrap(); assert_eq!( parsed_coverage_tbs.subject_public_key_info, encoded_subject_public_key_info @@ -156,7 +156,7 @@ fn reencode_cert() { // TODO - either encode as context specific or decode to sequence. for know lop off context // specific tag and length - let encoded_extensions = parsed_tbs.extensions.to_vec().unwrap(); + let encoded_extensions = parsed_tbs.extensions.to_der().unwrap(); assert_eq!(&parsed_coverage_tbs.extensions[4..], encoded_extensions); } @@ -178,7 +178,7 @@ fn decode_oversized_oids() { o1.to_string(), "1.3.6.1.4.1.311.21.8.11672683.15464451.6967228.369088.2847561.77.4994205.11305917" ); - let enc_oid = o1.to_vec().unwrap(); + let enc_oid = o1.to_der().unwrap(); assert_eq!( &hex!("06252B060104018237150885C8B86B87AFF00383A99F3C96C34081ADE6494D82B0E91D85B2873D"), enc_oid.as_slice() @@ -409,6 +409,6 @@ fn decode_cert_negative_serial_number() { &[238, 43, 61, 235, 212, 33, 222, 20, 168, 98, 172, 4, 243, 221, 196, 1] ); - let reencoded = cert.to_vec().unwrap(); + let reencoded = cert.to_der().unwrap(); assert_eq!(der_encoded_cert, reencoded.as_slice()); } diff --git a/x509-cert/tests/certreq.rs b/x509-cert/tests/certreq.rs index 31e46e645..82ce41c53 100644 --- a/x509-cert/tests/certreq.rs +++ b/x509-cert/tests/certreq.rs @@ -82,6 +82,6 @@ fn decode_rsa_2048_der() { #[test] fn encode_rsa_2048_der() { let cr = CertReq::from_der(RSA_2048_DER_EXAMPLE).unwrap(); - let cr_encoded = cr.to_vec().unwrap(); + let cr_encoded = cr.to_der().unwrap(); assert_eq!(RSA_2048_DER_EXAMPLE, cr_encoded.as_slice()); } diff --git a/x509-cert/tests/general_name.rs b/x509-cert/tests/general_name.rs index 5447c5f57..f63b4a28c 100644 --- a/x509-cert/tests/general_name.rs +++ b/x509-cert/tests/general_name.rs @@ -50,7 +50,7 @@ fn singular(#[case] idx: usize, #[case] value: &[u8]) { _ => panic!("unexpected decoded value"), } - let encoded = decoded.to_vec().unwrap(); + let encoded = decoded.to_der().unwrap(); assert_eq!(value, encoded); } @@ -75,6 +75,6 @@ fn plural(#[case] idx: usize, #[case] value: &[u8]) { _ => panic!("unexpected decoded value"), } - let encoded = decoded.to_vec().unwrap(); + let encoded = decoded.to_der().unwrap(); assert_eq!(value, encoded); } diff --git a/x509-cert/tests/name.rs b/x509-cert/tests/name.rs index 7740f2b9e..5a538a51f 100644 --- a/x509-cert/tests/name.rs +++ b/x509-cert/tests/name.rs @@ -124,7 +124,7 @@ fn decode_rdn() { let mut from_scratch = RelativeDistinguishedName::default(); assert!(from_scratch.0.add(atav1a.clone()).is_ok()); assert!(from_scratch.0.add(atav2a.clone()).is_ok()); - let reencoded = from_scratch.to_vec().unwrap(); + let reencoded = from_scratch.to_der().unwrap(); assert_eq!( reencoded, &hex!("311F300A060355040A0C03313233301106035504030C0A4A4F484E20534D495448") diff --git a/x509-cert/tests/pkix_extensions.rs b/x509-cert/tests/pkix_extensions.rs index 35d185a0c..108eeb527 100644 --- a/x509-cert/tests/pkix_extensions.rs +++ b/x509-cert/tests/pkix_extensions.rs @@ -21,7 +21,7 @@ fn spin_over_exts(exts: Extensions) { SubjectDirectoryAttributes::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -29,7 +29,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = SubjectKeyIdentifier::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -37,7 +37,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = KeyUsage::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -45,7 +45,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = PrivateKeyUsagePeriod::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -53,7 +53,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = SubjectAltName::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -61,7 +61,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = IssuerAltName::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -69,7 +69,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = BasicConstraints::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -77,7 +77,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = NameConstraints::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -85,7 +85,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = CrlDistributionPoints::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -93,7 +93,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = CertificatePolicies::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -101,7 +101,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = PolicyMappings::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -109,7 +109,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = AuthorityKeyIdentifier::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -117,7 +117,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = PolicyConstraints::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -125,7 +125,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = ExtendedKeyUsage::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -133,7 +133,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = FreshestCrl::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -141,7 +141,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = InhibitAnyPolicy::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -150,7 +150,7 @@ fn spin_over_exts(exts: Extensions) { AuthorityInfoAccessSyntax::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -158,7 +158,7 @@ fn spin_over_exts(exts: Extensions) { let decoded = SubjectInfoAccessSyntax::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!( ext.extn_value, - decoded.to_vec().and_then(OctetString::new).unwrap() + decoded.to_der().and_then(OctetString::new).unwrap() ); } @@ -221,7 +221,7 @@ fn decode_cert() { let ku = KeyUsage::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!(KeyUsages::KeyCertSign | KeyUsages::CRLSign, ku); - let reencoded = ku.to_vec().and_then(OctetString::new).unwrap(); + let reencoded = ku.to_der().and_then(OctetString::new).unwrap(); assert_eq!(ext.extn_value, reencoded); } else if 1 == counter { assert_eq!(ext.extn_id.to_string(), ID_CE_BASIC_CONSTRAINTS.to_string()); @@ -230,7 +230,7 @@ fn decode_cert() { assert_eq!(true, bc.ca); assert!(bc.path_len_constraint.is_none()); - let reencoded = bc.to_vec().and_then(OctetString::new).unwrap(); + let reencoded = bc.to_der().and_then(OctetString::new).unwrap(); assert_eq!(ext.extn_value, reencoded); } else if 2 == counter { assert_eq!(ext.extn_id.to_string(), ID_CE_POLICY_MAPPINGS.to_string()); @@ -238,7 +238,7 @@ fn decode_cert() { let pm = PolicyMappings::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!(19, pm.0.len()); - let reencoded = pm.to_vec().and_then(OctetString::new).unwrap(); + let reencoded = pm.to_der().and_then(OctetString::new).unwrap(); assert_eq!(ext.extn_value, reencoded); let subject_domain_policy: [&str; 19] = [ @@ -306,7 +306,7 @@ fn decode_cert() { let cps = CertificatePolicies::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!(19, cps.0.len()); - let reencoded = cps.to_vec().and_then(OctetString::new).unwrap(); + let reencoded = cps.to_der().and_then(OctetString::new).unwrap(); assert_eq!(ext.extn_value, reencoded); let ids: [&str; 19] = [ @@ -372,7 +372,7 @@ fn decode_cert() { skid.0.as_bytes() ); - let reencoded = skid.to_vec().and_then(OctetString::new).unwrap(); + let reencoded = skid.to_der().and_then(OctetString::new).unwrap(); assert_eq!(ext.extn_value, reencoded); } else if 5 == counter { assert_eq!( @@ -383,7 +383,7 @@ fn decode_cert() { let crl_dps = CrlDistributionPoints::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!(2, crl_dps.0.len()); - let reencoded = crl_dps.to_vec().and_then(OctetString::new).unwrap(); + let reencoded = crl_dps.to_der().and_then(OctetString::new).unwrap(); assert_eq!(ext.extn_value, reencoded); let mut crldp_counter = 0; @@ -441,7 +441,7 @@ fn decode_cert() { let sias = SubjectInfoAccessSyntax::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!(1, sias.0.len()); - let reencoded = sias.to_vec().and_then(OctetString::new).unwrap(); + let reencoded = sias.to_der().and_then(OctetString::new).unwrap(); assert_eq!(ext.extn_value, reencoded); for sia in sias.0 { @@ -469,7 +469,7 @@ fn decode_cert() { assert_eq!(2, aias.0.len()); let mut aia_counter = 0; - let reencoded = aias.to_vec().and_then(OctetString::new).unwrap(); + let reencoded = aias.to_der().and_then(OctetString::new).unwrap(); assert_eq!(ext.extn_value, reencoded); for aia in aias.0 { @@ -514,7 +514,7 @@ fn decode_cert() { let iap = InhibitAnyPolicy::from_der(ext.extn_value.as_bytes()).unwrap(); assert_eq!(0, iap.0); - let reencoded = iap.to_vec().and_then(OctetString::new).unwrap(); + let reencoded = iap.to_der().and_then(OctetString::new).unwrap(); assert_eq!(ext.extn_value, reencoded); } else if 9 == counter { assert_eq!( @@ -528,7 +528,7 @@ fn decode_cert() { akid.key_identifier.as_ref().unwrap().as_bytes() ); - let reencoded = akid.to_vec().and_then(OctetString::new).unwrap(); + let reencoded = akid.to_der().and_then(OctetString::new).unwrap(); assert_eq!(ext.extn_value, reencoded); } diff --git a/x509-cert/tests/trust_anchor_format.rs b/x509-cert/tests/trust_anchor_format.rs index 15039a8d4..a1bdc694d 100644 --- a/x509-cert/tests/trust_anchor_format.rs +++ b/x509-cert/tests/trust_anchor_format.rs @@ -15,7 +15,7 @@ fn decode_ta1() { let mut decoder = SliceReader::new(der_encoded_tac).unwrap(); let tac = TrustAnchorChoice::decode(&mut decoder).unwrap(); - let reencoded_tac = tac.to_vec().unwrap(); + let reencoded_tac = tac.to_der().unwrap(); println!("Original : {:02X?}", der_encoded_cert); println!("Reencoded: {:02X?}", reencoded_tac); assert_eq!(der_encoded_tac, reencoded_tac.as_slice()); @@ -128,7 +128,7 @@ fn decode_ta1() { } } - let reencoded_cert = cert_path.certificate.to_vec().unwrap(); + let reencoded_cert = cert_path.certificate.to_der().unwrap(); assert_eq!(der_encoded_cert, reencoded_cert.as_slice()); } _ => panic!("Unexpected TrustAnchorChoice contents"), @@ -144,7 +144,7 @@ fn decode_ta2() { let mut decoder = SliceReader::new(der_encoded_tac).unwrap(); let tac = TrustAnchorChoice::decode(&mut decoder).unwrap(); - let reencoded_tac = tac.to_vec().unwrap(); + let reencoded_tac = tac.to_der().unwrap(); println!("Original : {:02X?}", der_encoded_cert); println!("Reencoded: {:02X?}", reencoded_tac); assert_eq!(der_encoded_tac, reencoded_tac.as_slice()); @@ -248,7 +248,7 @@ fn decode_ta2() { } } - let reencoded_cert = cert_path.certificate.to_vec().unwrap(); + let reencoded_cert = cert_path.certificate.to_der().unwrap(); assert_eq!(der_encoded_cert, reencoded_cert.as_slice()); } _ => panic!("Unexpected TrustAnchorChoice contents"), @@ -264,7 +264,7 @@ fn decode_ta3() { let mut decoder = SliceReader::new(der_encoded_tac).unwrap(); let tac = TrustAnchorChoice::decode(&mut decoder).unwrap(); - let reencoded_tac = tac.to_vec().unwrap(); + let reencoded_tac = tac.to_der().unwrap(); println!("Original : {:02X?}", der_encoded_cert); println!("Reencoded: {:02X?}", reencoded_tac); assert_eq!(der_encoded_tac, reencoded_tac.as_slice()); @@ -375,7 +375,7 @@ fn decode_ta3() { } } - let reencoded_cert = cert_path.certificate.to_vec().unwrap(); + let reencoded_cert = cert_path.certificate.to_der().unwrap(); assert_eq!(der_encoded_cert, reencoded_cert.as_slice()); } _ => panic!("Unexpected TrustAnchorChoice contents"), @@ -391,7 +391,7 @@ fn decode_ta4() { let mut decoder = SliceReader::new(der_encoded_tac).unwrap(); let tac = TrustAnchorChoice::decode(&mut decoder).unwrap(); - let reencoded_tac = tac.to_vec().unwrap(); + let reencoded_tac = tac.to_der().unwrap(); println!("Original : {:02X?}", der_encoded_cert); println!("Reencoded: {:02X?}", reencoded_tac); assert_eq!(der_encoded_tac, reencoded_tac.as_slice()); @@ -453,7 +453,7 @@ fn decode_ta4() { panic!("Wrong path length constraint"); } - let reencoded_cert = cert_path.certificate.to_vec().unwrap(); + let reencoded_cert = cert_path.certificate.to_der().unwrap(); assert_eq!(der_encoded_cert, reencoded_cert.as_slice()); } _ => panic!("Unexpected TrustAnchorChoice contents"), diff --git a/x509-cert/tests/validity.rs b/x509-cert/tests/validity.rs index 84d788693..b2e676c94 100644 --- a/x509-cert/tests/validity.rs +++ b/x509-cert/tests/validity.rs @@ -98,7 +98,7 @@ fn encode_validity() { &hex!("301E170D3130303130313038333030305A170D3330313233313038333030305A")[..], ) .unwrap(); - let b1 = val1.to_vec().unwrap(); + let b1 = val1.to_der().unwrap(); assert_eq!( b1, &hex!("301E170D3130303130313038333030305A170D3330313233313038333030305A")[..] @@ -113,7 +113,7 @@ fn encode_validity() { &hex!("3020170D3130303130313038333030305A180F32303530303130313132303130305A")[..], ) .unwrap(); - let b3 = val3.to_vec().unwrap(); + let b3 = val3.to_der().unwrap(); assert_eq!( b3, &hex!("3020170D3130303130313038333030305A180F32303530303130313132303130305A")[..] @@ -128,7 +128,7 @@ fn encode_validity() { &hex!("3020180F32303032303130313132303130305A170D3330313233313038333030305A")[..], ) .unwrap(); - let b4 = val4.to_vec().unwrap(); + let b4 = val4.to_der().unwrap(); assert_eq!( b4, &hex!("3020180F32303032303130313132303130305A170D3330313233313038333030305A")[..] diff --git a/x509-ocsp/tests/ocsp.rs b/x509-ocsp/tests/ocsp.rs index c88320d45..e61c9f84a 100644 --- a/x509-ocsp/tests/ocsp.rs +++ b/x509-ocsp/tests/ocsp.rs @@ -27,10 +27,10 @@ fn decode_ocsp_req_ca_signed() { req.req_cert .hash_algorithm .parameters - .to_vec() + .to_der() .unwrap() .as_slice(), - Null.to_vec().unwrap().as_slice() + Null.to_der().unwrap().as_slice() ); assert_eq!( req.req_cert.issuer_name_hash.as_bytes(), @@ -45,7 +45,7 @@ fn decode_ocsp_req_ca_signed() { &hex!("0E4239AB85E2E6A27C52C6DE9B9078D9") ); - let reenc = ocsp_req.to_vec().unwrap(); + let reenc = ocsp_req.to_der().unwrap(); assert_eq!(reenc, &hex!("3051304F304D304B3049300906052B0E03021A05000414A87E303106E4E88565CFE952598FA6DA7C00532F0414246E2B2DD06A925151256901AA9A47A689E7402002100E4239AB85E2E6A27C52C6DE9B9078D9")[..]) } @@ -78,10 +78,10 @@ fn decode_ocsp_resp_ca_signed() { assert_eq!( bor.signature_algorithm .parameters - .to_vec() + .to_der() .unwrap() .as_slice(), - Null.to_vec().unwrap().as_slice() + Null.to_der().unwrap().as_slice() ); assert_eq!(bor.tbs_response_data.version, V1); @@ -113,10 +113,10 @@ fn decode_ocsp_resp_ca_signed() { sr.cert_id .hash_algorithm .parameters - .to_vec() + .to_der() .unwrap() .as_slice(), - Null.to_vec().unwrap().as_slice() + Null.to_der().unwrap().as_slice() ); assert_eq!( sr.cert_id.issuer_name_hash.as_bytes(), @@ -134,8 +134,8 @@ fn decode_ocsp_resp_ca_signed() { match sr.cert_status { CertStatus::Good(g) => { assert_eq!( - g.to_vec().unwrap().as_slice(), - Null.to_vec().unwrap().as_slice() + g.to_der().unwrap().as_slice(), + Null.to_der().unwrap().as_slice() ); } _ => { @@ -150,7 +150,7 @@ fn decode_ocsp_resp_ca_signed() { 1644376321 ); - let reenc = ocsp_resp.to_vec().unwrap(); + let reenc = ocsp_resp.to_der().unwrap(); assert_eq!(reenc, &hex!("308201D30A0100A08201CC308201C806092B0601050507300101048201B9308201B530819EA2160414246E2B2DD06A925151256901AA9A47A689E74020180F32303232303230323034313232355A307330713049300906052B0E03021A05000414A87E303106E4E88565CFE952598FA6DA7C00532F0414246E2B2DD06A925151256901AA9A47A689E7402002100E4239AB85E2E6A27C52C6DE9B9078D98000180F32303232303230323033353730315AA011180F32303232303230393033313230315A300D06092A864886F70D01010B0500038201010089DC0913BD91DB172C314AE8F78E6574950353618FFBBF2F12B1F134F21EC20063E66C60AC463BDB926A9D5B699EB39689032659D43C441863BAC9D8B7CC84137B558503D2631348EDA79AEC9FD4B69AE988F68A752470D3D4BA46F41B9FD41A974A5311BAA191AFBA370F0B051F035297FA76A2133B98FF471BDA4BFBFDA275B4FA1CF8377EEB2B2141F9C998ACE27C60F11E221D6732A5D538FEDF9A01D776E1877BCF70A8C953630B2C66752A66DF087C075794F5A2C0023C964CD73476EA2556F091F6C191B30B74E2523F668F32CE10AFB3D51CE053D4D41E62214B60171093AB915DBBA497F09B3C279127E1D25C7AA6A7048BBEA41A23F4F827BD108F")[..]) } @@ -175,10 +175,10 @@ fn decode_ocsp_req_delegated() { req.req_cert .hash_algorithm .parameters - .to_vec() + .to_der() .unwrap() .as_slice(), - Null.to_vec().unwrap().as_slice() + Null.to_der().unwrap().as_slice() ); assert_eq!( req.req_cert.issuer_name_hash.as_bytes(), @@ -190,7 +190,7 @@ fn decode_ocsp_req_delegated() { ); assert_eq!(req.req_cert.serial_number.as_bytes(), &hex!("01017467")); - let reenc = ocsp_req.to_vec().unwrap(); + let reenc = ocsp_req.to_der().unwrap(); assert_eq!(reenc, &hex!("304530433041303F303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B92020401017467")[..]) } @@ -223,10 +223,10 @@ fn decode_ocsp_resp_delegated() { assert_eq!( bor.signature_algorithm .parameters - .to_vec() + .to_der() .unwrap() .as_slice(), - Null.to_vec().unwrap().as_slice() + Null.to_der().unwrap().as_slice() ); assert_eq!(bor.tbs_response_data.version, V1); @@ -259,10 +259,10 @@ fn decode_ocsp_resp_delegated() { sr.cert_id .hash_algorithm .parameters - .to_vec() + .to_der() .unwrap() .as_slice(), - Null.to_vec().unwrap().as_slice() + Null.to_der().unwrap().as_slice() ); assert_eq!( sr.cert_id.issuer_name_hash.as_bytes(), @@ -292,6 +292,6 @@ fn decode_ocsp_resp_delegated() { 1644456600 ); - let reenc = ocsp_resp.to_vec().unwrap(); + let reenc = ocsp_resp.to_der().unwrap(); assert_eq!(reenc, &hex!("30820FA10A0100A0820F9A30820F9606092B060105050730010104820F8730820F83308209F1A2160414ADB0A9B2DDE9D444B4DF80F599598E84AC5EC687180F32303232303230333135303233365A308209C4307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B92020401017456A116180F32303231303532303138303635305AA0030A0104180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B92020401017457A116180F32303231303730373139353830355AA0030A0104180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B92020401017459A116180F32303231303532303138303634395AA0030A0104180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B9202040101745AA116180F32303231303132323136303832375AA0030A0104180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B9202040101745BA116180F32303231303731393138353734355AA0030A0101180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B9202040101745CA116180F32303231303132323136303832365AA0030A0104180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B9202040101745EA116180F32303231303432323132323332335AA0030A0104180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B92020401017460A116180F32303231303731393138353734335AA0030A0101180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B92020401017462A116180F32303231303932393136353734375AA0030A0103180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B92020401017464A116180F32303231303432323132323332325AA0030A0104180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B92020401017467A116180F32303231303932393136353734375AA0030A0103180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B92020401017477A116180F32303231303730313138313934365AA0030A0103180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B92020401017479A116180F32303232303130353138313532325AA0030A0103180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B9202040101747AA116180F32303231313130343131353932395AA0030A0101180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B9202040101747BA116180F32303231303730313138313934325AA0030A0103180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B9202040101747CA116180F32303232303130353138313532325AA0030A0103180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B9202040101747DA116180F32303231303231303136333032315AA0030A0104180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B9202040101747EA116180F32303231313130343131353932325AA0030A0101180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B92020401017480A116180F32303231303231303136333032305AA0030A0104180F32303232303230333030333030305AA011180F32303232303231303031333030305A307B303D300906052B0E03021A050004140F0D5890F551D42ACF5431B7F42A321F7B74A4730414771441A65D9526D01DFF953B628CEAB7B55D3B92020401017481A116180F32303231303132323133353031395AA0030A0104180F32303232303230333030333030305AA011180F32303232303231303031333030305A300D06092A864886F70D01010B050003820101008946FF8FF3009FC7265CB687D56960190379BEF6537FAC541A2306ED709B51AACD79B313331E297495AC4E26ABD94030CC407FDCE26CFC0B7A2BE1F226906182863FF1F140D628FA02B1D0BE1A1697E2F9C17AEF5FEC32AA4D120FAF0F58474AC2718964033076286DC358F5E96B08A5C83323CA4CA2B881D8FFA8E0EA3DB9A90863D378A3349EBF189030DA11891C6695950C5B93CBD440D998E67C0137655AC9DA40826B51211AD5985918336939131A4D1BF9E9A2A88CFB3C5059E3D1CE0D9B19F487EC018C60A0279E24270C7090006A4EC728E5C4A1F86829AFA236AF9979165DF1E7F0F5544217864F9C348ABF2B17C2FCD7DDE35838A99BC4A7256821A0820476308204723082046E30820356A0030201020203358762300D06092A864886F70D01010B0500305D310B300906035504061302555331183016060355040A130F552E532E20476F7665726E6D656E74310C300A060355040B1303446F44310C300A060355040B1303504B49311830160603550403130F444F4420454D41494C2043412D3539301E170D3232303132353030303035315A170D3232303331313030303035315A3064310B300906035504061302555331183016060355040A130F552E532E20476F7665726E6D656E74310C300A060355040B1303446F44310C300A060355040B1303504B49311F301D06035504031316444F44204E4950524E4554204F43535020313244203230820122300D06092A864886F70D01010105000382010F003082010A0282010100BF8A691DDB447562EFCDCB6C4DED76DDB200D1A188E01A3BA4EEEE1C42A7E5E78C0784C512F5CF64DD1A407A2EBC1F280761C1372351E03AED90C2DA0556066398E555EEE91C92988A62CDA1FD1F4E2E5F6EC6C022821C0D7C8B0E90E7CCF203CE8F102CBF4756D9B8CD09A2F16CF08F1E944311C8CD2120B98F6BCAEA1E60D1841A933815C8936BD20CC984FA1F5BF7AFFFFF2886DE53FDF3AE80E8394E09D441AE615693A78FE0051942B724147595DF049382897E26BBEA4E6902376C494F31141D1693005AA4E8AEBE4FEC342D10BFD90661935FB00D61A1FF7CB3B8FF45E473B3FFDD6D2C692FA8C0DE23373F1A6AD84109E7A9274008C5E94E28CE91850203010001A382012E3082012A301F0603551D23041830168014771441A65D9526D01DFF953B628CEAB7B55D3B92304606082B06010505070101043A3038303606082B06010505073002862A687474703A2F2F63726C2E646973612E6D696C2F7369676E2F444F44454D41494C43415F35392E63657230160603551D250101FF040C300A06082B06010505070309300E0603551D0F0101FF040403020780300F06092B060105050730010504020500301D0603551D0E04160414ADB0A9B2DDE9D444B4DF80F599598E84AC5EC68730670603551D200460305E300B0609608648016502010B24300B0609608648016502010B27300B0609608648016502010B2A300B0609608648016502010B3B300C060A6086480165030201030D300C060A60864801650302010311300C060A60864801650302010327300D06092A864886F70D01010B0500038201010047FE1DF6D439EF205C931F34B8C802B6E6D9C4EFEAFA7228FD07E56DFF17EEC18C250941EB46D5F416A02F2706A951A2A16435C589EE1059BB86EC38C7F07C2C6660C4B25C8918115FFD21A0D9798B860F878122B3781DCA004AFE869B4B88E0B8ABB4C3A255BC034B36ED82E4692AB765667E3036FC4BB2A53EF9B4654D5C8FDA62E1F6B9DFC7382FA9A3BEAC5EB35A105CB6FFD7B33D561DA77B886D17F58F9D6EDC722C9786E7C664598116F9ACB41282FB0C75EF6BA87BAE97249A42DF45FEC6AEB724C03D8EE5FF4FD7753AC0FE50CB6B746544D4A4DB977946D29183295B160538338FA2FB27F6BC84B5CBD658A431A8B87A9E20A57753BC8AB964B486")[..]) }