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>
(cherry picked from commit 8cafe9e8bfcc99d12adf083c61411955995668c4)

diff --git a/apps/s_client.c b/apps/s_client.c
index e4e169d627f36401f87bcba38a1e16f7d5e43ae5..bfb6e52cc55cdec228266e4bfc0c8af902a4dbda 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1338,7 +1338,7 @@ bad:
                        {
                        for (i = 0; i < serverinfo_types_count; i++)
                                {
-                               SSL_CTX_set_custom_cli_ext(ctx,
+                               SSL_CTX_add_client_custom_ext(ctx,
                                                           serverinfo_types[i],
                                                           NULL, NULL, NULL,
                                                           serverinfo_cli_cb,

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 03dfc5bebeb8295ba6eda6827158cac3ab90322b..f2a9988110a866680f1f6ef083f3391014e028dd 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1246,13 +1246,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 e7946cb6a1c0da994a0f52b344e868faac6e5755..d75c8245f131ed5a5a8339b894b3f1156ec1e117 100644 (file)
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -905,7 +905,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 94898e4d0c2390ab24a8ca5fa3775d6bde7afd75..a70ac3f98ac881e8f28b196ed14b1d66a79067de 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -1465,11 +1465,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);
 
@@ -1482,30 +1482,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 0cca8d55069688f397a8e13f0720bfe76f6e1d1a..615070826a0e351d68f084fb7fa0a32e97c5d8a2 100644 (file)
--- 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);
        }