From 904d0aeccde44f12b8e87e326febc091bf3466f9 Mon Sep 17 00:00:00 2001
From: Mark Jones <mjones@php.net>
Date: Fri, 3 Nov 2017 22:12:40 +0000
Subject: [PATCH] Fix bug #74715: openssl_pkcs12_export documentation

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@343361 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../openssl-pkcs12-export-to-file.xml         | 24 +++++++++++++++++--
 .../functions/openssl-pkcs12-export.xml       | 24 +++++++++++++++++--
 .../openssl/functions/openssl-pkcs7-sign.xml  |  8 +++----
 .../openssl/functions/openssl-x509-read.xml   |  1 +
 4 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/reference/openssl/functions/openssl-pkcs12-export-to-file.xml b/reference/openssl/functions/openssl-pkcs12-export-to-file.xml
index 70df0a9271..973dc93dfe 100644
--- a/reference/openssl/functions/openssl-pkcs12-export-to-file.xml
+++ b/reference/openssl/functions/openssl-pkcs12-export-to-file.xml
@@ -41,6 +41,7 @@
      <listitem>
       <para>
       Private key component of PKCS#12 file.
+      See <link linkend="openssl.certparams">Public/Private Key parameters</link> for a list of valid values.
       </para>
      </listitem>
     </varlistentry>
@@ -56,8 +57,27 @@
      <term><parameter>args</parameter></term>
      <listitem>
       <para>
-       Optional Array, provide an key "extracerts" with as value an array of extra certificates or a single certificate to be included in the PKCS#12 file.
-       Provide an key "friendlyname" with as value an string to be used for the supplied certificate and key.
+       Optional array, other keys will be ignored.
+       <informaltable>
+        <tgroup cols="2">
+         <thead>
+          <row>
+           <entry>Key</entry>
+           <entry>&Description;</entry>
+          </row>
+         </thead>
+         <tbody>
+          <row>
+           <entry><literal>"extracerts"</literal></entry>
+           <entry>array of extra certificates or a single certificate to be included in the PKCS#12 file.</entry>
+          </row>
+          <row>
+           <entry><literal>"friendlyname"</literal></entry>
+           <entry>string to be used for the supplied certificate and key</entry>
+          </row>
+         </tbody>
+        </tgroup>
+       </informaltable>
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/openssl/functions/openssl-pkcs12-export.xml b/reference/openssl/functions/openssl-pkcs12-export.xml
index 40f893fa0b..1e7e54c549 100644
--- a/reference/openssl/functions/openssl-pkcs12-export.xml
+++ b/reference/openssl/functions/openssl-pkcs12-export.xml
@@ -41,6 +41,7 @@
      <listitem>
       <para>
       Private key component of PKCS#12 file.
+      See <link linkend="openssl.certparams">Public/Private Key parameters</link> for a list of valid values.
       </para>
      </listitem>
     </varlistentry>
@@ -56,8 +57,27 @@
      <term><parameter>args</parameter></term>
      <listitem>
       <para>
-       Optional Array, provide an key "extracerts" with as value an array of extra certificates or a single certificate to be included in the PKCS#12 file.
-       Provide an key "friendlyname" with as value an string to be used for the supplied certificate and key.
+       Optional array, other keys will be ignored.
+       <informaltable>
+        <tgroup cols="2">
+         <thead>
+          <row>
+           <entry>Key</entry>
+           <entry>&Description;</entry>
+          </row>
+         </thead>
+         <tbody>
+          <row>
+           <entry><literal>"extracerts"</literal></entry>
+           <entry>array of extra certificates or a single certificate to be included in the PKCS#12 file.</entry>
+          </row>
+          <row>
+           <entry><literal>"friendlyname"</literal></entry>
+           <entry>string to be used for the supplied certificate and key</entry>
+          </row>
+         </tbody>
+        </tgroup>
+       </informaltable>
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/openssl/functions/openssl-pkcs7-sign.xml b/reference/openssl/functions/openssl-pkcs7-sign.xml
index 86fafef8cd..1faf97e964 100644
--- a/reference/openssl/functions/openssl-pkcs7-sign.xml
+++ b/reference/openssl/functions/openssl-pkcs7-sign.xml
@@ -51,8 +51,8 @@
      <term><parameter>signcert</parameter></term>
      <listitem>
       <para>
-        The X.509 certificate used to digitally sign infilename - 
-        see <link linkend="openssl.certparams">key/cert params</link>.
+        The X.509 certificate used to digitally sign infilename.
+        See <link linkend="openssl.certparams">Key/Certificate parameters</link> for a list of valid values.
       </para>
      </listitem>
     </varlistentry>
@@ -60,8 +60,8 @@
      <term><parameter>privkey</parameter></term>
      <listitem>
       <para>
-        <parameter>privkey</parameter> is the private key corresponding to signcert -
-        see <link linkend="openssl.certparams">key/cert params</link>.
+        <parameter>privkey</parameter> is the private key corresponding to signcert.
+        See <link linkend="openssl.certparams">Public/Private Key parameters</link> for a list of valid values.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/openssl/functions/openssl-x509-read.xml b/reference/openssl/functions/openssl-x509-read.xml
index 467f172a9e..885e905dde 100644
--- a/reference/openssl/functions/openssl-x509-read.xml
+++ b/reference/openssl/functions/openssl-x509-read.xml
@@ -28,6 +28,7 @@
      <term><parameter>x509certdata</parameter></term>
      <listitem>
       <para>
+        X509 certificate. See <link linkend="openssl.certparams">Key/Certificate parameters</link> for a list of valid values.
       </para>
      </listitem>
     </varlistentry>