diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-12-04 07:38:11 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-12-04 07:38:11 -0700 |
| commit | 7fc83b718cdf6e7abddb61810d2cc6bd3e584689 (patch) | |
| tree | 6a0d4eb57b60de897a6f80a24f0782949a294daf /email-print-mime-structure.1.pod | |
| parent | 7a5bdac3d0dc9d02ca75276bbb8fc1142247aaf1 (diff) | |
| parent | f3e1e5a552db990b2213ef850e056ecb7995558d (diff) | |
| download | mailscripts-7fc83b718cdf6e7abddb61810d2cc6bd3e584689.tar.gz | |
Merge tag 'debian/0.16-1' into buster-bpo
mailscripts release 0.16-1 for unstable (sid) [dgit]
[dgit distro=debian no-split --quilt=linear]
# gpg: Signature made Thu 28 Nov 2019 11:30:44 AM MST
# gpg: using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240
# gpg: Good signature from "Sean Whitton <spwhitton@spwhitton.name>" [ultimate]
# Primary key fingerprint: 8DC2 487E 51AB DD90 B5C4 753F 0F56 D055 3B6D 411B
# Subkey fingerprint: 9B91 7007 AE03 0E36 E4FC 248B 695B 7AE4 BF06 6240
Diffstat (limited to 'email-print-mime-structure.1.pod')
| -rw-r--r-- | email-print-mime-structure.1.pod | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/email-print-mime-structure.1.pod b/email-print-mime-structure.1.pod index d8545ad..037c1a9 100644 --- a/email-print-mime-structure.1.pod +++ b/email-print-mime-structure.1.pod @@ -32,15 +32,26 @@ key. OpenPGP secret keys listed in B<--pgpkey=> are used ephemerally, and do not interact with any local GnuPG keyring. +=item B<--cmskey=>I<KEYFILE> + +I<KEYFILE> should name a PEM- or DER-encoded X.509 private key that is +not password-protected. If an S/MIME-encrypted message that uses CMS +is found on standard input, this key will be tried for decryption. +May be used multiple times if you want to try decrypting with more +than one such key. + +X.509 private keys listed in B<--cmskey=> are used ephemerally, and do +not interact with any local GnuPG keyring. + =item B<--use-gpg-agent> If this flag is present, and B<email-print-mime-structure> encounters -a PGP/MIME-encrypted part, it will try to decrypt the part using the -secret keys found in the local installation of GnuPG. +a PGP/MIME- or S/MIME-encrypted part, it will try to decrypt the part +using the secret keys found in the local installation of GnuPG. -If both B<--pgpkey=>I<KEYFILE> and B<--use-gpg-agent> are -supplied, I<KEYFILE> arguments will be tried before falling back to -GnuPG. +If B<--use-gpg-agent> is supplied along with either +B<--pgpkey=>I<KEYFILE> or B<--cmskey=>I<KEYFILE> arguments, the +I<KEYFILE> arguments will be tried before falling back to GnuPG. If B<email-print-mime-structure> has been asked to decrypt parts with either B<--pgpkey=>I<KEYFILE> or with B<--use-gpg-agent>, and it @@ -49,8 +60,8 @@ stderr. =item B<--no-use-gpg-agent> -Don't try to decrypt PGP/MIME-encrypted parts using secret keys found -in the local installation of GnuPG. This is the default. +Don't try to decrypt PGP/MIME- or S/MIME-encrypted parts using secret +keys found in the local installation of GnuPG. This is the default. =item B<--help>, B<-h> |