[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-doc-cvs
Subject:    [DOC-CVS] =?utf-8?q?svn:_/phpdoc/en/trunk/reference/strings/functions/_crypt.xml?=
From:       Joey_Smith <joey () php ! net>
Date:       2010-03-30 11:42:08
Message-ID: svn-joey-1269949328-297172-162249958 () svn ! php ! net
[Download RAW message or body]

joey                                     Tue, 30 Mar 2010 11:42:08 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=297172

Log:
Clarified / fix docs of several instances where crypt() can be passed an invalid salt.

Added a ChangeLog entry for one trivial BC change in 5.3.2

Changed paths:
    U   phpdoc/en/trunk/reference/strings/functions/crypt.xml

Modified: phpdoc/en/trunk/reference/strings/functions/crypt.xml
===================================================================
--- phpdoc/en/trunk/reference/strings/functions/crypt.xml	2010-03-30 11:28:00 UTC (rev 297171)
+++ phpdoc/en/trunk/reference/strings/functions/crypt.xml	2010-03-30 11:42:08 UTC (rev 297172)
@@ -45,6 +45,8 @@
    <listitem>
     <simpara>
      <constant>CRYPT_STD_DES</constant> - Standard DES-based hash with a two character salt
+       from the alphabet "./0-9A-Za-z". Using invalid characters in the salt will cause
+       crypt() to fail.
     </simpara>
    </listitem>
    <listitem>
@@ -52,7 +54,8 @@
      <constant>CRYPT_EXT_DES</constant> - Extended DES-based hash. The "salt" is a
      9-character string consisting of an underscore followed by 4 bytes of iteration count and
      4 bytes of salt. These are encoded as printable characters, 6 bits per character, least
-     significant character first. The values 0 to 63 are encoded as "./0-9A-Za-z".
+     significant character first. The values 0 to 63 are encoded as "./0-9A-Za-z". Using invalid
+     characters in the salt will cause crypt() to fail.
     </simpara>
    </listitem>
    <listitem>
@@ -68,8 +71,7 @@
      "./0-9A-Za-z". Using characters outside of this range in the salt will cause crypt() to
      return a zero-length string. The two digit cost parameter is the base-2 logarithm of the
      iteration count for the underlying Blowfish-based hashing algorithmeter and must be in
-     range 04-31, values outside this range will cause crypt() to select DES instead, with a salt
-     of '$2'.
+     range 04-31, values outside this range will cause crypt() to fail.
     </simpara>
    </listitem>
    <listitem>
@@ -159,6 +161,13 @@
        </entry>
       </row>
       <row>
+       <entry>5.3.2</entry>
+       <entry>
+        Fixed Blowfish behaviour on invalid rounds to return "failure"
+        string ("*0" or "*1"), instead of falling back to DES.
+       </entry>
+      </row>
+      <row>
        <entry>5.3.0</entry>
        <entry>
         PHP now contains its own implementation for the MD5 crypt, Standard DES,



-- 
PHP Documentation Commits Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]