[Pkg-openssl-changes] r501 - in openssl/trunk/debian: . patches

[Kurt Roeckx]

Author: kroeckx
Date: 2011-06-13 10:32:22 +0000 (Mon, 13 Jun 2011)
New Revision: 501

Added:
   openssl/trunk/debian/patches/pkcs12-doc.patch
Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/series
Log:
Patch from Scott Schaefer to better document pkcs12 password options
(Closes: #462489)


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2011-06-13 10:24:05 UTC (rev 500)
+++ openssl/trunk/debian/changelog	2011-06-13 10:32:22 UTC (rev 501)
@@ -5,8 +5,10 @@
     fix various pod and spelling errors. (Closes: #622820)
   * Add missing symbols for the engines (Closes: #623038)
   * More spelling fixes from Scott Schaefer (Closes: #395424)
+  * Patch from Scott Schaefer to better document pkcs12 password options
+    (Closes: #462489)
 
- -- Kurt Roeckx <kurt at roeckx.be>  Mon, 13 Jun 2011 12:12:50 +0200
+ -- Kurt Roeckx <kurt at roeckx.be>  Mon, 13 Jun 2011 12:31:25 +0200
 
 openssl (1.0.0d-2) unstable; urgency=high
 

Added: openssl/trunk/debian/patches/pkcs12-doc.patch
===================================================================
--- openssl/trunk/debian/patches/pkcs12-doc.patch	                        (rev 0)
+++ openssl/trunk/debian/patches/pkcs12-doc.patch	2011-06-13 10:32:22 UTC (rev 501)
@@ -0,0 +1,42 @@
+This is another documentation issue ...
+
+apps/pkcs12.c accepts -password as an argument.  The document author 
+almost certainly meant to write "-password, -passin".
+
+However, that is not correct, either.  Actually the code treats 
+-password as equivalent to -passin, EXCEPT when -export is also 
+specified, in which case -password as equivalent to -passout.  The patch 
+below makes this explicit.
+
+
+diff --git a/doc/apps/pkcs12.pod b/doc/apps/pkcs12.pod
+--- a/doc/apps/pkcs12.pod
++++ b/doc/apps/pkcs12.pod
+@@ -67,7 +67,7 @@
+  The filename to write certificates and private keys to, standard output by
+  default.  They are all written in PEM format.
+
+-=item B<-pass arg>, B<-passin arg>
++=item B<-passin arg>
+
+  the PKCS#12 file (i.e. input file) password source. For more 
+information about
+  the format of B<arg> see the B<PASS PHRASE ARGUMENTS> section in
+@@ -79,6 +79,11 @@
+  information about the format of B<arg> see the B<PASS PHRASE 
+ARGUMENTS> section
+  in L<openssl(1)|openssl(1)>.
+
++=item B<-password arg>
++
++With -export, -password is equivalent to -passout.
++Otherwise, -password is equivalent to -passin.
++
+  =item B<-noout>
+
+  this option inhibits output of the keys and certificates to the output 
+file
+
+
+
+

Modified: openssl/trunk/debian/patches/series
===================================================================
--- openssl/trunk/debian/patches/series	2011-06-13 10:24:05 UTC (rev 500)
+++ openssl/trunk/debian/patches/series	2011-06-13 10:32:22 UTC (rev 501)
@@ -26,3 +26,4 @@
 pod_s_server.misspell.patch
 pod_x509setflags.misspell.patch
 pod_ec.misspell.patch
+pkcs12-doc.patch