diff options
| author | Matt Caswell <matt@openssl.org> | 2019-01-29 15:04:38 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-01-30 15:44:12 +0000 |
| commit | fea9f34a2e9c018430385c9073161b4daa484843 (patch) | |
| tree | 3b2af5a988b02eceb314d5001875d2f82a0b410d /doc/man1 | |
| parent | a6d6d64570fe6bf3078c5bc4a35c1d509ef1ee15 (diff) | |
Complain if -twopass is used incorrectly
The option -twopass to the pkcs12 app is ignored if -passin, -passout
or -password is used. We should complain if an attempt is made to use
it in combination with those options.
Fixes #8107
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8114)
(cherry picked from commit 40b64553f577716cb4898895f5fd4530a6266c75)
Diffstat (limited to 'doc/man1')
| -rw-r--r-- | doc/man1/pkcs12.pod | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/man1/pkcs12.pod b/doc/man1/pkcs12.pod index 3389e595fe..f4c4c41b27 100644 --- a/doc/man1/pkcs12.pod +++ b/doc/man1/pkcs12.pod @@ -154,7 +154,8 @@ Don't attempt to verify the integrity MAC before reading the file. Prompt for separate integrity and encryption passwords: most software always assumes these are the same so this option will render such -PKCS#12 files unreadable. +PKCS#12 files unreadable. Cannot be used in combination with the options +-password, -passin (if importing) or -passout (if exporting). =back |