com php-src: Implement password_needs_rehash() functi on: ext/standard/basic_functions.c ext/standard/passw ord.c ext/standard/php_password.h
| From: | Anthony Ferrara | Date: | Thu, 05 Jul 2012 20:22:49 +0000 |
| Subject: | com php-src: Implement password_needs_rehash() functi on: ext/standard/basic_functions.c ext/standard/passw ord.c ext/standard/php_password.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70373@lists.php.net to get a copy of this message | ||
Commit: 5160dc11cd9d0e97eb59138f4639e5af0584f370
Author: Anthony Ferrara <ircmaxell@gmail.com> Thu, 5 Jul 2012 16:22:49 -0400
Parents: 886527de56ecdd412a80a2901b8a0e3b622f037c
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5160dc11cd9d0e97eb59138f4639e5af0584f370
Log:
Implement password_needs_rehash() function
Changed paths:
M ext/standard/basic_functions.c
M ext/standard/password.c
M ext/standard/php_password.h
Diff:
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 9e35a5e..bf6f9b0 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1872,6 +1872,11 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_password_hash, 0, 0, 1)
ZEND_ARG_INFO(0, algo)
ZEND_ARG_INFO(0, options)
ZEND_END_ARG_INFO()
+ZEND_BEGIN_ARG_INFO_EX(arginfo_password_needs_rehash, 0, 0, 1)
+ ZEND_ARG_INFO(0, hash)
+ ZEND_ARG_INFO(0, algo)
+ ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_password_verify, 0, 0, 2)
ZEND_ARG_INFO(0, password)
ZEND_ARG_INFO(0, hash)
@@ -2896,6 +2901,7 @@ const zend_function_entry basic_functions[] = { /* {{{ */
PHP_FE(base64_encode, arginfo_base64_encode)
PHP_FE(password_hash, arginfo_password_hash)
+ PHP_FE(password_needs_rehash, arginfo_password_needs_rehash)
PHP_FE(password_verify, arginfo_password_verify)
PHP_FE(password_make_salt, arginfo_password_make_salt)
diff --git a/ext/standard/password.c b/ext/standard/password.c
index eb4abd2..9bfb023 100644
--- a/ext/standard/password.c
+++ b/ext/standard/password.c
@@ -43,6 +43,18 @@ PHP_MINIT_FUNCTION(password) /* {{{ */
}
/* }}} */
+static long php_password_determine_algo(const char *hash, const int len)
+{
+ if (len < 3) {
+ return 0;
+ }
+ if (hash[0] == '$' && hash[1] == '2' && hash[2] ==
'y' && len == 60) {
+ return PHP_PASSWORD_BCRYPT;
+ }
+
+ return 0;
+}
+
static int php_password_salt_is_alphabet(const char *str, const int len) /* {{{ */
{
int i = 0;
@@ -149,6 +161,44 @@ static int php_password_make_salt(long length, int raw, char *ret TSRMLS_DC) /*
}
/* }}} */
+PHP_FUNCTION(password_needs_rehash)
+{
+ long new_algo = 0, algo = 0;
+ int hash_len;
+ char *hash;
+ HashTable *options = 0;
+ zval **option_buffer;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|H", &hash, &hash_len,
&new_algo, &options) == FAILURE) {
+ RETURN_NULL();
+ }
+ algo = php_password_determine_algo(hash, hash_len);
+
+ if (algo != new_algo) {
+ RETURN_TRUE;
+ }
+
+ switch (algo) {
+ case PHP_PASSWORD_BCRYPT:
+ {
+ int newCost = PHP_PASSWORD_BCRYPT_COST, cost = 0;
+
+ if (options && zend_symtable_find(options, "cost", 5, (void **)
&option_buffer) == SUCCESS) {
+ convert_to_long_ex(option_buffer);
+ newCost = Z_LVAL_PP(option_buffer);
+ zval_ptr_dtor(option_buffer);
+ }
+
+ sscanf(hash, "$2y$%d$", &cost);
+ if (cost != newCost) {
+ RETURN_TRUE;
+ }
+ }
+ break;
+ }
+ RETURN_FALSE;
+}
+
/* {{{ proto boolean password_make_salt(string password, string hash)
Verify a hash created using crypt() or password_hash() */
PHP_FUNCTION(password_verify)
diff --git a/ext/standard/php_password.h b/ext/standard/php_password.h
index 57c6b88..45e6849 100644
--- a/ext/standard/php_password.h
+++ b/ext/standard/php_password.h
@@ -24,6 +24,7 @@
PHP_FUNCTION(password_hash);
PHP_FUNCTION(password_verify);
PHP_FUNCTION(password_make_salt);
+PHP_FUNCTION(password_needs_rehash);
PHP_MINIT_FUNCTION(password);