com php-src: Add tests from 1.3. Add missing tests.: ext/standard/tests/strings/crypt_blowfish.phpt
| From: | Stanislav Malyshev | Date: | Mon, 01 Dec 2014 05:05:40 +0000 |
| Subject: | com php-src: Add tests from 1.3. Add missing tests.: ext/standard/tests/strings/crypt_blowfish.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83422@lists.php.net to get a copy of this message | ||
Commit: 2d9d10fbbf3f2e07d0e28d1707776d44bad56ca7
Author: Leigh <leight@gmail.com> Tue, 7 Oct 2014 11:50:36 +0100
Committer: Stanislav Malyshev <stas@php.net> Sun, 30 Nov 2014 21:05:40 -0800
Parents: 29f51e1ca9638f4f7cebbb3acc247a5da5b3d9ce
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2d9d10fbbf3f2e07d0e28d1707776d44bad56ca7
Log:
Add tests from 1.3. Add missing tests.
3 of the missing tests fail. // TODO
Changed paths:
M ext/standard/tests/strings/crypt_blowfish.phpt
Diff:
diff --git a/ext/standard/tests/strings/crypt_blowfish.phpt
b/ext/standard/tests/strings/crypt_blowfish.phpt
index 20a6a27..2bb2b5f 100644
--- a/ext/standard/tests/strings/crypt_blowfish.phpt
+++ b/ext/standard/tests/strings/crypt_blowfish.phpt
@@ -18,8 +18,10 @@ $tests =array(
array('$2x$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e',
"\xff\xff\xa3"),
array('$2y$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e',
"\xff\xff\xa3"),
array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.nqd1wy.pTMdcvrRWxyiGL2eMz.2a85.',
"\xff\xff\xa3"),
+ array('$2b$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e',
"\xff\xff\xa3"),
array('$2y$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq', "\xa3"),
array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq', "\xa3"),
+ array('$2b$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq', "\xa3"),
array('$2x$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi',
"1\xa3345"),
array('$2x$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi',
"\xff\xa3345"),
array('$2x$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi',
"\xff\xa334\xff\xff\xff\xa3345"),
@@ -36,14 +38,35 @@ $tests =array(
array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.R9xrDjiycxMbQE2bp.vgqlYpW5wx2yy',
"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"),
array('$2a$05$/OK.fbVrR/bpIqNJ5ianF.9tQZzcJfm3uj2NvJ/n5xkhpqLrMpWCe',
"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"),
array('$2a$05$CCCCCCCCCCCCCCCCCCCCC.7uG0VCzI2bS7j6ymqJi9CdcdxiRTWNy', ''),
+);
+$tests2 = array(
+ array('$2a$03$CCCCCCCCCCCCCCCCCCCCC.', '*0'),
+ array('$2a$32$CCCCCCCCCCCCCCCCCCCCC.', '*0'),
+ array('$2c$05$CCCCCCCCCCCCCCCCCCCCC..', '*0'),
+ array('$2z$05$CCCCCCCCCCCCCCCCCCCCC.', '*0'),
+ array('$2`$05$CCCCCCCCCCCCCCCCCCCCC.', '*0'),
+ array('$2{$05$CCCCCCCCCCCCCCCCCCCCC.', '*0'),
+ array('*0', '*1'),
);
+
$i=0;
foreach($tests as $test) {
- if(crypt($test[1], $test[0]) == $test[0]) {
+ $result = crypt($test[1], $test[0]);
+ if($result === $test[0]) {
+ echo "$i. OK\n";
+ } else {
+ echo "$i. Not OK: $test[0] $result\n";
+ }
+ $i++;
+}
+
+foreach($tests2 as $test) {
+ $result = crypt('', $test[0]);
+ if($result === $test[1]) {
echo "$i. OK\n";
} else {
- echo "$i. Not OK: $test[0] ".crypt($test[1], $test[0])."\n";
+ echo "$i. Not OK: $test[0] $result\n";
}
$i++;
}
@@ -76,3 +99,9 @@ foreach($tests as $test) {
23. OK
24. OK
25. OK
+26. OK
+27. OK
+28. OK
+29. OK
+30. OK
+31. OK