Verified Commit f7b6fe52 authored by Andre Heinecke's avatar Andre Heinecke
Browse files

Use p7m and p7s also for armored CMS data

This is already handled gracefully. Otherwise we would use
.pem for both and this breaks because then the signature
and the encrypted file have the same filename.

GnuPG-Bug-Id: T4041
parent 19a59ce4
......@@ -72,8 +72,8 @@ static const struct _classification {
{ "p10", CMS | Ascii | CertificateRequest },
{ "p12", CMS | Binary | ExportedPSM },
{ "p7c", CMS | Binary | Certificate },
{ "p7m", CMS | Binary | CipherText },
{ "p7s", CMS | Binary | AnySignature },
{ "p7m", CMS | AnyFormat | CipherText },
{ "p7s", CMS | AnyFormat | AnySignature },
{ "pem", CMS | Ascii | AnyType | ExamineContentHint },
{ "pfx", CMS | Binary | Certificate },
{ "pgp", OpenPGP | Binary | OpaqueSignature | CipherText | AnyCertStoreType | ExamineContentHint},
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment