Skip to content

Commit 89a25b0

Browse files
kocsismatekocsismate
committed
Apply suggestions
1 parent 930c759 commit 89a25b0

File tree

4 files changed

+19
-24
lines changed

4 files changed

+19
-24
lines changed

‎ext/hash/hash.stub.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ function hash_file(string $algorithm, string $filename, bool $binary_output = fa
88

99
function hash_hmac(string $algorithm, string $data, string $key, bool $binary_output = false): string|false {}
1010

11-
function hash_hmac_file(string $algorithm, string $data, string $shared_secret_key, bool $binary_output = false): string|false {}
11+
function hash_hmac_file(string $algorithm, string $data, string $key, bool $binary_output = false): string|false {}
1212

13-
function hash_init(string $algorithm, int $options = 0, string $shared_secret_key = ""): HashContext {}
13+
function hash_init(string $algorithm, int $options = 0, string $key = ""): HashContext {}
1414

1515
function hash_update(HashContext $context, string $data): bool {}
1616

@@ -32,18 +32,18 @@ function hash_pbkdf2(string $algorithm, string $password, string $salt, int $ite
3232

3333
function hash_equals(string $known_string, string $user_string): bool {}
3434

35-
function hash_hkdf(string $algorithm, string $input_key_material, int $length = 0, string $info = "", string $salt = ""): string {}
35+
function hash_hkdf(string $algorithm, string $key, int $length = 0, string $info = "", string $salt = ""): string {}
3636

3737
#ifdef PHP_MHASH_BC
38-
function mhash_get_block_size(int $hash): int|false {}
38+
function mhash_get_block_size(int $algorithm): int|false {}
3939

40-
function mhash_get_hash_name(int $hash): string|false {}
40+
function mhash_get_hash_name(int $algorithm): string|false {}
4141

42-
function mhash_keygen_s2k(int $hash, string $input_password, string $salt, int $bytes): string|false {}
42+
function mhash_keygen_s2k(int $algorithm, string $password, string $salt, int $bytes): string|false {}
4343

4444
function mhash_count(): int {}
4545

46-
function mhash(int $hash, string $data, ?string $key = null): string|false {}
46+
function mhash(int $algorithm, string $data, ?string $key = null): string|false {}
4747
#endif
4848

4949
final class HashContext

‎ext/hash/hash_arginfo.h

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 049e0236e726e23141f2c6dae823163418fa4802 */
2+
* Stub hash: fa9f8e9c190a8f572a0241877ddb07ccf022fd56 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_hash, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
55
ZEND_ARG_TYPE_INFO(0, algorithm, IS_STRING, 0)
@@ -20,17 +20,12 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_hash_hmac, 0, 3, MAY_BE_STRING|M
2020
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, binary_output, _IS_BOOL, 0, "false")
2121
ZEND_END_ARG_INFO()
2222

23-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_hash_hmac_file, 0, 3, MAY_BE_STRING|MAY_BE_FALSE)
24-
ZEND_ARG_TYPE_INFO(0, algorithm, IS_STRING, 0)
25-
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
26-
ZEND_ARG_TYPE_INFO(0, shared_secret_key, IS_STRING, 0)
27-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, binary_output, _IS_BOOL, 0, "false")
28-
ZEND_END_ARG_INFO()
23+
#define arginfo_hash_hmac_file arginfo_hash_hmac
2924

3025
ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_hash_init, 0, 1, HashContext, 0)
3126
ZEND_ARG_TYPE_INFO(0, algorithm, IS_STRING, 0)
3227
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_LONG, 0, "0")
33-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, shared_secret_key, IS_STRING, 0, "\"\"")
28+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, key, IS_STRING, 0, "\"\"")
3429
ZEND_END_ARG_INFO()
3530

3631
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_hash_update, 0, 2, _IS_BOOL, 0)
@@ -80,28 +75,28 @@ ZEND_END_ARG_INFO()
8075

8176
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_hash_hkdf, 0, 2, IS_STRING, 0)
8277
ZEND_ARG_TYPE_INFO(0, algorithm, IS_STRING, 0)
83-
ZEND_ARG_TYPE_INFO(0, input_key_material, IS_STRING, 0)
78+
ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 0)
8479
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 0, "0")
8580
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, info, IS_STRING, 0, "\"\"")
8681
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, salt, IS_STRING, 0, "\"\"")
8782
ZEND_END_ARG_INFO()
8883

8984
#if defined(PHP_MHASH_BC)
9085
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mhash_get_block_size, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
91-
ZEND_ARG_TYPE_INFO(0, hash, IS_LONG, 0)
86+
ZEND_ARG_TYPE_INFO(0, algorithm, IS_LONG, 0)
9287
ZEND_END_ARG_INFO()
9388
#endif
9489

9590
#if defined(PHP_MHASH_BC)
9691
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mhash_get_hash_name, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
97-
ZEND_ARG_TYPE_INFO(0, hash, IS_LONG, 0)
92+
ZEND_ARG_TYPE_INFO(0, algorithm, IS_LONG, 0)
9893
ZEND_END_ARG_INFO()
9994
#endif
10095

10196
#if defined(PHP_MHASH_BC)
10297
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mhash_keygen_s2k, 0, 4, MAY_BE_STRING|MAY_BE_FALSE)
103-
ZEND_ARG_TYPE_INFO(0, hash, IS_LONG, 0)
104-
ZEND_ARG_TYPE_INFO(0, input_password, IS_STRING, 0)
98+
ZEND_ARG_TYPE_INFO(0, algorithm, IS_LONG, 0)
99+
ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0)
105100
ZEND_ARG_TYPE_INFO(0, salt, IS_STRING, 0)
106101
ZEND_ARG_TYPE_INFO(0, bytes, IS_LONG, 0)
107102
ZEND_END_ARG_INFO()
@@ -114,7 +109,7 @@ ZEND_END_ARG_INFO()
114109

115110
#if defined(PHP_MHASH_BC)
116111
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mhash, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
117-
ZEND_ARG_TYPE_INFO(0, hash, IS_LONG, 0)
112+
ZEND_ARG_TYPE_INFO(0, algorithm, IS_LONG, 0)
118113
ZEND_ARG_TYPE_INFO(0, data, IS_STRING, 0)
119114
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, key, IS_STRING, 1, "null")
120115
ZEND_END_ARG_INFO()

‎ext/hash/tests/hash_hkdf_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ trycatch_dump(
6161
[ValueError] hash_hkdf(): Argument #1 ($algorithm) must be a valid cryptographic hashing algorithm
6262

6363
-- Testing hash_hkdf() function with invalid parameters --
64-
[ValueError] hash_hkdf(): Argument #2 ($input_key_material) cannot be empty
64+
[ValueError] hash_hkdf(): Argument #2 ($key) cannot be empty
6565
[ValueError] hash_hkdf(): Argument #3 ($length) must be greater than or equal to 0
6666
[ValueError] hash_hkdf(): Argument #3 ($length) must be less than or equal to 5100

‎ext/hash/tests/hash_init_error.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@ hash_init(): Argument #1 ($algorithm) must be a valid hashing algorithm
4747
hash_init(): Argument #1 ($algorithm) must be a cryptographic hashing algorithm if HMAC is requested
4848

4949
-- Testing hash_init() function with HASH_HMAC and no key --
50-
hash_init(): Argument #3 ($shared_secret_key) cannot be empty when HMAC is requested
51-
hash_init(): Argument #3 ($shared_secret_key) cannot be empty when HMAC is requested
50+
hash_init(): Argument #3 ($key) cannot be empty when HMAC is requested
51+
hash_init(): Argument #3 ($key) cannot be empty when HMAC is requested

0 commit comments

Comments
 (0)