diff options
| author | Stanislav Malyshev <stas@php.net> | 2012-05-24 13:54:51 -0500 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-05-30 21:39:29 +0200 |
| commit | c208ad9ddbf712e20a8ce0c0930eb1684e06609a (patch) | |
| tree | 6dee497f0b933f90a6be505c29126283da853325 | |
| parent | e9e4819c1b7396c4ee1120685aadae84396ac820 (diff) | |
| download | php-git-c208ad9ddbf712e20a8ce0c0930eb1684e06609a.tar.gz | |
fix CVE-2012-2143
(cherry picked from commit bc1c1beea5b4cd1bec72d347bfd21e865258933a)
| -rw-r--r-- | ext/standard/crypt_freesec.c | 3 | ||||
| -rw-r--r-- | ext/standard/tests/strings/crypt_chars.phpt | 19 |
2 files changed, 21 insertions, 1 deletions
diff --git a/ext/standard/crypt_freesec.c b/ext/standard/crypt_freesec.c index 49c397cca1..0a5c3ba5fa 100644 --- a/ext/standard/crypt_freesec.c +++ b/ext/standard/crypt_freesec.c @@ -629,7 +629,8 @@ _crypt_extended_r(const char *key, const char *setting, */ q = (u_char *) keybuf; while (q - (u_char *) keybuf < sizeof(keybuf)) { - if ((*q++ = *key << 1)) + *q++ = *key << 1; + if (*key) key++; } if (des_setkey((u_char *) keybuf, data)) diff --git a/ext/standard/tests/strings/crypt_chars.phpt b/ext/standard/tests/strings/crypt_chars.phpt new file mode 100644 index 0000000000..09cd868216 --- /dev/null +++ b/ext/standard/tests/strings/crypt_chars.phpt @@ -0,0 +1,19 @@ +--TEST-- +crypt() function - characters > 0x80 +--SKIPIF-- +<?php +if (!function_exists('crypt')) { + die("SKIP crypt() is not available"); +} +?> +--FILE-- +<?php +var_dump(crypt("À1234abcd", "99")); +var_dump(crypt("À9234abcd", "99")); +var_dump(crypt("À1234abcd", "_01234567")); +var_dump(crypt("À9234abcd", "_01234567")); +--EXPECT-- +string(13) "99PxawtsTfX56" +string(13) "99jcVcGxUZOWk" +string(20) "_01234567IBjxKliXXRQ" +string(20) "_012345678OSGpGQRVHA" |