archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Some more refactoring, make algo no longer optional

Browse source
This commit is contained in:
Anthony Ferrara 2012-07-03 08:24:31 -04:00
parent 6cc3c65fbf
commit 6943f2ab7f
5 changed files with 43 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/standard/basic_functions.c
View file

@ -3846,7 +3846,6 @@ PHP_MINFO_FUNCTION(basic) /* {{{ */
php_info_print_table_start(); php_info_print_table_start();
BASIC_MINFO_SUBMODULE(dl) BASIC_MINFO_SUBMODULE(dl)
BASIC_MINFO_SUBMODULE(mail) BASIC_MINFO_SUBMODULE(mail)
BASIC_MINFO_SUBMODULE(password)
php_info_print_table_end(); php_info_print_table_end();
BASIC_MINFO_SUBMODULE(assert) BASIC_MINFO_SUBMODULE(assert)
} }

59
ext/standard/password.c
View file

@ -37,8 +37,8 @@
PHP_MINIT_FUNCTION(password) /* {{{ */ PHP_MINIT_FUNCTION(password) /* {{{ */
{ {
REGISTER_STRING_CONSTANT("PASSWORD_DEFAULT", PHP_PASSWORD_DEFAULT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("PASSWORD_DEFAULT", PHP_PASSWORD_DEFAULT, CONST_CS | CONST_PERSISTENT);
REGISTER_STRING_CONSTANT("PASSWORD_BCRYPT", PHP_PASSWORD_BCRYPT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("PASSWORD_BCRYPT", PHP_PASSWORD_BCRYPT, CONST_CS | CONST_PERSISTENT);
return SUCCESS; return SUCCESS;
} }
/* }}} */ /* }}} */
@ -211,45 +211,44 @@ PHP_FUNCTION(password_make_salt)
} }
/* }}} */ /* }}} */
/* {{{ proto string password_hash(string password, string algo = PASSWORD_DEFAULT, array options = array()) /* {{{ proto string password_hash(string password, string algo, array options = array())
Hash a password */ Hash a password */
PHP_FUNCTION(password_hash) PHP_FUNCTION(password_hash)
{ {
char *algo = 0, *hash_format, *hash, *salt, *password, *result; char *hash_format, *hash, *salt, *password, *result;
int algo_len = 0, salt_len = 0, required_salt_len = 0, hash_format_len, password_len; int algo = 0, salt_len = 0, required_salt_len = 0, hash_format_len, password_len;
HashTable *options = 0; HashTable *options = 0;
zval **option_buffer; zval **option_buffer;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|sH", &password, &password_len, &algo, &algo_len, &options) == FAILURE) { if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|H", &password, &password_len, &algo, &options) == FAILURE) {
RETURN_NULL(); RETURN_NULL();
} }
if (algo_len == 0) { switch (algo) {
algo = PHP_PASSWORD_DEFAULT; case PHP_PASSWORD_BCRYPT:
algo_len = strlen(PHP_PASSWORD_DEFAULT); {
} int cost = PHP_PASSWORD_BCRYPT_COST;
if (strcmp(algo, PHP_PASSWORD_BCRYPT) == 0) { if (options && zend_symtable_find(options, "cost", 5, (void **) &option_buffer) == SUCCESS) {
int cost = PHP_PASSWORD_BCRYPT_COST; convert_to_long_ex(option_buffer);
cost = Z_LVAL_PP(option_buffer);
if (options && zend_symtable_find(options, "cost", 5, (void **) &option_buffer) == SUCCESS) { zval_ptr_dtor(option_buffer);
convert_to_long_ex(option_buffer); }
cost = Z_LVAL_PP(option_buffer);
zval_ptr_dtor(option_buffer); if (cost < 4 || cost > 31) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid bcrypt cost parameter specified: %d", cost);
RETURN_NULL();
}
required_salt_len = 22;
hash_format = emalloc(8);
sprintf(hash_format, "$2y$%02d$", cost);
hash_format_len = 7;
} }
break;
if (cost < 4 || cost > 31) { default:
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid bcrypt cost parameter specified: %d", cost); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown password hashing algorithm: %d", algo);
RETURN_NULL(); RETURN_NULL();
}
required_salt_len = 22;
hash_format = emalloc(8);
sprintf(hash_format, "$2y$%02d$", cost);
hash_format_len = 7;
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown password hashing algorithm: %s", algo);
RETURN_NULL();
} }
if (options && zend_symtable_find(options, "salt", 5, (void**) &option_buffer) == SUCCESS) { if (options && zend_symtable_find(options, "salt", 5, (void**) &option_buffer) == SUCCESS) {

4
ext/standard/php_password.h
View file

@ -27,8 +27,8 @@ PHP_FUNCTION(password_make_salt);
PHP_MINIT_FUNCTION(password); PHP_MINIT_FUNCTION(password);
#define PHP_PASSWORD_DEFAULT "2y" #define PHP_PASSWORD_DEFAULT 1
#define PHP_PASSWORD_BCRYPT "2y" #define PHP_PASSWORD_BCRYPT 1
#define PHP_PASSWORD_BCRYPT_COST 10 #define PHP_PASSWORD_BCRYPT_COST 10

4
ext/standard/tests/password/password_hash.phpt
View file

@ -4,9 +4,9 @@ Test normal operation of password_hash()
<?php <?php
//-=-=-=- //-=-=-=-
var_dump(strlen(password_hash("foo"))); var_dump(strlen(password_hash("foo", PASSWORD_BCRYPT)));
$hash = password_hash("foo"); $hash = password_hash("foo", PASSWORD_BCRYPT);
var_dump($hash == crypt("foo", $hash)); var_dump($hash == crypt("foo", $hash));

15
ext/standard/tests/password/password_hash_error.phpt
View file

@ -6,11 +6,13 @@ Test error operation of password_hash()
var_dump(password_hash()); var_dump(password_hash());
var_dump(password_hash("foo"));
var_dump(password_hash("foo", array())); var_dump(password_hash("foo", array()));
var_dump(password_hash("foo", "bar", new StdClass)); var_dump(password_hash("foo", 19, new StdClass));
var_dump(password_hash("foo", "bar", "baz")); var_dump(password_hash("foo", PASSWORD_BCRYPT, "baz"));
var_dump(password_hash(array(), PASSWORD_BCRYPT)); var_dump(password_hash(array(), PASSWORD_BCRYPT));
@ -18,13 +20,16 @@ var_dump(password_hash("123", PASSWORD_BCRYPT, array("salt" => array())));
?> ?>
--EXPECTF-- --EXPECTF--
Warning: password_hash() expects at least 1 parameter, 0 given in %s on line %d Warning: password_hash() expects at least 2 parameters, 0 given in %s on line %d
NULL NULL
Warning: password_hash() expects parameter 2 to be string, array given in %s on line %d Warning: password_hash() expects at least 2 parameters, 1 given in %s on line %d
NULL NULL
Warning: password_hash(): Unknown password hashing algorithm: bar in %s on line %d Warning: password_hash() expects parameter 2 to be long, array given in %s on line %d
NULL
Warning: password_hash(): Unknown password hashing algorithm: 19 in %s on line %d
NULL NULL
Warning: password_hash() expects parameter 3 to be array, string given in %s on line %d Warning: password_hash() expects parameter 3 to be array, string given in %s on line %d