svn: /phpdoc/en/trunk/reference/openssl/functions/ openssl-decrypt.xml openssl-encrypt.xml
| From: | Scott MacVicar | Date: | Mon, 18 Mar 2013 23:18:14 +0000 |
| Subject: | svn: /phpdoc/en/trunk/reference/openssl/functions/ openssl-decrypt.xml openssl-encrypt.xml | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-11107@lists.php.net to get a copy of this message | ||
scottmac Mon, 18 Mar 2013 23:18:14 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=329818
Log:
Fix documentation to show the raw_output is gone now, changed this a while back but forgot..
Changed paths:
U phpdoc/en/trunk/reference/openssl/functions/openssl-decrypt.xml
U phpdoc/en/trunk/reference/openssl/functions/openssl-encrypt.xml
Modified: phpdoc/en/trunk/reference/openssl/functions/openssl-decrypt.xml
===================================================================
--- phpdoc/en/trunk/reference/openssl/functions/openssl-decrypt.xml 2013-03-18 21:57:59 UTC (rev
329817)
+++ phpdoc/en/trunk/reference/openssl/functions/openssl-decrypt.xml 2013-03-18 23:18:14 UTC (rev
329818)
@@ -14,7 +14,7 @@
<methodparam><type>string</type><parameter>data</parameter></methodparam>
<methodparam><type>string</type><parameter>method</parameter></methodparam>
<methodparam><type>string</type><parameter>password</parameter></methodparam>
- <methodparam
choice="opt"><type>bool</type><parameter>raw_input</parameter><initializer>false</initializer></methodparam>
+ <methodparam
choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
<methodparam
choice="opt"><type>string</type><parameter>iv</parameter><initializer>""</initializer></methodparam>
</methodsynopsis>
<para>
@@ -54,14 +54,14 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>raw_input</parameter></term>
- <listitem>
- <para>
- Setting to &true; will take a raw encoded string,
- otherwise a base64 string is assumed for the
- <parameter>data</parameter> parameter.
- </para>
- </listitem>
+ <term><parameter>options</parameter></term>
+ <listitem>
+ <para>
+ <parameter>options</parameter> can be one of
+ <constant>OPENSSL_RAW_DATA</constant>,
+ <constant>OPENSSL_ZERO_PADDING</constant>.
+ </para>
+ </listitem>
</varlistentry>
<varlistentry>
<term><parameter>iv</parameter></term>
@@ -111,6 +111,12 @@
The <parameter>iv</parameter> parameter was added.
</entry>
</row>
+ <row>
+ <entry>5.4.0</entry>
+ <entry>
+ The <parameter>raw_output</parameter> was changed to
<parameter>options</parameter>.
+ </entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
Modified: phpdoc/en/trunk/reference/openssl/functions/openssl-encrypt.xml
===================================================================
--- phpdoc/en/trunk/reference/openssl/functions/openssl-encrypt.xml 2013-03-18 21:57:59 UTC (rev
329817)
+++ phpdoc/en/trunk/reference/openssl/functions/openssl-encrypt.xml 2013-03-18 23:18:14 UTC (rev
329818)
@@ -14,7 +14,7 @@
<methodparam><type>string</type><parameter>data</parameter></methodparam>
<methodparam><type>string</type><parameter>method</parameter></methodparam>
<methodparam><type>string</type><parameter>password</parameter></methodparam>
- <methodparam
choice="opt"><type>bool</type><parameter>raw_output</parameter><initializer>false</initializer></methodparam>
+ <methodparam
choice="opt"><type>int</type><parameter>options</parameter><initializer>0</initializer></methodparam>
<methodparam
choice="opt"><type>string</type><parameter>iv</parameter><initializer>""</initializer></methodparam>
</methodsynopsis>
<para>
@@ -55,13 +55,14 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><parameter>raw_output</parameter></term>
- <listitem>
- <para>
- Setting to &true; will return as raw output data, otherwise the return
- value is base64 encoded.
- </para>
- </listitem>
+ <term><parameter>options</parameter></term>
+ <listitem>
+ <para>
+ <parameter>options</parameter> can be one of
+ <constant>OPENSSL_RAW_DATA</constant>,
+ <constant>OPENSSL_ZERO_PADDING</constant>.
+ </para>
+ </listitem>
</varlistentry>
<varlistentry>
<term><parameter>iv</parameter></term>
@@ -111,6 +112,12 @@
The <parameter>iv</parameter> parameter was added.
</entry>
</row>
+ <row>
+ <entry>5.4.0</entry>
+ <entry>
+ The <parameter>raw_output</parameter> was changed to
<parameter>options</parameter>.
+ </entry>
+ </row>
</tbody>
</tgroup>
</informaltable>