Remove reserved _t suffix

Author: Sjord

ext/openssl/openssl.c

@@ -5116,7 +5116,7 @@ PHP_FUNCTION(openssl_get_channel_binding)
 		Z_PARAM_STR(type)
 	ZEND_PARSE_PARAMETERS_END();
 
-	php_openssl_channel_binding_type_t type_code;
+	php_openssl_channel_binding_type type_code;
 	if (zend_string_equals_literal(type, "tls-unique")) {
 		type_code = PHP_OPENSSL_CHANNEL_BINDING_TYPE_TLS_UNIQUE;
 	} else if (zend_string_equals_literal(type, "tls-server-end-point")) {
@@ -5133,7 +5133,7 @@ PHP_FUNCTION(openssl_get_channel_binding)
 	}
 
 	zend_string *result = NULL;
-	php_openssl_channel_binding_result_t ret = php_openssl_netstream_get_channel_binding(stream, type_code, &result);
+	php_openssl_channel_binding_result ret = php_openssl_netstream_get_channel_binding(stream, type_code, &result);
 	switch (ret) {
 		case PHP_OPENSSL_CHANNEL_BINDING_RESULT_OK:
 			RETURN_STR(result);

ext/openssl/php_openssl.h

@@ -232,15 +232,15 @@ typedef enum php_openssl_channel_binding_type {
 	PHP_OPENSSL_CHANNEL_BINDING_TYPE_TLS_UNIQUE = 0,
 	PHP_OPENSSL_CHANNEL_BINDING_TYPE_TLS_SERVER_ENDPOINT,
 	PHP_OPENSSL_CHANNEL_BINDING_TYPE_TLS_EXPORTER,
-} php_openssl_channel_binding_type_t;
+} php_openssl_channel_binding_type;
 
 /* Result of php_openssl_netstream_get_channel_binding(). */
 typedef enum php_openssl_channel_binding_result {
 	PHP_OPENSSL_CHANNEL_BINDING_RESULT_OK = 0,		/* *out holds a zend_string with the data */
 	PHP_OPENSSL_CHANNEL_BINDING_RESULT_NOT_APPLICABLE,	/* *out = NULL (e.g. tls-unique over TLS 1.3) */
 	PHP_OPENSSL_CHANNEL_BINDING_RESULT_NOT_TLS,	/* stream is not an active TLS stream */
 	PHP_OPENSSL_CHANNEL_BINDING_RESULT_ERROR,		/* an OpenSSL-level failure occurred */
-} php_openssl_channel_binding_result_t;
+} php_openssl_channel_binding_result;
 
 static inline php_openssl_session_object *php_openssl_session_from_obj(zend_object *obj) {
 	return (php_openssl_session_object *)((char *)(obj) - offsetof(php_openssl_session_object, std));
@@ -254,7 +254,7 @@ extern zend_class_entry *php_openssl_session_ce;
 void php_openssl_session_object_init(zval *zv, SSL_SESSION *session);
 bool php_openssl_is_session_ce(zval *val);
 SSL_SESSION *php_openssl_session_from_zval(zval *zv);
-php_openssl_channel_binding_result_t php_openssl_netstream_get_channel_binding(struct _php_stream *stream, php_openssl_channel_binding_type_t type, zend_string **out);
+php_openssl_channel_binding_result php_openssl_netstream_get_channel_binding(struct _php_stream *stream, php_openssl_channel_binding_type type, zend_string **out);
 
 #if defined(HAVE_OPENSSL_ARGON2)
 

ext/openssl/xp_ssl.c

@@ -3975,8 +3975,8 @@ static int php_openssl_get_cert_signature_md_nid(const X509 *cert) /* {{{ */
  * stream PHP_OPENSSL_CHANNEL_BINDING_RESULT_NOT_TLS is returned, and if an OpenSSL call fails
  * PHP_OPENSSL_CHANNEL_BINDING_RESULT_ERROR is returned; in both of these cases *out is set to NULL.
  */
-php_openssl_channel_binding_result_t php_openssl_netstream_get_channel_binding( /* {{{ */
-	php_stream *stream, php_openssl_channel_binding_type_t type, zend_string **out)
+php_openssl_channel_binding_result php_openssl_netstream_get_channel_binding( /* {{{ */
+	php_stream *stream, php_openssl_channel_binding_type type, zend_string **out)
 {
 	unsigned char buf[EVP_MAX_MD_SIZE];
 	size_t len = 0;