From 3e8d65af10338c34264bcb5908c50e9ee0857220 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <vrana@php.net>
Date: Mon, 11 Jun 2012 18:29:51 +0000
Subject: [PATCH] Add openssl_pkcs5_pbkdf2_hmac

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@326103 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../functions/openssl-pkcs5-pbkdf2-hmac.xml   | 103 ++++++++++++++++++
 reference/openssl/versions.xml                |   1 +
 2 files changed, 104 insertions(+)
 create mode 100644 reference/openssl/functions/openssl-pkcs5-pbkdf2-hmac.xml

diff --git a/reference/openssl/functions/openssl-pkcs5-pbkdf2-hmac.xml b/reference/openssl/functions/openssl-pkcs5-pbkdf2-hmac.xml
new file mode 100644
index 0000000000..a07a24499d
--- /dev/null
+++ b/reference/openssl/functions/openssl-pkcs5-pbkdf2-hmac.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- $Revision$ -->
+
+<refentry xml:id="function.openssl-pkcs5-pbkdf2-hmac" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <refnamediv>
+  <refname>openssl_pkcs5_pbkdf2_hmac</refname>
+  <refpurpose>Generates a PKCS5 v2 PBKDF2 string</refpurpose>
+ </refnamediv>
+
+ <refsect1 role="description">
+  &reftitle.description;
+  <methodsynopsis>
+   <type>string</type><methodname>openssl_pkcs5_pbkdf2_hmac</methodname>
+   <methodparam><type>string</type><parameter>password</parameter></methodparam>
+   <methodparam><type>string</type><parameter>salt</parameter></methodparam>
+   <methodparam><type>int</type><parameter>key_length</parameter></methodparam>
+   <methodparam><type>int</type><parameter>iterations</parameter></methodparam>
+   <methodparam choice="opt"><type>string</type><parameter>digest_method</parameter><initializer>"sha1"</initializer></methodparam>
+  </methodsynopsis>
+  <para>
+
+  </para>
+
+  &warn.undocumented.func;
+
+ </refsect1>
+
+ <refsect1 role="parameters">
+  &reftitle.parameters;
+  <variablelist>
+   <varlistentry>
+    <term><parameter>password</parameter></term>
+    <listitem>
+     <para>
+      
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><parameter>salt</parameter></term>
+    <listitem>
+     <para>
+      
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><parameter>key_length</parameter></term>
+    <listitem>
+     <para>
+      
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><parameter>iterations</parameter></term>
+    <listitem>
+     <para>
+      
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><parameter>digest_method</parameter></term>
+    <listitem>
+     <para>
+      
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1 role="returnvalues">
+  &reftitle.returnvalues;
+  <para>
+   Returns computed hash&return.falseforfailure;.
+  </para>
+ </refsect1>
+
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"~/.phpdoc/manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
diff --git a/reference/openssl/versions.xml b/reference/openssl/versions.xml
index 92186a4fd5..6ea0597665 100644
--- a/reference/openssl/versions.xml
+++ b/reference/openssl/versions.xml
@@ -25,6 +25,7 @@
  <function name='openssl_pkcs12_export' from='PHP 5 &gt;= 5.2.2'/>
  <function name='openssl_pkcs12_export_to_file' from='PHP 5 &gt;= 5.2.2'/>
  <function name='openssl_pkcs12_read' from='PHP 5 &gt;= 5.2.2'/>
+ <function name='openssl_pkcs5_pbkdf2_hmac' from='PHP 5 &gt;= 5.4.5'/>
  <function name='openssl_pkcs7_decrypt' from='PHP 4 &gt;= 4.0.6, PHP 5'/>
  <function name='openssl_pkcs7_encrypt' from='PHP 4 &gt;= 4.0.6, PHP 5'/>
  <function name='openssl_pkcs7_sign' from='PHP 4 &gt;= 4.0.6, PHP 5'/>