Use consistent function naming.

Instead of SSL_CTX_set_custom_cli_ext and SSL_CTX_set_custom_srv_ext
use SSL_CTX_add_client_custom_ext and SSL_CTX_add_server_custom_ext.
Reviewed-by: Emilia Käsper <emilia@openssl.org>

4 files changed, 18 insertions, 18 deletions

diff --git a/ssl/ssl.h b/ssl/ssl.h
index f363e8f3bc..750dbabd4f 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1253,13 +1253,13 @@ const char *SSL_get_psk_identity(const SSL *s);
 #ifndef OPENSSL_NO_TLSEXT
 /* Register callbacks to handle custom TLS Extensions for client or server. */
 
-int SSL_CTX_set_custom_cli_ext(SSL_CTX *ctx, unsigned int ext_type,
+int SSL_CTX_add_client_custom_ext(SSL_CTX *ctx, unsigned int ext_type,
 			       custom_ext_add_cb add_cb,
 			       custom_ext_free_cb free_cb,
                                void *add_arg,
 			       custom_ext_parse_cb parse_cb, void *parse_arg);
 
-int SSL_CTX_set_custom_srv_ext(SSL_CTX *ctx, unsigned int ext_type,
+int SSL_CTX_add_server_custom_ext(SSL_CTX *ctx, unsigned int ext_type,
 			       custom_ext_add_cb add_cb,
 			       custom_ext_free_cb free_cb,
                                void *add_arg,
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index 6e3d44c79c..510e564d86 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -920,7 +920,7 @@ static int serverinfo_process_buffer(const unsigned char *serverinfo,
 
 		/* Register callbacks for extensions */
 		ext_type = (serverinfo[0] << 8) + serverinfo[1];
-		if (ctx && !SSL_CTX_set_custom_srv_ext(ctx, ext_type, 
+		if (ctx && !SSL_CTX_add_server_custom_ext(ctx, ext_type, 
 						       serverinfo_srv_add_cb,
 						       NULL, NULL,
 						       serverinfo_srv_parse_cb, 
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 09400a1855..9680b66d00 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -1584,11 +1584,11 @@ bad:
 #endif
 
 	if (serverinfo_sct)
-		SSL_CTX_set_custom_cli_ext(c_ctx, SCT_EXT_TYPE,
+		SSL_CTX_add_client_custom_ext(c_ctx, SCT_EXT_TYPE,
 					   NULL, NULL, NULL,
 					   serverinfo_cli_cb, NULL);
 	if (serverinfo_tack)
-		SSL_CTX_set_custom_cli_ext(c_ctx, TACK_EXT_TYPE,
+		SSL_CTX_add_client_custom_ext(c_ctx, TACK_EXT_TYPE,
 					   NULL, NULL, NULL,
 					   serverinfo_cli_cb, NULL);
 
@@ -1601,30 +1601,30 @@ bad:
 
 	if (custom_ext)
 		{
-		SSL_CTX_set_custom_cli_ext(c_ctx, CUSTOM_EXT_TYPE_0, 
+		SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_0, 
 					   custom_ext_0_cli_add_cb, NULL, NULL,
 					   custom_ext_0_cli_parse_cb, NULL);
-		SSL_CTX_set_custom_cli_ext(c_ctx, CUSTOM_EXT_TYPE_1, 
+		SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_1, 
 					   custom_ext_1_cli_add_cb, NULL, NULL,
 					   custom_ext_1_cli_parse_cb, NULL);
-		SSL_CTX_set_custom_cli_ext(c_ctx, CUSTOM_EXT_TYPE_2, 
+		SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_2, 
 					   custom_ext_2_cli_add_cb, NULL, NULL,
 					   custom_ext_2_cli_parse_cb, NULL);
-		SSL_CTX_set_custom_cli_ext(c_ctx, CUSTOM_EXT_TYPE_3, 
+		SSL_CTX_add_client_custom_ext(c_ctx, CUSTOM_EXT_TYPE_3, 
 					   custom_ext_3_cli_add_cb, NULL, NULL,
 					   custom_ext_3_cli_parse_cb, NULL);
 
 
-		SSL_CTX_set_custom_srv_ext(s_ctx, CUSTOM_EXT_TYPE_0, 
+		SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_0, 
 					   custom_ext_0_srv_add_cb, NULL, NULL,
 					   custom_ext_0_srv_parse_cb, NULL);
-		SSL_CTX_set_custom_srv_ext(s_ctx, CUSTOM_EXT_TYPE_1, 
+		SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_1, 
 					   custom_ext_1_srv_add_cb, NULL, NULL,
 					   custom_ext_1_srv_parse_cb, NULL);
-		SSL_CTX_set_custom_srv_ext(s_ctx, CUSTOM_EXT_TYPE_2, 
+		SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_2, 
 					   custom_ext_2_srv_add_cb, NULL, NULL,
 					   custom_ext_2_srv_parse_cb, NULL);
-		SSL_CTX_set_custom_srv_ext(s_ctx, CUSTOM_EXT_TYPE_3, 
+		SSL_CTX_add_server_custom_ext(s_ctx, CUSTOM_EXT_TYPE_3, 
 					   custom_ext_3_srv_add_cb, NULL, NULL,
 					   custom_ext_3_srv_parse_cb, NULL);
 		}
diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c
index 0cca8d5506..615070826a 100644
--- a/ssl/t1_ext.c
+++ b/ssl/t1_ext.c
@@ -210,7 +210,7 @@ void custom_exts_free(custom_ext_methods *exts)
 	}
 
 /* Set callbacks for a custom extension */
-static int custom_ext_set(custom_ext_methods *exts,
+static int custom_ext_meth_add(custom_ext_methods *exts,
 			unsigned int ext_type,
 			custom_ext_add_cb add_cb,
 			custom_ext_free_cb free_cb,
@@ -250,25 +250,25 @@ static int custom_ext_set(custom_ext_methods *exts,
 
 /* Application level functions to add custom extension callbacks */
 
-int SSL_CTX_set_custom_cli_ext(SSL_CTX *ctx, unsigned int ext_type,
+int SSL_CTX_add_client_custom_ext(SSL_CTX *ctx, unsigned int ext_type,
 			       custom_ext_add_cb add_cb,
 			       custom_ext_free_cb free_cb,
                                void *add_arg,
 			       custom_ext_parse_cb parse_cb, void *parse_arg)
 
 	{
-	return custom_ext_set(&ctx->cert->cli_ext, ext_type,
+	return custom_ext_meth_add(&ctx->cert->cli_ext, ext_type,
 				add_cb, free_cb, add_arg,
 				parse_cb, parse_arg);
 	}
 
-int SSL_CTX_set_custom_srv_ext(SSL_CTX *ctx, unsigned int ext_type,
+int SSL_CTX_add_server_custom_ext(SSL_CTX *ctx, unsigned int ext_type,
 			       custom_ext_add_cb add_cb,
 			       custom_ext_free_cb free_cb,
                                void *add_arg,
 			       custom_ext_parse_cb parse_cb, void *parse_arg)
 	{
-	return custom_ext_set(&ctx->cert->srv_ext, ext_type,
+	return custom_ext_meth_add(&ctx->cert->srv_ext, ext_type,
 				add_cb, free_cb, add_arg,
 				parse_cb, parse_arg);
 	}