Skip to content

Commit ceb8791

Browse files
committed
Use zend_result where appropriate in ext/openssl
1 parent e04d37b commit ceb8791

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

ext/openssl/xp_ssl.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ static bool php_openssl_matches_common_name(X509 *peer, const char *subject_name
513513
}
514514
/* }}} */
515515

516-
static int php_openssl_apply_peer_verification_policy(SSL *ssl, X509 *peer, php_stream *stream) /* {{{ */
516+
static zend_result php_openssl_apply_peer_verification_policy(SSL *ssl, X509 *peer, php_stream *stream) /* {{{ */
517517
{
518518
zval *val = NULL;
519519
zval *peer_fingerprint;
@@ -840,7 +840,7 @@ static long php_openssl_load_stream_cafile(X509_STORE *cert_store, const char *c
840840
}
841841
/* }}} */
842842

843-
static int php_openssl_enable_peer_verification(SSL_CTX *ctx, php_stream *stream) /* {{{ */
843+
static zend_result php_openssl_enable_peer_verification(SSL_CTX *ctx, php_stream *stream) /* {{{ */
844844
{
845845
zval *val = NULL;
846846
char *cafile = NULL;
@@ -900,7 +900,7 @@ static void php_openssl_disable_peer_verification(SSL_CTX *ctx, php_stream *stre
900900
}
901901
/* }}} */
902902

903-
static int php_openssl_set_local_cert(SSL_CTX *ctx, php_stream *stream) /* {{{ */
903+
static zend_result php_openssl_set_local_cert(SSL_CTX *ctx, php_stream *stream) /* {{{ */
904904
{
905905
zval *val = NULL;
906906
char *certfile = NULL;
@@ -1204,7 +1204,7 @@ static RSA *php_openssl_tmp_rsa_cb(SSL *s, int is_export, int keylength)
12041204
}
12051205
#endif
12061206

1207-
static int php_openssl_set_server_dh_param(php_stream * stream, SSL_CTX *ctx) /* {{{ */
1207+
static zend_result php_openssl_set_server_dh_param(php_stream * stream, SSL_CTX *ctx) /* {{{ */
12081208
{
12091209
zval *zdhpath = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "dh_param");
12101210
if (zdhpath == NULL) {
@@ -1265,7 +1265,7 @@ static int php_openssl_set_server_dh_param(php_stream * stream, SSL_CTX *ctx) /*
12651265
/* }}} */
12661266

12671267
#if defined(HAVE_ECDH) && PHP_OPENSSL_API_VERSION < 0x10100
1268-
static int php_openssl_set_server_ecdh_curve(php_stream *stream, SSL_CTX *ctx) /* {{{ */
1268+
static zend_result php_openssl_set_server_ecdh_curve(php_stream *stream, SSL_CTX *ctx) /* {{{ */
12691269
{
12701270
zval *zvcurve;
12711271
int curve_nid;
@@ -1301,7 +1301,7 @@ static int php_openssl_set_server_ecdh_curve(php_stream *stream, SSL_CTX *ctx) /
13011301
/* }}} */
13021302
#endif
13031303

1304-
static int php_openssl_set_server_specific_opts(php_stream *stream, SSL_CTX *ctx) /* {{{ */
1304+
static zend_result php_openssl_set_server_specific_opts(php_stream *stream, SSL_CTX *ctx) /* {{{ */
13051305
{
13061306
zval *zv;
13071307
long ssl_ctx_options = SSL_CTX_get_options(ctx);
@@ -1397,7 +1397,7 @@ static SSL_CTX *php_openssl_create_sni_server_ctx(char *cert_path, char *key_pat
13971397
}
13981398
/* }}} */
13991399

1400-
static int php_openssl_enable_server_sni(php_stream *stream, php_openssl_netstream_data_t *sslsock) /* {{{ */
1400+
static zend_result php_openssl_enable_server_sni(php_stream *stream, php_openssl_netstream_data_t *sslsock) /* {{{ */
14011401
{
14021402
zval *val;
14031403
zval *current;
@@ -1608,7 +1608,7 @@ static int php_openssl_server_alpn_callback(SSL *ssl_handle,
16081608

16091609
#endif
16101610

1611-
int php_openssl_setup_crypto(php_stream *stream,
1611+
zend_result php_openssl_setup_crypto(php_stream *stream,
16121612
php_openssl_netstream_data_t *sslsock,
16131613
php_stream_xport_crypto_param *cparam) /* {{{ */
16141614
{
@@ -2513,7 +2513,7 @@ static int php_openssl_sockop_set_option(php_stream *stream, int option, int val
25132513
}
25142514
/* }}} */
25152515

2516-
static int php_openssl_sockop_cast(php_stream *stream, int castas, void **ret) /* {{{ */
2516+
static zend_result php_openssl_sockop_cast(php_stream *stream, int castas, void **ret) /* {{{ */
25172517
{
25182518
php_openssl_netstream_data_t *sslsock = (php_openssl_netstream_data_t*)stream->abstract;
25192519

0 commit comments

Comments
 (0)