summaryrefslogtreecommitdiff
path: root/doc/man1/pkcs12.pod
diff options
context:
space:
mode:
Diffstat (limited to 'doc/man1/pkcs12.pod')
-rw-r--r--doc/man1/pkcs12.pod5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/man1/pkcs12.pod b/doc/man1/pkcs12.pod
index 3389e595fed7..6f890c120f3c 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
@@ -381,7 +382,7 @@ L<pkcs8(1)>
=head1 COPYRIGHT
-Copyright 2000-2017 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2000-2019 The OpenSSL Project Authors. All Rights Reserved.
Licensed under the OpenSSL license (the "License"). You may not use
this file except in compliance with the License. You can obtain a copy