pajoye                                   Wed, 09 Dec 2009 01:43:23 +0000

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

Log:
- #50334, add CRYPT_SHA* constants and tests [DOC]

Bug: http://bugs.php.net/50334 (Closed) crypt ignores sha512 prefix
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/standard/crypt.c
    A   
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_sha256.phpt
    A   
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_sha512.phpt
    U   php/php-src/trunk/ext/standard/crypt.c
    A   php/php-src/trunk/ext/standard/tests/strings/crypt_sha256.phpt
    A   php/php-src/trunk/ext/standard/tests/strings/crypt_sha512.phpt

Modified: php/php-src/branches/PHP_5_3/ext/standard/crypt.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/crypt.c	2009-12-09 00:55:05 UTC (rev 291903)
+++ php/php-src/branches/PHP_5_3/ext/standard/crypt.c	2009-12-09 01:43:23 UTC (rev 291904)
@@ -106,7 +106,10 @@
 	REGISTER_LONG_CONSTANT("CRYPT_EXT_DES", PHP_EXT_DES_CRYPT, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CRYPT_MD5", PHP_MD5_CRYPT, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CRYPT_BLOWFISH", PHP_BLOWFISH_CRYPT, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CRYPT_SHA256", PHP_SHA256_CRYPT, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CRYPT_SHA512", PHP_SHA512_CRYPT, CONST_CS | CONST_PERSISTENT);

+
 #ifdef PHP_USE_PHP_CRYPT_R
 	php_init_crypt_r();
 #endif

Added: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_sha256.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_sha256.phpt	                        (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_sha256.phpt	2009-12-09 01:43:23 UTC (rev 291904)
@@ -0,0 +1,64 @@
+--TEST--
+crypt() SHA-256
+--SKIPIF--
+<?php
+if (!function_exists('crypt') || !defined("CRYPT_SHA256")) {
+	die("SKIP crypt()-sha256 is not available");
+}
+?>
+--FILE--
+<?php
+
+$tests = array(
+	1 => array(
+		b'$5$saltstring',
+		b'Hello world!',
+		b'$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5'
+	),
+	2 => array(
+		b'$5$rounds=10000$saltstringsaltstring',
+		b'Hello world!',
+		b'$5$rounds=10000$saltstringsaltst$3xv.VbSHBb41AL9AvLeujZkZRBAwqFMz2.opqey6IcA'
+	),
+	3 => array(
+		b'$5$rounds=10000$saltstringsaltstring',
+		b'Hello world!',
+		b'$5$rounds=10000$saltstringsaltst$3xv.VbSHBb41AL9AvLeujZkZRBAwqFMz2.opqey6IcA'
+	),
+	4 => array(
+		b'$5$rounds=5000$toolongsaltstring',
+		b'This is just a test',
+		b'$5$rounds=5000$toolongsaltstrin$Un/5jzAHMgOGZ5.mWJpuVolil07guHPvOW8mGRcvxa5'
+	),
+	5 => array(
+		b'$5$rounds=1400$anotherlongsaltstring',
+		b'a very much longer text to encrypt.  This one even stretches over morethan one line.',
+		b'$5$rounds=1400$anotherlongsalts$Rx.j8H.h8HjEDGomFU8bDkXm3XIUnzyxf12oP84Bnq1'
+	),
+	6 => array(
+		b'$5$rounds=77777$short',
+		b'we have a short salt string but not a short password',
+		b'$5$rounds=77777$short$JiO1O3ZpDAxGJeaDIuqCoEFysAe1mZNJRs3pw0KQRd/'
+	),
+	7 => array(
+		b'$5$rounds=123456$asaltof16chars..',
+		b'a short string',
+		b'$5$rounds=123456$asaltof16chars..$gP3VQ/6X7UUEW3HkBn2w1/Ptq2jxPyzV/cZKmF/wJvD'
+	),
+	8 => array(
+		b'$5$rounds=10$roundstoolow',
+		b'the minimum number is still observed',
+		b'$5$rounds=1000$roundstoolow$yfvwcWrQ8l/K0DAWyuPMDNHpIVlTQebY9l/gL972bIC'
+	)
+);
+
+foreach ($tests as $iter => $t) {
+	$res = crypt($t[1], $t[0]);
+	if ($res != $t[2]) echo "Iteration $iter failed.
+Expected: <$t[2]>
+Got       <$res>\n";
+}
+echo "Passes.";?>
+--EXPECTF--
+Passes.
+

Added: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_sha512.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_sha512.phpt	                        (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_sha512.phpt	2009-12-09 01:43:23 UTC (rev 291904)
@@ -0,0 +1,60 @@
+--TEST--
+crypt() SHA-512
+--SKIPIF--
+<?php
+if (!function_exists('crypt') || !defined("CRYPT_SHA512")) {
+	die("SKIP crypt()-sha512 is not available");
+}
+?>
+--FILE--
+<?php
+
+$tests = array(
+	1 => array(
+		b'$6$saltstring',
+		b'Hello world!',
+		b'$6$saltstring$svn8UoSVapNtMuq1ukKS4tPQd8iKwSMHWjl/O817G3uBnIFNjnQJuesI68u4OTLiBFdcbYEdFCoEOfaS35inz1'
+	),
+	2 => array(
+		b'$6$rounds=10000$saltstringsaltstring',
+		b'Hello world!',
+		b'$6$rounds=10000$saltstringsaltst$OW1/O6BYHV6BcXZu8QVeXbDWra3Oeqh0sbHbbMCVNSnCM/UrjmM0Dp8vOuZeHBy/YTBmSK6H9qs/y3RnOaw5v.'
+	),
+	3 => array(
+		b'$6$rounds=5000$toolongsaltstring',
+		b'This is just a test',
+		b'$6$rounds=5000$toolongsaltstrin$lQ8jolhgVRVhY4b5pZKaysCLi0QBxGoNeKQzQ3glMhwllF7oGDZxUhx1yxdYcz/e1JSbq3y6JMxxl8audkUEm0'
+	),
+	4 => array(
+		b'$6$rounds=1400$anotherlongsaltstring',
+		b'a very much longer text to encrypt.  This one even stretches over morethan one line.',
+		b'$6$rounds=1400$anotherlongsalts$POfYwTEok97VWcjxIiSOjiykti.o/pQs.wPvMxQ6Fm7I6IoYN3CmLs66x9t0oSwbtEW7o7UmJEiDwGqd8p4ur1'
+	),
+	5 => array(
+		b'$6$rounds=77777$short',
+		b'we have a short salt string but not a short password',
+		b'$6$rounds=77777$short$WuQyW2YR.hBNpjjRhpYD/ifIw05xdfeEyQoMxIXbkvr0gge1a1x3yRULJ5CCaUeOxFmtlcGZelFl5CxtgfiAc0'
+	),
+	6 => array(
+		b'$6$rounds=123456$asaltof16chars..',
+		b'a short string',
+		b'$6$rounds=123456$asaltof16chars..$BtCwjqMJGx5hrJhZywWvt0RLE8uZ4oPwcelCjmw2kSYu.Ec6ycULevoBK25fs2xXgMNrCzIMVcgEJAstJeonj1'
+	),
+	7 => array(
+		b'$6$rounds=10$roundstoolow',
+		b'the minimum number is still observed',
+		b'$6$rounds=1000$roundstoolow$kUMsbe306n21p9R.FRkW3IGn.S9NPN0x50YhH1xhLsPuWGsUSklZt58jaTfF4ZEQpyUNGc0dqbpBYYBaHHrsX.'
+	)
+);
+
+foreach ($tests as $iter => $t) {
+	$res = crypt($t[1], $t[0]);
+	if ($res != $t[2]) echo "Iteration $iter failed.
+Expected: <$t[2]>
+Got       <$res>\n";
+}
+echo "Passes.";
+?>
+--EXPECTF--
+Passes.
+

Modified: php/php-src/trunk/ext/standard/crypt.c
===================================================================
--- php/php-src/trunk/ext/standard/crypt.c	2009-12-09 00:55:05 UTC (rev 291903)
+++ php/php-src/trunk/ext/standard/crypt.c	2009-12-09 01:43:23 UTC (rev 291904)
@@ -107,7 +107,10 @@
 	REGISTER_LONG_CONSTANT("CRYPT_EXT_DES", PHP_EXT_DES_CRYPT, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CRYPT_MD5", PHP_MD5_CRYPT, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("CRYPT_BLOWFISH", PHP_BLOWFISH_CRYPT, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CRYPT_SHA256", PHP_SHA256_CRYPT, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("CRYPT_SHA512", PHP_SHA512_CRYPT, CONST_CS | CONST_PERSISTENT);

+
 #ifdef PHP_USE_PHP_CRYPT_R
 	php_init_crypt_r();
 #endif

Added: php/php-src/trunk/ext/standard/tests/strings/crypt_sha256.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/crypt_sha256.phpt	                        (rev 0)
+++ php/php-src/trunk/ext/standard/tests/strings/crypt_sha256.phpt	2009-12-09 01:43:23 UTC (rev 291904)
@@ -0,0 +1,64 @@
+--TEST--
+crypt() SHA-256
+--SKIPIF--
+<?php
+if (!function_exists('crypt')) {
+	die("SKIP crypt() is not available");
+}
+?>
+--FILE--
+<?php
+
+$tests = array(
+	1 => array(
+		b'$5$saltstring',
+		b'Hello world!',
+		b'$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5'
+	),
+	2 => array(
+		b'$5$rounds=10000$saltstringsaltstring',
+		b'Hello world!',
+		b'$5$rounds=10000$saltstringsaltst$3xv.VbSHBb41AL9AvLeujZkZRBAwqFMz2.opqey6IcA'
+	),
+	3 => array(
+		b'$5$rounds=10000$saltstringsaltstring',
+		b'Hello world!',
+		b'$5$rounds=10000$saltstringsaltst$3xv.VbSHBb41AL9AvLeujZkZRBAwqFMz2.opqey6IcA'
+	),
+	4 => array(
+		b'$5$rounds=5000$toolongsaltstring',
+		b'This is just a test',
+		b'$5$rounds=5000$toolongsaltstrin$Un/5jzAHMgOGZ5.mWJpuVolil07guHPvOW8mGRcvxa5'
+	),
+	5 => array(
+		b'$5$rounds=1400$anotherlongsaltstring',
+		b'a very much longer text to encrypt.  This one even stretches over morethan one line.',
+		b'$5$rounds=1400$anotherlongsalts$Rx.j8H.h8HjEDGomFU8bDkXm3XIUnzyxf12oP84Bnq1'
+	),
+	6 => array(
+		b'$5$rounds=77777$short',
+		b'we have a short salt string but not a short password',
+		b'$5$rounds=77777$short$JiO1O3ZpDAxGJeaDIuqCoEFysAe1mZNJRs3pw0KQRd/'
+	),
+	7 => array(
+		b'$5$rounds=123456$asaltof16chars..',
+		b'a short string',
+		b'$5$rounds=123456$asaltof16chars..$gP3VQ/6X7UUEW3HkBn2w1/Ptq2jxPyzV/cZKmF/wJvD'
+	),
+	8 => array(
+		b'$5$rounds=10$roundstoolow',
+		b'the minimum number is still observed',
+		b'$5$rounds=1000$roundstoolow$yfvwcWrQ8l/K0DAWyuPMDNHpIVlTQebY9l/gL972bIC'
+	)
+);
+
+foreach ($tests as $iter => $t) {
+	$res = crypt($t[1], $t[0]);
+	if ($res != $t[2]) echo "Iteration $iter failed.
+Expected: <$t[2]>
+Got       <$res>\n";
+}
+echo "Passes.";?>
+--EXPECTF--
+Passes.
+

Added: php/php-src/trunk/ext/standard/tests/strings/crypt_sha512.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/crypt_sha512.phpt	                        (rev 0)
+++ php/php-src/trunk/ext/standard/tests/strings/crypt_sha512.phpt	2009-12-09 01:43:23 UTC (rev 291904)
@@ -0,0 +1,60 @@
+--TEST--
+crypt() SHA-512
+--SKIPIF--
+<?php
+if (!function_exists('crypt')) {
+	die("SKIP crypt() is not available");
+}
+?>
+--FILE--
+<?php
+
+$tests = array(
+	1 => array(
+		b'$6$saltstring',
+		b'Hello world!',
+		b'$6$saltstring$svn8UoSVapNtMuq1ukKS4tPQd8iKwSMHWjl/O817G3uBnIFNjnQJuesI68u4OTLiBFdcbYEdFCoEOfaS35inz1'
+	),
+	2 => array(
+		b'$6$rounds=10000$saltstringsaltstring',
+		b'Hello world!',
+		b'$6$rounds=10000$saltstringsaltst$OW1/O6BYHV6BcXZu8QVeXbDWra3Oeqh0sbHbbMCVNSnCM/UrjmM0Dp8vOuZeHBy/YTBmSK6H9qs/y3RnOaw5v.'
+	),
+	3 => array(
+		b'$6$rounds=5000$toolongsaltstring',
+		b'This is just a test',
+		b'$6$rounds=5000$toolongsaltstrin$lQ8jolhgVRVhY4b5pZKaysCLi0QBxGoNeKQzQ3glMhwllF7oGDZxUhx1yxdYcz/e1JSbq3y6JMxxl8audkUEm0'
+	),
+	4 => array(
+		b'$6$rounds=1400$anotherlongsaltstring',
+		b'a very much longer text to encrypt.  This one even stretches over morethan one line.',
+		b'$6$rounds=1400$anotherlongsalts$POfYwTEok97VWcjxIiSOjiykti.o/pQs.wPvMxQ6Fm7I6IoYN3CmLs66x9t0oSwbtEW7o7UmJEiDwGqd8p4ur1'
+	),
+	5 => array(
+		b'$6$rounds=77777$short',
+		b'we have a short salt string but not a short password',
+		b'$6$rounds=77777$short$WuQyW2YR.hBNpjjRhpYD/ifIw05xdfeEyQoMxIXbkvr0gge1a1x3yRULJ5CCaUeOxFmtlcGZelFl5CxtgfiAc0'
+	),
+	6 => array(
+		b'$6$rounds=123456$asaltof16chars..',
+		b'a short string',
+		b'$6$rounds=123456$asaltof16chars..$BtCwjqMJGx5hrJhZywWvt0RLE8uZ4oPwcelCjmw2kSYu.Ec6ycULevoBK25fs2xXgMNrCzIMVcgEJAstJeonj1'
+	),
+	7 => array(
+		b'$6$rounds=10$roundstoolow',
+		b'the minimum number is still observed',
+		b'$6$rounds=1000$roundstoolow$kUMsbe306n21p9R.FRkW3IGn.S9NPN0x50YhH1xhLsPuWGsUSklZt58jaTfF4ZEQpyUNGc0dqbpBYYBaHHrsX.'
+	)
+);
+
+foreach ($tests as $iter => $t) {
+	$res = crypt($t[1], $t[0]);
+	if ($res != $t[2]) echo "Iteration $iter failed.
+Expected: <$t[2]>
+Got       <$res>\n";
+}
+echo "Passes.";
+?>
+--EXPECTF--
+Passes.
+
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to