From 73fa25ae8e7ffec76f5ef66e65604ec079c69418 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Fri, 7 Feb 2014 08:01:43 +0900 Subject: [PATCH 1/5] Timing safe str_compare() using SipHash --- ext/standard/basic_functions.c | 6 ++ ext/standard/php_string.h | 3 + ext/standard/string.c | 158 +++++++++++++++++++++++++++++++++ 3 files changed, 167 insertions(+) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 4f50ce6038f99..874e749b0caee 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -2496,6 +2496,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_substr_compare, 0, 0, 3) ZEND_ARG_INFO(0, length) ZEND_ARG_INFO(0, case_sensitivity) ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_str_compare, 0, 0, 2) + ZEND_ARG_INFO(0, str1) + ZEND_ARG_INFO(0, str2) +ZEND_END_ARG_INFO() /* }}} */ /* {{{ syslog.c */ #ifdef HAVE_SYSLOG_H @@ -2773,6 +2778,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FE(str_split, arginfo_str_split) PHP_FE(strpbrk, arginfo_strpbrk) PHP_FE(substr_compare, arginfo_substr_compare) + PHP_FE(str_compare, arginfo_str_compare) #ifdef HAVE_STRCOLL PHP_FE(strcoll, arginfo_strcoll) diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h index 2396d40461673..75875c8e94110 100644 --- a/ext/standard/php_string.h +++ b/ext/standard/php_string.h @@ -93,6 +93,7 @@ PHP_FUNCTION(str_word_count); PHP_FUNCTION(str_split); PHP_FUNCTION(strpbrk); PHP_FUNCTION(substr_compare); +PHP_FUNCTION(str_compare); #ifdef HAVE_STRCOLL PHP_FUNCTION(strcoll); #endif @@ -147,6 +148,8 @@ PHPAPI int string_natural_compare_function_ex(zval *result, zval *op1, zval *op2 PHPAPI int string_natural_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); PHPAPI int string_natural_case_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC); +PHPAPI int php_byte_compare(const void *b1, const void *b2, size_t n); + #ifndef HAVE_STRERROR PHPAPI char *php_strerror(int errnum); #define strerror php_strerror diff --git a/ext/standard/string.c b/ext/standard/string.c index b47319be310b3..0e299dadc241b 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -5616,6 +5616,164 @@ PHP_FUNCTION(substr_compare) } /* }}} */ + +/* XXX: Just embed here for the time being + https://github.com/majek/csiphash/blob/master/csiphash.c +*/ +/* + Copyright (c) 2013 Marek Majkowski + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + + + Original location: + https://github.com/majek/csiphash/ + + Solution inspired by code from: + Samuel Neves (supercop/crypto_auth/siphash24/little) + djb (supercop/crypto_auth/siphash24/little2) + Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c) +*/ + +/* #include */ + +#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ + __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +# define _le64toh(x) ((uint64_t)(x)) +#elif defined(_WIN32) +/* Windows is always little endian, unless you're on xbox360 + http://msdn.microsoft.com/en-us/library/b0084kay(v=vs.80).aspx */ +# define _le64toh(x) ((uint64_t)(x)) +#elif defined(__APPLE__) +# include +# define _le64toh(x) OSSwapLittleToHostInt64(x) +#else + +/* See: http://sourceforge.net/p/predef/wiki/Endianness/ */ +# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +# include +# else +# include +# endif +# if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \ + __BYTE_ORDER == __LITTLE_ENDIAN +# define _le64toh(x) ((uint64_t)(x)) +# else +# define _le64toh(x) le64toh(x) +# endif + +#endif + + +#define ROTATE(x, b) (uint64_t)( ((x) << (b)) | ( (x) >> (64 - (b))) ) + +#define HALF_ROUND(a,b,c,d,s,t) \ + a += b; c += d; \ + b = ROTATE(b, s) ^ a; \ + d = ROTATE(d, t) ^ c; \ + a = ROTATE(a, 32); + +#define DOUBLE_ROUND(v0,v1,v2,v3) \ + HALF_ROUND(v0,v1,v2,v3,13,16); \ + HALF_ROUND(v2,v1,v0,v3,17,21); \ + HALF_ROUND(v0,v1,v2,v3,13,16); \ + HALF_ROUND(v2,v1,v0,v3,17,21); + + +static uint64_t php_siphash(const void *src, unsigned long src_sz, const char key[16]) { + const uint64_t *_key = (uint64_t *)key; + uint64_t k0 = _le64toh(_key[0]); + uint64_t k1 = _le64toh(_key[1]); + uint64_t b = (uint64_t)src_sz << 56; + const uint64_t *in = (uint64_t*)src; + + uint64_t v0 = k0 ^ 0x736f6d6570736575ULL; + uint64_t v1 = k1 ^ 0x646f72616e646f6dULL; + uint64_t v2 = k0 ^ 0x6c7967656e657261ULL; + uint64_t v3 = k1 ^ 0x7465646279746573ULL; + + while (src_sz >= 8) { + uint64_t mi = _le64toh(*in); + in += 1; src_sz -= 8; + v3 ^= mi; + DOUBLE_ROUND(v0,v1,v2,v3); + v0 ^= mi; + } + + uint64_t t = 0; uint8_t *pt = (uint8_t *)&t; uint8_t *m = (uint8_t *)in; + switch (src_sz) { + case 7: pt[6] = m[6]; + case 6: pt[5] = m[5]; + case 5: pt[4] = m[4]; + case 4: *((uint32_t*)&pt[0]) = *((uint32_t*)&m[0]); break; + case 3: pt[2] = m[2]; + case 2: pt[1] = m[1]; + case 1: pt[0] = m[0]; + } + b |= _le64toh(t); + + v3 ^= b; + DOUBLE_ROUND(v0,v1,v2,v3); + v0 ^= b; v2 ^= 0xff; + DOUBLE_ROUND(v0,v1,v2,v3); + DOUBLE_ROUND(v0,v1,v2,v3); + return (v0 ^ v1) ^ (v2 ^ v3); +} +/* END SipHash */ + +/* Timing safe compare */ +PHPAPI int php_compare(const void *b1, const void *b2, size_t n) /* {{{ */ +{ + const unsigned char *p1 = b1, *p2 = b2; + int ret = 0; + + for (; n > 0; n--) { + ret |= *p1++ ^ *p2++; + } + return (ret != 0); +} +/* }}} */ + +/* {{{ proto bool str_compare(string str1, string str2) + Timing safe string compare */ +PHP_FUNCTION(str_compare) +{ + zval *s1, *s2; + char key[16] = {0,1,2,3,4,5,6,7,8,9,0xa,0xb,0xc,0xd,0xe,0xf}; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &s1, &s2) == FAILURE) { + RETURN_FALSE; + } + + if (Z_TYPE_P(s1) != IS_STRING || Z_TYPE_P(s2) != IS_STRING) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Paremeters must be string"); + RETURN_FALSE; + } + if (Z_STRLEN_P(s1) != Z_STRLEN_P(s2)) { + RETURN_FALSE; + } + + + RETURN_BOOL(php_siphash(Z_STRVAL_P(s1), Z_STRLEN_P(s1), key) == php_siphash(Z_STRVAL_P(s2), Z_STRLEN_P(s2), key)); +} +/* }}} */ + /* * Local variables: * tab-width: 4 From f8cf38867cb940603d59b6831bffb0a18ad37989 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Fri, 7 Feb 2014 09:55:11 +0900 Subject: [PATCH 2/5] Add str_*_compare() functions to play with --- ext/standard/basic_functions.c | 4 + ext/standard/php_string.h | 4 + ext/standard/siphash.c | 116 +++++++++++ ext/standard/string.c | 203 +++++++++---------- ext/standard/xxhash.c | 342 +++++++++++++++++++++++++++++++++ ext/standard/xxhash.h | 128 ++++++++++++ 6 files changed, 689 insertions(+), 108 deletions(-) create mode 100644 ext/standard/siphash.c create mode 100644 ext/standard/xxhash.c create mode 100644 ext/standard/xxhash.h diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 874e749b0caee..67fc65d9997a3 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -2778,6 +2778,10 @@ const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FE(str_split, arginfo_str_split) PHP_FE(strpbrk, arginfo_strpbrk) PHP_FE(substr_compare, arginfo_substr_compare) + PHP_FE(str_siphash_compare, arginfo_str_compare) + PHP_FE(str_xxhash32_compare, arginfo_str_compare) + PHP_FE(str_md5_compare, arginfo_str_compare) + PHP_FE(str_byte_compare, arginfo_str_compare) PHP_FE(str_compare, arginfo_str_compare) #ifdef HAVE_STRCOLL diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h index 75875c8e94110..463dca5266e22 100644 --- a/ext/standard/php_string.h +++ b/ext/standard/php_string.h @@ -93,6 +93,10 @@ PHP_FUNCTION(str_word_count); PHP_FUNCTION(str_split); PHP_FUNCTION(strpbrk); PHP_FUNCTION(substr_compare); +PHP_FUNCTION(str_siphash_compare); +PHP_FUNCTION(str_xxhash32_compare); +PHP_FUNCTION(str_md5_compare); +PHP_FUNCTION(str_byte_compare); PHP_FUNCTION(str_compare); #ifdef HAVE_STRCOLL PHP_FUNCTION(strcoll); diff --git a/ext/standard/siphash.c b/ext/standard/siphash.c new file mode 100644 index 0000000000000..b414214132ecd --- /dev/null +++ b/ext/standard/siphash.c @@ -0,0 +1,116 @@ +/* + Copyright (c) 2013 Marek Majkowski + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + + + Original location: + https://github.com/majek/csiphash/ + + Solution inspired by code from: + Samuel Neves (supercop/crypto_auth/siphash24/little) + djb (supercop/crypto_auth/siphash24/little2) + Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c) +*/ + +#include + +#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ + __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +# define _le64toh(x) ((uint64_t)(x)) +#elif defined(_WIN32) +/* Windows is always little endian, unless you're on xbox360 + http://msdn.microsoft.com/en-us/library/b0084kay(v=vs.80).aspx */ +# define _le64toh(x) ((uint64_t)(x)) +#elif defined(__APPLE__) +# include +# define _le64toh(x) OSSwapLittleToHostInt64(x) +#else + +/* See: http://sourceforge.net/p/predef/wiki/Endianness/ */ +# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +# include +# else +# include +# endif +# if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \ + __BYTE_ORDER == __LITTLE_ENDIAN +# define _le64toh(x) ((uint64_t)(x)) +# else +# define _le64toh(x) le64toh(x) +# endif + +#endif + + +#define ROTATE(x, b) (uint64_t)( ((x) << (b)) | ( (x) >> (64 - (b))) ) + +#define HALF_ROUND(a,b,c,d,s,t) \ + a += b; c += d; \ + b = ROTATE(b, s) ^ a; \ + d = ROTATE(d, t) ^ c; \ + a = ROTATE(a, 32); + +#define DOUBLE_ROUND(v0,v1,v2,v3) \ + HALF_ROUND(v0,v1,v2,v3,13,16); \ + HALF_ROUND(v2,v1,v0,v3,17,21); \ + HALF_ROUND(v0,v1,v2,v3,13,16); \ + HALF_ROUND(v2,v1,v0,v3,17,21); + + +uint64_t php_siphash(const void *src, unsigned long src_sz, const char key[16]) { + const uint64_t *_key = (uint64_t *)key; + uint64_t k0 = _le64toh(_key[0]); + uint64_t k1 = _le64toh(_key[1]); + uint64_t b = (uint64_t)src_sz << 56; + const uint64_t *in = (uint64_t*)src; + + uint64_t v0 = k0 ^ 0x736f6d6570736575ULL; + uint64_t v1 = k1 ^ 0x646f72616e646f6dULL; + uint64_t v2 = k0 ^ 0x6c7967656e657261ULL; + uint64_t v3 = k1 ^ 0x7465646279746573ULL; + + while (src_sz >= 8) { + uint64_t mi = _le64toh(*in); + in += 1; src_sz -= 8; + v3 ^= mi; + DOUBLE_ROUND(v0,v1,v2,v3); + v0 ^= mi; + } + + uint64_t t = 0; uint8_t *pt = (uint8_t *)&t; uint8_t *m = (uint8_t *)in; + switch (src_sz) { + case 7: pt[6] = m[6]; + case 6: pt[5] = m[5]; + case 5: pt[4] = m[4]; + case 4: *((uint32_t*)&pt[0]) = *((uint32_t*)&m[0]); break; + case 3: pt[2] = m[2]; + case 2: pt[1] = m[1]; + case 1: pt[0] = m[0]; + } + b |= _le64toh(t); + + v3 ^= b; + DOUBLE_ROUND(v0,v1,v2,v3); + v0 ^= b; v2 ^= 0xff; + DOUBLE_ROUND(v0,v1,v2,v3); + DOUBLE_ROUND(v0,v1,v2,v3); + return (v0 ^ v1) ^ (v2 ^ v3); +} + diff --git a/ext/standard/string.c b/ext/standard/string.c index 0e299dadc241b..2194a6825aca9 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -27,6 +27,8 @@ #include "php_rand.h" #include "php_string.h" #include "php_variables.h" +#include "md5.h" +#include "xxhash.h" #ifdef HAVE_LOCALE_H # include #endif @@ -5616,129 +5618,91 @@ PHP_FUNCTION(substr_compare) } /* }}} */ +uint64_t php_siphash(const void *src, unsigned long src_sz, const char key[16]); -/* XXX: Just embed here for the time being - https://github.com/majek/csiphash/blob/master/csiphash.c -*/ -/* - Copyright (c) 2013 Marek Majkowski - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - - - Original location: - https://github.com/majek/csiphash/ - - Solution inspired by code from: - Samuel Neves (supercop/crypto_auth/siphash24/little) - djb (supercop/crypto_auth/siphash24/little2) - Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c) -*/ +/* {{{ proto bool str_compare(string str1, string str2) + Timing safe string compare */ +PHP_FUNCTION(str_siphash_compare) +{ + zval *s1, *s2; + char key[16] = {0,1,2,3,4,5,6,7,8,9,0xa,0xb,0xc,0xd,0xe,0xf}; -/* #include */ - -#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ - __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -# define _le64toh(x) ((uint64_t)(x)) -#elif defined(_WIN32) -/* Windows is always little endian, unless you're on xbox360 - http://msdn.microsoft.com/en-us/library/b0084kay(v=vs.80).aspx */ -# define _le64toh(x) ((uint64_t)(x)) -#elif defined(__APPLE__) -# include -# define _le64toh(x) OSSwapLittleToHostInt64(x) -#else + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &s1, &s2) == FAILURE) { + RETURN_FALSE; + } -/* See: http://sourceforge.net/p/predef/wiki/Endianness/ */ -# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -# include -# else -# include -# endif -# if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \ - __BYTE_ORDER == __LITTLE_ENDIAN -# define _le64toh(x) ((uint64_t)(x)) -# else -# define _le64toh(x) le64toh(x) -# endif + if (Z_TYPE_P(s1) != IS_STRING || Z_TYPE_P(s2) != IS_STRING) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Paremeters must be string"); + RETURN_FALSE; + } + if (Z_STRLEN_P(s1) != Z_STRLEN_P(s2)) { + RETURN_FALSE; + } + -#endif + RETURN_BOOL(php_siphash(Z_STRVAL_P(s1), Z_STRLEN_P(s1), key) == php_siphash(Z_STRVAL_P(s2), Z_STRLEN_P(s2), key)); +} +/* }}} */ -#define ROTATE(x, b) (uint64_t)( ((x) << (b)) | ( (x) >> (64 - (b))) ) +/* {{{ proto bool str_compare(string str1, string str2) + Timing safe string compare */ +PHP_FUNCTION(str_xxhash32_compare) +{ + zval *s1, *s2; -#define HALF_ROUND(a,b,c,d,s,t) \ - a += b; c += d; \ - b = ROTATE(b, s) ^ a; \ - d = ROTATE(d, t) ^ c; \ - a = ROTATE(a, 32); + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &s1, &s2) == FAILURE) { + RETURN_FALSE; + } + + if (Z_TYPE_P(s1) != IS_STRING || Z_TYPE_P(s2) != IS_STRING) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Paremeters must be string"); + RETURN_FALSE; + } + if (Z_STRLEN_P(s1) != Z_STRLEN_P(s2)) { + RETURN_FALSE; + } + -#define DOUBLE_ROUND(v0,v1,v2,v3) \ - HALF_ROUND(v0,v1,v2,v3,13,16); \ - HALF_ROUND(v2,v1,v0,v3,17,21); \ - HALF_ROUND(v0,v1,v2,v3,13,16); \ - HALF_ROUND(v2,v1,v0,v3,17,21); + RETURN_BOOL(XXH32(Z_STRVAL_P(s1), Z_STRLEN_P(s1), 12345) == XXH32(Z_STRVAL_P(s2), Z_STRLEN_P(s2), 12345)); +} +/* }}} */ -static uint64_t php_siphash(const void *src, unsigned long src_sz, const char key[16]) { - const uint64_t *_key = (uint64_t *)key; - uint64_t k0 = _le64toh(_key[0]); - uint64_t k1 = _le64toh(_key[1]); - uint64_t b = (uint64_t)src_sz << 56; - const uint64_t *in = (uint64_t*)src; - uint64_t v0 = k0 ^ 0x736f6d6570736575ULL; - uint64_t v1 = k1 ^ 0x646f72616e646f6dULL; - uint64_t v2 = k0 ^ 0x6c7967656e657261ULL; - uint64_t v3 = k1 ^ 0x7465646279746573ULL; +/* {{{ proto bool str_compare(string str1, string str2) + string compare */ +PHP_FUNCTION(str_md5_compare) +{ + zval *s1, *s2; + PHP_MD5_CTX context; + unsigned char d1[16], d2[16]; - while (src_sz >= 8) { - uint64_t mi = _le64toh(*in); - in += 1; src_sz -= 8; - v3 ^= mi; - DOUBLE_ROUND(v0,v1,v2,v3); - v0 ^= mi; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &s1, &s2) == FAILURE) { + RETURN_FALSE; } - uint64_t t = 0; uint8_t *pt = (uint8_t *)&t; uint8_t *m = (uint8_t *)in; - switch (src_sz) { - case 7: pt[6] = m[6]; - case 6: pt[5] = m[5]; - case 5: pt[4] = m[4]; - case 4: *((uint32_t*)&pt[0]) = *((uint32_t*)&m[0]); break; - case 3: pt[2] = m[2]; - case 2: pt[1] = m[1]; - case 1: pt[0] = m[0]; + if (Z_TYPE_P(s1) != IS_STRING || Z_TYPE_P(s2) != IS_STRING) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Paremeters must be string"); + RETURN_FALSE; } - b |= _le64toh(t); - - v3 ^= b; - DOUBLE_ROUND(v0,v1,v2,v3); - v0 ^= b; v2 ^= 0xff; - DOUBLE_ROUND(v0,v1,v2,v3); - DOUBLE_ROUND(v0,v1,v2,v3); - return (v0 ^ v1) ^ (v2 ^ v3); + if (Z_STRLEN_P(s1) != Z_STRLEN_P(s2)) { + RETURN_FALSE; + } + + PHP_MD5Init(&context); + PHP_MD5Update(&context, Z_STRVAL_P(s1), Z_STRLEN_P(s1)); + PHP_MD5Final(d1, &context); + PHP_MD5Init(&context); + PHP_MD5Update(&context, Z_STRVAL_P(s2), Z_STRLEN_P(s2)); + PHP_MD5Final(d2, &context); + + RETURN_BOOL(memcmp(d1, d2, 16) == 0); } -/* END SipHash */ +/* }}} */ /* Timing safe compare */ -PHPAPI int php_compare(const void *b1, const void *b2, size_t n) /* {{{ */ +PHPAPI int php_byte_compare(const void *b1, const void *b2, size_t n) /* {{{ */ { const unsigned char *p1 = b1, *p2 = b2; int ret = 0; @@ -5746,16 +5710,38 @@ PHPAPI int php_compare(const void *b1, const void *b2, size_t n) /* {{{ */ for (; n > 0; n--) { ret |= *p1++ ^ *p2++; } - return (ret != 0); + return (ret == 0); } /* }}} */ /* {{{ proto bool str_compare(string str1, string str2) Timing safe string compare */ +PHP_FUNCTION(str_byte_compare) +{ + zval *s1, *s2; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &s1, &s2) == FAILURE) { + RETURN_FALSE; + } + + if (Z_TYPE_P(s1) != IS_STRING || Z_TYPE_P(s2) != IS_STRING) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Paremeters must be string"); + RETURN_FALSE; + } + if (Z_STRLEN_P(s1) != Z_STRLEN_P(s2)) { + RETURN_FALSE; + } + + + RETURN_BOOL(php_byte_compare(Z_STRVAL_P(s1), Z_STRVAL_P(s2), Z_STRLEN_P(s2))); +} +/* }}} */ + +/* {{{ proto bool str_compare(string str1, string str2) + strncmp string compare */ PHP_FUNCTION(str_compare) { zval *s1, *s2; - char key[16] = {0,1,2,3,4,5,6,7,8,9,0xa,0xb,0xc,0xd,0xe,0xf}; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &s1, &s2) == FAILURE) { RETURN_FALSE; @@ -5770,10 +5756,11 @@ PHP_FUNCTION(str_compare) } - RETURN_BOOL(php_siphash(Z_STRVAL_P(s1), Z_STRLEN_P(s1), key) == php_siphash(Z_STRVAL_P(s2), Z_STRLEN_P(s2), key)); + RETURN_BOOL(strncmp(Z_STRVAL_P(s1), Z_STRVAL_P(s2), Z_STRLEN_P(s2)) == 0); } /* }}} */ + /* * Local variables: * tab-width: 4 diff --git a/ext/standard/xxhash.c b/ext/standard/xxhash.c new file mode 100644 index 0000000000000..aa495b0a13344 --- /dev/null +++ b/ext/standard/xxhash.c @@ -0,0 +1,342 @@ +/* + xxHash - Fast Hash algorithm + Copyright (C) 2012, Yann Collet. + BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + You can contact the author at : + - xxHash source repository : http://code.google.com/p/xxhash/ +*/ + + + +//************************************** +// Tuning parameters +//************************************** +// FORCE_NATIVE_FORMAT : +// By default, xxHash library provides endian-independant Hash values. +// Results are therefore identical for big-endian and little-endian CPU. +// This comes at a performance cost for big-endian CPU, since some swapping is required to emulate little-endian format. +// Should endian-independance be of no importance to your application, you may uncomment the #define below +// It will improve speed for Big-endian CPU. +// This option has no impact on Little_Endian CPU. +//#define FORCE_NATIVE_FORMAT 1 + + + +//************************************** +// Includes +//************************************** +#include // for malloc(), free() +#include // for memcpy() +#include "xxhash.h" + + + +//************************************** +// CPU Feature Detection +//************************************** +// Little Endian or Big Endian ? +// You can overwrite the #define below if you know your architecture endianess +#if defined(FORCE_NATIVE_FORMAT) && (FORCE_NATIVE_FORMAT==1) +// Force native format. The result will be endian dependant. +# define XXH_BIG_ENDIAN 0 +#elif defined (__GLIBC__) +# include +# if (__BYTE_ORDER == __BIG_ENDIAN) +# define XXH_BIG_ENDIAN 1 +# endif +#elif (defined(__BIG_ENDIAN__) || defined(__BIG_ENDIAN) || defined(_BIG_ENDIAN)) && !(defined(__LITTLE_ENDIAN__) || defined(__LITTLE_ENDIAN) || defined(_LITTLE_ENDIAN)) +# define XXH_BIG_ENDIAN 1 +#elif defined(__sparc) || defined(__sparc__) \ + || defined(__ppc__) || defined(_POWER) || defined(__powerpc__) || defined(_ARCH_PPC) || defined(__PPC__) || defined(__PPC) || defined(PPC) || defined(__powerpc__) || defined(__powerpc) || defined(powerpc) \ + || defined(__hpux) || defined(__hppa) \ + || defined(_MIPSEB) || defined(__s390__) +# define XXH_BIG_ENDIAN 1 +#endif + +#if !defined(XXH_BIG_ENDIAN) +// Little Endian assumed. PDP Endian and other very rare endian format are unsupported. +# define XXH_BIG_ENDIAN 0 +#endif + + + +//************************************** +// Compiler-specific Options & Functions +//************************************** +#define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__) + +// Note : under GCC, it may sometimes be faster to enable the (2nd) macro definition, instead of using win32 intrinsic +#if defined(_WIN32) +# define XXH_rotl32(x,r) _rotl(x,r) +#else +# define XXH_rotl32(x,r) ((x << r) | (x >> (32 - r))) +#endif + +#if defined(_MSC_VER) // Visual Studio +# define XXH_swap32 _byteswap_ulong +#elif GCC_VERSION >= 403 +# define XXH_swap32 __builtin_bswap32 +#else +static inline unsigned int XXH_swap32 (unsigned int x) { + return ((x << 24) & 0xff000000 ) | + ((x << 8) & 0x00ff0000 ) | + ((x >> 8) & 0x0000ff00 ) | + ((x >> 24) & 0x000000ff ); + } +#endif + + + +//************************************** +// Constants +//************************************** +#define PRIME32_1 2654435761U +#define PRIME32_2 2246822519U +#define PRIME32_3 3266489917U +#define PRIME32_4 668265263U +#define PRIME32_5 374761393U + + + +//************************************** +// Macros +//************************************** +#define XXH_LE32(p) (XXH_BIG_ENDIAN ? XXH_swap32(*(unsigned int*)(p)) : *(unsigned int*)(p)) + + + +//**************************** +// Simple Hash Functions +//**************************** + +unsigned int XXH32(const void* input, int len, unsigned int seed) +{ +#if 0 + // Simple version, good for code maintenance, but unfortunately slow for small inputs + void* state = XXH32_init(seed); + XXH32_feed(state, input, len); + return XXH32_result(state); +#else + + const unsigned char* p = (const unsigned char*)input; + const unsigned char* const bEnd = p + len; + unsigned int h32; + + if (len>=16) + { + const unsigned char* const limit = bEnd - 16; + unsigned int v1 = seed + PRIME32_1 + PRIME32_2; + unsigned int v2 = seed + PRIME32_2; + unsigned int v3 = seed + 0; + unsigned int v4 = seed - PRIME32_1; + + do + { + v1 += XXH_LE32(p) * PRIME32_2; v1 = XXH_rotl32(v1, 13); v1 *= PRIME32_1; p+=4; + v2 += XXH_LE32(p) * PRIME32_2; v2 = XXH_rotl32(v2, 13); v2 *= PRIME32_1; p+=4; + v3 += XXH_LE32(p) * PRIME32_2; v3 = XXH_rotl32(v3, 13); v3 *= PRIME32_1; p+=4; + v4 += XXH_LE32(p) * PRIME32_2; v4 = XXH_rotl32(v4, 13); v4 *= PRIME32_1; p+=4; + } while (p<=limit) ; + + h32 = XXH_rotl32(v1, 1) + XXH_rotl32(v2, 7) + XXH_rotl32(v3, 12) + XXH_rotl32(v4, 18); + } + else + { + h32 = seed + PRIME32_5; + } + + h32 += (unsigned int) len; + + while (p<=bEnd-4) + { + h32 += XXH_LE32(p) * PRIME32_3; + h32 = XXH_rotl32(h32, 17) * PRIME32_4 ; + p+=4; + } + + while (p> 15; + h32 *= PRIME32_2; + h32 ^= h32 >> 13; + h32 *= PRIME32_3; + h32 ^= h32 >> 16; + + return h32; + +#endif +} + + +//**************************** +// Advanced Hash Functions +//**************************** + +struct XXH_state32_t +{ + unsigned int seed; + unsigned int v1; + unsigned int v2; + unsigned int v3; + unsigned int v4; + unsigned long long total_len; + char memory[16]; + int memsize; +}; + + +void* XXH32_init (unsigned int seed) +{ + struct XXH_state32_t * state = (struct XXH_state32_t *) malloc ( sizeof(struct XXH_state32_t)); + state->seed = seed; + state->v1 = seed + PRIME32_1 + PRIME32_2; + state->v2 = seed + PRIME32_2; + state->v3 = seed + 0; + state->v4 = seed - PRIME32_1; + state->total_len = 0; + state->memsize = 0; + + return (void*)state; +} + + +int XXH32_feed (void* state_in, const void* input, int len) +{ + struct XXH_state32_t * state = state_in; + const unsigned char* p = (const unsigned char*)input; + const unsigned char* const bEnd = p + len; + + state->total_len += len; + + if (state->memsize + len < 16) // fill in tmp buffer + { + memcpy(state->memory + state->memsize, input, len); + state->memsize += len; + return 0; + } + + if (state->memsize) // some data left from previous feed + { + memcpy(state->memory + state->memsize, input, 16-state->memsize); + { + const unsigned int* p32 = (const unsigned int*)state->memory; + state->v1 += XXH_LE32(p32) * PRIME32_2; state->v1 = XXH_rotl32(state->v1, 13); state->v1 *= PRIME32_1; p32++; + state->v2 += XXH_LE32(p32) * PRIME32_2; state->v2 = XXH_rotl32(state->v2, 13); state->v2 *= PRIME32_1; p32++; + state->v3 += XXH_LE32(p32) * PRIME32_2; state->v3 = XXH_rotl32(state->v3, 13); state->v3 *= PRIME32_1; p32++; + state->v4 += XXH_LE32(p32) * PRIME32_2; state->v4 = XXH_rotl32(state->v4, 13); state->v4 *= PRIME32_1; p32++; + } + p += 16-state->memsize; + state->memsize = 0; + } + + { + const unsigned char* const limit = bEnd - 16; + unsigned int v1 = state->v1; + unsigned int v2 = state->v2; + unsigned int v3 = state->v3; + unsigned int v4 = state->v4; + + while (p<=limit) + { + v1 += XXH_LE32(p) * PRIME32_2; v1 = XXH_rotl32(v1, 13); v1 *= PRIME32_1; p+=4; + v2 += XXH_LE32(p) * PRIME32_2; v2 = XXH_rotl32(v2, 13); v2 *= PRIME32_1; p+=4; + v3 += XXH_LE32(p) * PRIME32_2; v3 = XXH_rotl32(v3, 13); v3 *= PRIME32_1; p+=4; + v4 += XXH_LE32(p) * PRIME32_2; v4 = XXH_rotl32(v4, 13); v4 *= PRIME32_1; p+=4; + } + + state->v1 = v1; + state->v2 = v2; + state->v3 = v3; + state->v4 = v4; + } + + if (p < bEnd) + { + memcpy(state->memory, p, bEnd-p); + state->memsize = bEnd-p; + } + + return 0; +} + + +unsigned int XXH32_getIntermediateResult (void* state_in) +{ + struct XXH_state32_t * state = state_in; + unsigned char * p = (unsigned char*)state->memory; + unsigned char* bEnd = (unsigned char*)state->memory + state->memsize; + unsigned int h32; + + + if (state->total_len >= 16) + { + h32 = XXH_rotl32(state->v1, 1) + XXH_rotl32(state->v2, 7) + XXH_rotl32(state->v3, 12) + XXH_rotl32(state->v4, 18); + } + else + { + h32 = state->seed + PRIME32_5; + } + + h32 += (unsigned int) state->total_len; + + while (p<=bEnd-4) + { + h32 += XXH_LE32(p) * PRIME32_3; + h32 = XXH_rotl32(h32, 17) * PRIME32_4 ; + p+=4; + } + + while (p> 15; + h32 *= PRIME32_2; + h32 ^= h32 >> 13; + h32 *= PRIME32_3; + h32 ^= h32 >> 16; + + return h32; +} + + +unsigned int XXH32_result (void* state_in) +{ + unsigned int h32 = XXH32_getIntermediateResult(state_in); + + free(state_in); + + return h32; +} diff --git a/ext/standard/xxhash.h b/ext/standard/xxhash.h new file mode 100644 index 0000000000000..93f40a5e4df6e --- /dev/null +++ b/ext/standard/xxhash.h @@ -0,0 +1,128 @@ +/* + xxHash - Fast Hash algorithm + Header File + Copyright (C) 2012, Yann Collet. + BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php) + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + You can contact the author at : + - xxHash source repository : http://code.google.com/p/xxhash/ +*/ + +/* Notice extracted from xxHash homepage : + +xxHash is an extremely fast Hash algorithm, running at RAM speed limits. +It also successfully passes all tests from the SMHasher suite. + +Comparison (single thread, Windows Seven 32 bits, using SMHasher on a Core 2 Duo @3GHz) + +Name Speed Q.Score Author +xxHash 5.4 GB/s 10 +CrapWow 3.2 GB/s 2 Andrew +MumurHash 3a 2.7 GB/s 10 Austin Appleby +SpookyHash 2.0 GB/s 10 Bob Jenkins +SBox 1.4 GB/s 9 Bret Mulvey +Lookup3 1.2 GB/s 9 Bob Jenkins +SuperFastHash 1.2 GB/s 1 Paul Hsieh +CityHash64 1.05 GB/s 10 Pike & Alakuijala +FNV 0.55 GB/s 5 Fowler, Noll, Vo +CRC32 0.43 GB/s 9 +MD5-32 0.33 GB/s 10 Ronald L. Rivest +SHA1-32 0.28 GB/s 10 + +Q.Score is a measure of quality of the hash function. +It depends on successfully passing SMHasher test set. +10 is a perfect score. +*/ + +#pragma once + +#if defined (__cplusplus) +extern "C" { +#endif + + +//**************************** +// Simple Hash Functions +//**************************** + +unsigned int XXH32 (const void* input, int len, unsigned int seed); + +/* +XXH32() : + Calculate the 32-bits hash of "input", of length "len" + "seed" can be used to alter the result + This function successfully passes all SMHasher tests. + Speed on Core 2 Duo @ 3 GHz (single thread, SMHasher benchmark) : 5.4 GB/s + Note that "len" is type "int", which means it is limited to 2^31-1. + If your data is larger, use the advanced functions below. +*/ + + + +//**************************** +// Advanced Hash Functions +//**************************** + +void* XXH32_init (unsigned int seed); +int XXH32_feed (void* state, const void* input, int len); +unsigned int XXH32_result (void* state); + +/* +These functions calculate the xxhash of an input provided in several small packets, +as opposed to an input provided as a single block. + +You must start with : +void* XXH32_init() +The function returns a pointer which holds the state of calculation. + +This pointer must be provided as "void* state" parameter for XXH32_feed(). +XXH32_feed() can be called as many times as necessary. +The function returns an error code, with 0 meaning OK, and all other values meaning there is an error. +Note that "len" is type "int", which means it is limited to 2^31-1. +If your data is larger, it is recommended +to chunk your data into blocks of size 2^30 (1GB) to avoid any "int" overflow issue. + +Finally, you can end the calculation anytime, by using XXH32_result(). +This function returns the final 32-bits hash. +You must provide the same "void* state" parameter created by XXH32_init(). + +Memory will be freed by XXH32_result(). +*/ + + +unsigned int XXH32_getIntermediateResult (void* state); +/* +This function does the same as XXH32_result(), generating a 32-bit hash, +but preserve memory context. +This way, it becomes possible to generate intermediate hashes, and then continue feeding data with XXH32_feed(). +To free memory context, use XXH32_result(). +*/ + + + +#if defined (__cplusplus) +} +#endif From e0cc716204c2aefdbd1d44b1e303a948b57dabf8 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Fri, 7 Feb 2014 10:30:09 +0900 Subject: [PATCH 3/5] Add php_byte_compare2() which uses https://github.com/realityking/php-src/compare/timing_attack algorithm --- ext/standard/basic_functions.c | 1 + ext/standard/config.m4 | 2 +- ext/standard/php_string.h | 1 + ext/standard/string.c | 39 ++++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 67fc65d9997a3..63ac78e36b634 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -2782,6 +2782,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FE(str_xxhash32_compare, arginfo_str_compare) PHP_FE(str_md5_compare, arginfo_str_compare) PHP_FE(str_byte_compare, arginfo_str_compare) + PHP_FE(str_byte_compare2, arginfo_str_compare) PHP_FE(str_compare, arginfo_str_compare) #ifdef HAVE_STRCOLL diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 3d00d88dda151..92d4f2eee2a1b 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -603,7 +603,7 @@ PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32. incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ - filters.c proc_open.c streamsfuncs.c http.c password.c) + filters.c proc_open.c streamsfuncs.c http.c password.c xxhash.c siphash.c) PHP_ADD_MAKEFILE_FRAGMENT PHP_INSTALL_HEADERS([ext/standard/]) diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h index 463dca5266e22..ef687602353e5 100644 --- a/ext/standard/php_string.h +++ b/ext/standard/php_string.h @@ -97,6 +97,7 @@ PHP_FUNCTION(str_siphash_compare); PHP_FUNCTION(str_xxhash32_compare); PHP_FUNCTION(str_md5_compare); PHP_FUNCTION(str_byte_compare); +PHP_FUNCTION(str_byte_compare2); PHP_FUNCTION(str_compare); #ifdef HAVE_STRCOLL PHP_FUNCTION(strcoll); diff --git a/ext/standard/string.c b/ext/standard/string.c index 2194a6825aca9..962842f57530b 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -5714,6 +5714,7 @@ PHPAPI int php_byte_compare(const void *b1, const void *b2, size_t n) /* {{{ */ } /* }}} */ + /* {{{ proto bool str_compare(string str1, string str2) Timing safe string compare */ PHP_FUNCTION(str_byte_compare) @@ -5737,6 +5738,44 @@ PHP_FUNCTION(str_byte_compare) } /* }}} */ + +/* Timing safe compare */ + PHPAPI int php_byte_compare2(const void *b1, size_t b1_len, const void *b2, size_t b2_len) /* {{{ */ +{ + const unsigned char *p1 = b1, *p2 = b2; + int ret = b1_len - b2_len; + int mod_len = MAX(b1_len, 1); + int n; + + for (n = 0; n < b2_len ; n++) { + ret |= p1[n % mod_len] ^ p2[n]; + } + return (ret == 0); +} +/* }}} */ + +/* {{{ proto bool str_compare2(string str1, string str2) + Timing safe string compare */ +PHP_FUNCTION(str_byte_compare2) +{ + zval *s1, *s2; + size_t mod_len; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &s1, &s2) == FAILURE) { + RETURN_FALSE; + } + + if (Z_TYPE_P(s1) != IS_STRING || Z_TYPE_P(s2) != IS_STRING) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Paremeters must be string"); + RETURN_FALSE; + } + + RETURN_BOOL(php_byte_compare2(Z_STRVAL_P(s1), Z_STRLEN_P(s1), + Z_STRVAL_P(s2), Z_STRLEN_P(s2))); +} +/* }}} */ + + /* {{{ proto bool str_compare(string str1, string str2) strncmp string compare */ PHP_FUNCTION(str_compare) From 302a53db87c93b469fb85041e8c505207e3a6d9c Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Mon, 10 Feb 2014 09:15:34 +0900 Subject: [PATCH 4/5] Add timing safe comparison, compares chars by word size. It could be faster than simple byte by byte comparison --- ext/standard/basic_functions.c | 11 ++++---- ext/standard/php_string.h | 1 + ext/standard/string.c | 46 ++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 63ac78e36b634..b744f0077b548 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -2778,11 +2778,12 @@ const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FE(str_split, arginfo_str_split) PHP_FE(strpbrk, arginfo_strpbrk) PHP_FE(substr_compare, arginfo_substr_compare) - PHP_FE(str_siphash_compare, arginfo_str_compare) - PHP_FE(str_xxhash32_compare, arginfo_str_compare) - PHP_FE(str_md5_compare, arginfo_str_compare) - PHP_FE(str_byte_compare, arginfo_str_compare) - PHP_FE(str_byte_compare2, arginfo_str_compare) + PHP_FE(str_siphash_compare, arginfo_str_compare) + PHP_FE(str_xxhash32_compare, arginfo_str_compare) + PHP_FE(str_md5_compare, arginfo_str_compare) + PHP_FE(str_byte_compare, arginfo_str_compare) + PHP_FE(str_byte_compare2, arginfo_str_compare) + PHP_FE(str_word_compare, arginfo_str_compare) PHP_FE(str_compare, arginfo_str_compare) #ifdef HAVE_STRCOLL diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h index ef687602353e5..1ee5dc3120de4 100644 --- a/ext/standard/php_string.h +++ b/ext/standard/php_string.h @@ -98,6 +98,7 @@ PHP_FUNCTION(str_xxhash32_compare); PHP_FUNCTION(str_md5_compare); PHP_FUNCTION(str_byte_compare); PHP_FUNCTION(str_byte_compare2); +PHP_FUNCTION(str_word_compare); PHP_FUNCTION(str_compare); #ifdef HAVE_STRCOLL PHP_FUNCTION(strcoll); diff --git a/ext/standard/string.c b/ext/standard/string.c index 962842f57530b..b7e76550f6260 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -5754,6 +5754,7 @@ PHP_FUNCTION(str_byte_compare) } /* }}} */ + /* {{{ proto bool str_compare2(string str1, string str2) Timing safe string compare */ PHP_FUNCTION(str_byte_compare2) @@ -5776,6 +5777,51 @@ PHP_FUNCTION(str_byte_compare2) /* }}} */ +/* Timing safe compare */ + PHPAPI int php_word_compare(const void *b1, size_t b1_len, const void *b2, size_t b2_len) /* {{{ */ +{ + const unsigned char *p1 = b1, *p2 = b2; + long ret = b1_len - b2_len; + int mod_len = MAX(b1_len, 1); + int min_len = MIN(b1_len, b2_len); + int n, sz=sizeof(long); + + /* Optimize by using word size comparison */ + for (n = 0; n+sz < min_len ; n += sz) { + ret |= (long)p1 ^ (long)p2; + } + /* Comparet the rest, byte by byte */ + for (; n < b2_len ; n++) { + ret |= p1[n % mod_len] ^ p2[n]; + } + return (ret == 0); +} +/* }}} */ + + +/* {{{ proto bool str_word_compare(string str1, string str2) + Timing safe string compare. Word size optimized. */ +PHP_FUNCTION(str_word_compare) +{ + zval *s1, *s2; + size_t mod_len; + long buf; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &s1, &s2) == FAILURE) { + RETURN_FALSE; + } + + if (Z_TYPE_P(s1) != IS_STRING || Z_TYPE_P(s2) != IS_STRING) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Paremeters must be string"); + RETURN_FALSE; + } + + RETURN_BOOL(php_word_compare(Z_STRVAL_P(s1), Z_STRLEN_P(s1), + Z_STRVAL_P(s2), Z_STRLEN_P(s2))); +} +/* }}} */ + + /* {{{ proto bool str_compare(string str1, string str2) strncmp string compare */ PHP_FUNCTION(str_compare) From 6d70c375b06a8c9f79eaa7edb912c2be8e1d8e57 Mon Sep 17 00:00:00 2001 From: Yasuo Ohgaki Date: Tue, 11 Feb 2014 05:01:22 +0900 Subject: [PATCH 5/5] A little optimization --- ext/standard/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/standard/string.c b/ext/standard/string.c index b7e76550f6260..5aab1fd43f9ba 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -5784,10 +5784,10 @@ PHP_FUNCTION(str_byte_compare2) long ret = b1_len - b2_len; int mod_len = MAX(b1_len, 1); int min_len = MIN(b1_len, b2_len); - int n, sz=sizeof(long); + int n = 0; /* Optimize by using word size comparison */ - for (n = 0; n+sz < min_len ; n += sz) { + for (; n+sizeof(long) < min_len ; n += sizeof(long)) { ret |= (long)p1 ^ (long)p2; } /* Comparet the rest, byte by byte */