diff options
| -rw-r--r-- | apps/pkcs12.c | 7 | ||||
| -rw-r--r-- | doc/man1/pkcs12.pod | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index c8fc452ec6..f10f8dabdb 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -311,6 +311,13 @@ int pkcs12_main(int argc, char **argv) if (cpass != NULL) { mpass = cpass; noprompt = 1; + if (twopass) { + if (export_cert) + BIO_printf(bio_err, "Option -twopass cannot be used with -passout or -password\n"); + else + BIO_printf(bio_err, "Option -twopass cannot be used with -passin or -password\n"); + goto end; + } } else { cpass = pass; mpass = macpass; 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 |