Fix bug #74715: openssl_pkcs12_export documentation

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@343361 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Mark Jones 2017-11-03 22:12:40 +00:00
parent dd8ac07b5e
commit 904d0aeccd
4 changed files with 49 additions and 8 deletions

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>