Skip to content

Commit b411ac9

Browse files
committed
keep old constants and create CRYPT_PREFIX_ new ones
1 parent 0f4afbb commit b411ac9

File tree

3 files changed

+38
-20
lines changed

3 files changed

+38
-20
lines changed

ext/standard/basic_functions.stub.php

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -383,24 +383,36 @@
383383
* @cvalue PHP_MAX_SALT_LEN
384384
*/
385385
const CRYPT_SALT_LENGTH = UNKNOWN;
386+
/** @var int */
387+
const CRYPT_STD_DES = 1;
388+
/** @var int */
389+
const CRYPT_EXT_DES = 1;
390+
/** @var int */
391+
const CRYPT_MD5 = 1;
392+
/** @var int */
393+
const CRYPT_BLOWFISH = 1;
394+
/** @var int */
395+
const CRYPT_SHA256 = 1;
396+
/** @var int */
397+
const CRYPT_SHA512 = 1;
386398
/** @var string */
387-
const CRYPT_STD_DES = '';
399+
const CRYPT_PREFIX_STD_DES = '';
388400
/** @var string */
389-
const CRYPT_EXT_DES = '_';
401+
const CRYPT_PREFIX_EXT_DES = '_';
390402
/** @var string */
391-
const CRYPT_MD5 = '$1$';
403+
const CRYPT_PREFIX_MD5 = '$1$';
392404
/** @var string */
393-
const CRYPT_BLOWFISH = '$2y$';
405+
const CRYPT_PREFIX_BLOWFISH = '$2y$';
394406
/** @var string */
395-
const CRYPT_SHA256 = '$5$';
407+
const CRYPT_PREFIX_SHA256 = '$5$';
396408
/** @var string */
397-
const CRYPT_SHA512 = '$6$';
409+
const CRYPT_PREFIX_SHA512 = '$6$';
398410
/** @var string */
399-
const CRYPT_SCRYPT = '$7$';
411+
const CRYPT_PREFIX_SCRYPT = '$7$';
400412
/** @var string */
401-
const CRYPT_GOST_YESCRYPT = '$gy$';
413+
const CRYPT_PREFIX_GOST_YESCRYPT = '$gy$';
402414
/** @var string */
403-
const CRYPT_YESCRYPT = '$y$';
415+
const CRYPT_PREFIX_YESCRYPT = '$y$';
404416
/**
405417
* @var int
406418
* @cvalue CRYPT_SALT_OK

ext/standard/basic_functions_arginfo.h

Lines changed: 16 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ext/standard/tests/crypt/password_compat.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ $h = password_hash($secret, PASSWORD_BCRYPT);
99
var_dump($h, password_verify($secret, $h), $h===crypt($secret, $h));
1010

1111
/* generate with crypt, check with both */
12-
$h = crypt($secret, crypt_gensalt(CRYPT_BLOWFISH));
12+
$h = crypt($secret, crypt_gensalt(CRYPT_PREFIX_BLOWFISH));
1313
var_dump($h, password_verify($secret, $h), $h===crypt($secret, $h));
1414
?>
1515
--EXPECTF--

0 commit comments

Comments
 (0)