Skip to content

Commit 12a0425

Browse files
authored
pkcs7: remove crate sources (#1292)
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.
1 parent a878449 commit 12a0425

33 files changed

+5
-1521
lines changed

.github/workflows/pkcs7.yml

-64
This file was deleted.

Cargo.lock

-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ members = [
1414
"pem-rfc7468",
1515
"pkcs1",
1616
"pkcs5",
17-
"pkcs7",
1817
"pkcs8",
1918
"pkcs12",
2019
"sec1",
@@ -48,7 +47,6 @@ der_derive = { path = "./der/derive" }
4847
pem-rfc7468 = { path = "./pem-rfc7468" }
4948
pkcs1 = { path = "./pkcs1" }
5049
pkcs5 = { path = "./pkcs5" }
51-
pkcs7 = { path = "./pkcs7" }
5250
pkcs8 = { path = "./pkcs8" }
5351
pkcs12 = { path = "./pkcs12" }
5452
sec1 = { path = "./sec1" }
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.

cms/tests/tests_from_pkcs7_crate.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use pkcs5::pbes2::Pbkdf2Params;
99

1010
#[test]
1111
fn cms_decode_cert_example() {
12-
let enc_ci = include_bytes!("../../pkcs7/tests/examples/certData.bin");
12+
let enc_ci = include_bytes!("../tests/examples/certData.bin");
1313
let ci = ContentInfo::from_der(enc_ci).unwrap();
1414
assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_DATA);
1515
assert_eq!(ci.content.value().len(), 781);
@@ -19,7 +19,7 @@ fn cms_decode_cert_example() {
1919

2020
#[test]
2121
fn cms_decode_encrypted_key_example() {
22-
let enc_ci = include_bytes!("../../pkcs7/tests/examples/keyEncryptedData.bin");
22+
let enc_ci = include_bytes!("../tests/examples/keyEncryptedData.bin");
2323
let ci = ContentInfo::from_der(enc_ci).unwrap();
2424
assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_ENCRYPTED_DATA);
2525
let data = EncryptedData::from_der(ci.content.to_der().unwrap().as_slice()).unwrap();
@@ -54,8 +54,7 @@ fn cms_decode_encrypted_key_example() {
5454

5555
#[test]
5656
fn cms_decode_signed_mdm_example() {
57-
let der_signed_data_in_ci =
58-
include_bytes!("../../pkcs7/tests/examples/apple_mdm_signature_der.bin");
57+
let der_signed_data_in_ci = include_bytes!("../tests/examples/apple_mdm_signature_der.bin");
5958
let ci = ContentInfo::from_der(der_signed_data_in_ci).unwrap();
6059
assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_SIGNED_DATA);
6160

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

8281
#[test]
8382
fn cms_decode_signed_scep_example() {
84-
let der_signed_data_in_ci = include_bytes!("../../pkcs7/tests/examples/scep_der.bin");
83+
let der_signed_data_in_ci = include_bytes!("../tests/examples/scep_der.bin");
8584
let ci = ContentInfo::from_der(der_signed_data_in_ci).unwrap();
8685
assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_SIGNED_DATA);
8786

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

109108
#[test]
110109
fn cms_decode_signed_der() {
111-
let der_signed_data_in_ci = include_bytes!("../../pkcs7/tests/examples/cms_der.bin");
110+
let der_signed_data_in_ci = include_bytes!("../tests/examples/cms_der.bin");
112111
let ci = ContentInfo::from_der(der_signed_data_in_ci).unwrap();
113112
assert_eq!(ci.content_type, const_oid::db::rfc5911::ID_SIGNED_DATA);
114113

pkcs7/CHANGELOG.md

-40
This file was deleted.

pkcs7/Cargo.toml

-26
This file was deleted.

0 commit comments

Comments
 (0)