From e5bbd6cf6c7c97cb43fc6d1a9c57d5f6c5cbb2e7 Mon Sep 17 00:00:00 2001
From: Scott MacVicar <scottmac@php.net>
Date: Mon, 18 Mar 2013 23:18:14 +0000
Subject: [PATCH] Fix documentation to show the raw_output is gone now, changed
 this a while back but forgot..

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@329818 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../openssl/functions/openssl-decrypt.xml     | 24 ++++++++++++-------
 .../openssl/functions/openssl-encrypt.xml     | 23 +++++++++++-------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/reference/openssl/functions/openssl-decrypt.xml b/reference/openssl/functions/openssl-decrypt.xml
index 56d59a09a6..c90f6ca986 100644
--- a/reference/openssl/functions/openssl-decrypt.xml
+++ b/reference/openssl/functions/openssl-decrypt.xml
@@ -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>
diff --git a/reference/openssl/functions/openssl-encrypt.xml b/reference/openssl/functions/openssl-encrypt.xml
index f9ef8ec69a..33c2fc55f4 100644
--- a/reference/openssl/functions/openssl-encrypt.xml
+++ b/reference/openssl/functions/openssl-encrypt.xml
@@ -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>