Skip to content

Commit

Permalink
pkcs7: remove crate sources
Browse files Browse the repository at this point in the history
The `pkcs7` crate has been deprecated in favor of the `cms` crate:

https://github.com/RustCrypto/formats/tree/master/cms

This commit leaves behind a README.md with information about the
deprecation.
  • Loading branch information
tarcieri committed Jan 3, 2024
1 parent a878449 commit ed53e63
Show file tree
Hide file tree
Showing 33 changed files with 5 additions and 1,521 deletions.
64 changes: 0 additions & 64 deletions .github/workflows/pkcs7.yml

This file was deleted.

10 changes: 0 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ members = [
"pem-rfc7468",
"pkcs1",
"pkcs5",
"pkcs7",
"pkcs8",
"pkcs12",
"sec1",
Expand Down Expand Up @@ -48,7 +47,6 @@ der_derive = { path = "./der/derive" }
pem-rfc7468 = { path = "./pem-rfc7468" }
pkcs1 = { path = "./pkcs1" }
pkcs5 = { path = "./pkcs5" }
pkcs7 = { path = "./pkcs7" }
pkcs8 = { path = "./pkcs8" }
pkcs12 = { path = "./pkcs12" }
sec1 = { path = "./sec1" }
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 5 additions & 6 deletions cms/tests/tests_from_pkcs7_crate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use pkcs5::pbes2::Pbkdf2Params;

#[test]
fn cms_decode_cert_example() {
let enc_ci = include_bytes!("../../pkcs7/tests/examples/certData.bin");
let enc_ci = include_bytes!("../tests/examples/certData.bin");
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);
Expand All @@ -19,7 +19,7 @@ fn cms_decode_cert_example() {

#[test]
fn cms_decode_encrypted_key_example() {
let enc_ci = include_bytes!("../../pkcs7/tests/examples/keyEncryptedData.bin");
let enc_ci = include_bytes!("../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_der().unwrap().as_slice()).unwrap();
Expand Down Expand Up @@ -54,8 +54,7 @@ fn cms_decode_encrypted_key_example() {

#[test]
fn cms_decode_signed_mdm_example() {
let der_signed_data_in_ci =
include_bytes!("../../pkcs7/tests/examples/apple_mdm_signature_der.bin");
let der_signed_data_in_ci = include_bytes!("../tests/examples/apple_mdm_signature_der.bin");
let ci = ContentInfo::from_der(der_signed_data_in_ci).unwrap();
assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_SIGNED_DATA);

Expand All @@ -81,7 +80,7 @@ fn cms_decode_signed_mdm_example() {

#[test]
fn cms_decode_signed_scep_example() {
let der_signed_data_in_ci = include_bytes!("../../pkcs7/tests/examples/scep_der.bin");
let der_signed_data_in_ci = include_bytes!("../tests/examples/scep_der.bin");
let ci = ContentInfo::from_der(der_signed_data_in_ci).unwrap();
assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_SIGNED_DATA);

Expand All @@ -108,7 +107,7 @@ fn cms_decode_signed_scep_example() {

#[test]
fn cms_decode_signed_der() {
let der_signed_data_in_ci = include_bytes!("../../pkcs7/tests/examples/cms_der.bin");
let der_signed_data_in_ci = include_bytes!("../tests/examples/cms_der.bin");
let ci = ContentInfo::from_der(der_signed_data_in_ci).unwrap();
assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_SIGNED_DATA);

Expand Down
40 changes: 0 additions & 40 deletions pkcs7/CHANGELOG.md

This file was deleted.

26 changes: 0 additions & 26 deletions pkcs7/Cargo.toml

This file was deleted.

Loading

0 comments on commit ed53e63

Please sign in to comment.