Skip to content

Commit 756ae17

Browse files
committed
use php_base64_encode_ex
1 parent 6ad6bb6 commit 756ae17

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

ext/openssl/openssl_pwhash.c

+3-11
Original file line numberDiff line numberDiff line change
@@ -162,17 +162,9 @@ static zend_string *php_openssl_argon2_hash(const zend_string *password, zend_ar
162162
return NULL;
163163
}
164164

165-
hash64 = php_base64_encode(hash, HASH_SIZE);
166-
/* No padding utsing 32 *4 / 3 = 42.6 (43 + 1 padding char) */
167-
ZEND_ASSERT(ZSTR_LEN(hash64)==44 && ZSTR_VAL(hash64)[43]=='=');
168-
ZSTR_VAL(hash64)[43] = 0;
169-
ZSTR_LEN(hash64) = 43;
170-
171-
salt64 = php_base64_encode(salt, SALT_SIZE);
172-
/* No padding using 16 *4 / 3 = 21.3 (22 + 2 padding char) */
173-
ZEND_ASSERT(ZSTR_LEN(salt64)==24 && ZSTR_VAL(salt64)[22]=='=' && ZSTR_VAL(salt64)[23]=='=');
174-
ZSTR_VAL(salt64)[22] = 0;
175-
ZSTR_LEN(salt64) = 22;
165+
hash64 = php_base64_encode_ex(hash, HASH_SIZE, PHP_BASE64_NO_PADDING);
166+
167+
salt64 = php_base64_encode_ex(salt, SALT_SIZE, PHP_BASE64_NO_PADDING);
176168

177169
digest = zend_string_alloc(DIGEST_SIZE, 0);
178170
ZSTR_LEN(digest) = snprintf(ZSTR_VAL(digest), ZSTR_LEN(digest), "$%s$v=%d$m=%u,t=%u,p=%u$%s$%s",

0 commit comments

Comments
 (0)