diff options
| author | Matt Caswell <matt@openssl.org> | 2017-04-07 11:04:38 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-04-07 13:41:04 +0100 |
| commit | cd17bb190cf65413877bcddffb5d1fecdb85eef3 (patch) | |
| tree | b00ba1afa76b2a926e1d2115d2ab3e1f458108a5 /ssl | |
| parent | 64350ab5877aa30dc8b89cf3373dc28c8b013e19 (diff) | |
Prefix custom extension API callback types with SSL_
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3139)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_locl.h | 6 | ||||
| -rw-r--r-- | ssl/statem/extensions_cust.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index a9ac840e10..ad73d8eee6 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1630,10 +1630,10 @@ typedef struct { * part of an SSL_CTX structure. */ uint32_t ext_flags; - custom_ext_add_cb_ex add_cb; - custom_ext_free_cb_ex free_cb; + SSL_custom_ext_add_cb_ex add_cb; + SSL_custom_ext_free_cb_ex free_cb; void *add_arg; - custom_ext_parse_cb_ex parse_cb; + SSL_custom_ext_parse_cb_ex parse_cb; void *parse_arg; } custom_ext_method; diff --git a/ssl/statem/extensions_cust.c b/ssl/statem/extensions_cust.c index 6bd50a7297..38bb03b390 100644 --- a/ssl/statem/extensions_cust.c +++ b/ssl/statem/extensions_cust.c @@ -303,10 +303,10 @@ int SSL_CTX_has_client_custom_ext(const SSL_CTX *ctx, unsigned int ext_type) static int add_custom_ext_intern(SSL_CTX *ctx, int server, unsigned int ext_type, unsigned int context, - custom_ext_add_cb_ex add_cb, - custom_ext_free_cb_ex free_cb, + SSL_custom_ext_add_cb_ex add_cb, + SSL_custom_ext_free_cb_ex free_cb, void *add_arg, - custom_ext_parse_cb_ex parse_cb, + SSL_custom_ext_parse_cb_ex parse_cb, void *parse_arg) { custom_ext_methods *exts = &ctx->cert->custext; @@ -442,10 +442,10 @@ int SSL_CTX_add_server_custom_ext(SSL_CTX *ctx, unsigned int ext_type, int SSL_CTX_add_custom_ext(SSL_CTX *ctx, unsigned int ext_type, unsigned int context, - custom_ext_add_cb_ex add_cb, - custom_ext_free_cb_ex free_cb, + SSL_custom_ext_add_cb_ex add_cb, + SSL_custom_ext_free_cb_ex free_cb, void *add_arg, - custom_ext_parse_cb_ex parse_cb, void *parse_arg) + SSL_custom_ext_parse_cb_ex parse_cb, void *parse_arg) { return add_custom_ext_intern(ctx, -1, ext_type, context, add_cb, free_cb, add_arg, parse_cb, parse_arg); |