From 04320d2fba9a1ea2fb51779d5d6b8b8098417b3f Mon Sep 17 00:00:00 2001 From: Gina Peter Bnayard Date: Thu, 15 Aug 2024 01:02:33 +0200 Subject: [PATCH] ext/phar: Use standard C types --- ext/phar/phar_object.c | 2 +- ext/phar/util.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 9d16512ec5d..688e3981e67 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -3036,7 +3036,7 @@ PHP_METHOD(Phar, setSignatureAlgorithm) zend_throw_exception_ex(phar_ce_PharException, 0, "phar \"%s\" is persistent, unable to copy on write", phar_obj->archive->fname); RETURN_THROWS(); } - phar_obj->archive->sig_flags = (php_uint32)algo; + phar_obj->archive->sig_flags = (uint32_t)algo; phar_obj->archive->is_modified = 1; PHAR_G(openssl_privatekey) = key; PHAR_G(openssl_privatekey_len) = key_len; diff --git a/ext/phar/util.c b/ext/phar/util.c index aed95e635dd..d5a574cfd2c 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -34,7 +34,7 @@ #include #include #else -static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, size_t key_len, char **signature, size_t *signature_len, php_uint32 sig_type); +static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, size_t key_len, char **signature, size_t *signature_len, uint32_t sig_type); #endif /* for links to relative location, prepend cwd of the entry */ @@ -1382,7 +1382,7 @@ static int phar_hex_str(const char *digest, size_t digest_len, char **signature) /* }}} */ #ifndef PHAR_HAVE_OPENSSL -static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, size_t key_len, char **signature, size_t *signature_len, php_uint32 sig_type) /* {{{ */ +static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, size_t key_len, char **signature, size_t *signature_len, uint32_t sig_type) /* {{{ */ { zend_fcall_info fci; zend_fcall_info_cache fcc;