ext/openssl: Use zend_result return type instead of int where applica…

…ble (#17721)
php · Feb 6, 2025 · 78714d0 · 78714d0
1 parent d662ab5
commit 78714d0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/ext/openssl/openssl_backend_common.c b/ext/openssl/openssl_backend_common.c
@@ -419,7 +419,7 @@ void php_openssl_dispose_config(struct php_x509_request * req)
 	}
 }
 
-int php_openssl_load_rand_file(const char * file, int *egdsocket, int *seeded)
+zend_result php_openssl_load_rand_file(const char * file, int *egdsocket, int *seeded)
 {
 	char buffer[MAXPATHLEN];
 
@@ -448,7 +448,7 @@ int php_openssl_load_rand_file(const char * file, int *egdsocket, int *seeded)
 	return SUCCESS;
 }
 
-int php_openssl_write_rand_file(const char * file, int egdsocket, int seeded)
+zend_result php_openssl_write_rand_file(const char * file, int egdsocket, int seeded)
 {
 	char buffer[MAXPATHLEN];
 
@@ -1746,7 +1746,7 @@ void php_openssl_load_cipher_mode(struct php_openssl_cipher_mode *mode, const EV
 	}
 }
 
-int php_openssl_validate_iv(const char **piv, size_t *piv_len, size_t iv_required_len,
+zend_result php_openssl_validate_iv(const char **piv, size_t *piv_len, size_t iv_required_len,
 		bool *free_iv, EVP_CIPHER_CTX *cipher_ctx, struct php_openssl_cipher_mode *mode)
 {
 	char *iv_new;
@@ -1797,7 +1797,7 @@ int php_openssl_validate_iv(const char **piv, size_t *piv_len, size_t iv_require
 
 }
 
-int php_openssl_cipher_init(const EVP_CIPHER *cipher_type,
+zend_result php_openssl_cipher_init(const EVP_CIPHER *cipher_type,
 		EVP_CIPHER_CTX *cipher_ctx, struct php_openssl_cipher_mode *mode,
 		const char **ppassword, size_t *ppassword_len, bool *free_password,
 		const char **piv, size_t *piv_len, bool *free_iv,
@@ -1869,7 +1869,7 @@ int php_openssl_cipher_init(const EVP_CIPHER *cipher_type,
 	return SUCCESS;
 }
 
-int php_openssl_cipher_update(const EVP_CIPHER *cipher_type,
+zend_result php_openssl_cipher_update(const EVP_CIPHER *cipher_type,
 		EVP_CIPHER_CTX *cipher_ctx, struct php_openssl_cipher_mode *mode,
 		zend_string **poutbuf, int *poutlen, const char *data, size_t data_len,
 		const char *aad, size_t aad_len, int enc)

diff --git a/ext/openssl/php_openssl_backend.h b/ext/openssl/php_openssl_backend.h
@@ -237,8 +237,8 @@ static inline void php_openssl_rand_add_timeval(void)  /* {{{ */
 
 #endif
 
-int php_openssl_load_rand_file(const char * file, int *egdsocket, int *seeded);
-int php_openssl_write_rand_file(const char * file, int egdsocket, int seeded);
+zend_result php_openssl_load_rand_file(const char * file, int *egdsocket, int *seeded);
+zend_result php_openssl_write_rand_file(const char * file, int egdsocket, int seeded);
 
 EVP_MD * php_openssl_get_evp_md_from_algo(zend_long algo);
 const EVP_CIPHER * php_openssl_get_evp_cipher_from_algo(zend_long algo);
@@ -359,16 +359,16 @@ static inline void php_openssl_set_aead_flags(struct php_openssl_cipher_mode *mo
 #endif
 
 void php_openssl_load_cipher_mode(struct php_openssl_cipher_mode *mode, const EVP_CIPHER *cipher_type);
-int php_openssl_validate_iv(const char **piv, size_t *piv_len, size_t iv_required_len,
+zend_result php_openssl_validate_iv(const char **piv, size_t *piv_len, size_t iv_required_len,
 		bool *free_iv, EVP_CIPHER_CTX *cipher_ctx, struct php_openssl_cipher_mode *mode);
 
-int php_openssl_cipher_init(const EVP_CIPHER *cipher_type,
+zend_result php_openssl_cipher_init(const EVP_CIPHER *cipher_type,
 		EVP_CIPHER_CTX *cipher_ctx, struct php_openssl_cipher_mode *mode,
 		const char **ppassword, size_t *ppassword_len, bool *free_password,
 		const char **piv, size_t *piv_len, bool *free_iv,
 		const char *tag, int tag_len, zend_long options, int enc);
 
-int php_openssl_cipher_update(const EVP_CIPHER *cipher_type,
+zend_result php_openssl_cipher_update(const EVP_CIPHER *cipher_type,
 		EVP_CIPHER_CTX *cipher_ctx, struct php_openssl_cipher_mode *mode,
 		zend_string **poutbuf, int *poutlen, const char *data, size_t data_len,
 		const char *aad, size_t aad_len, int enc);