diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2014-08-16 18:16:26 +0100 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2014-08-28 18:10:21 +0100 |
commit | 6db2239c608a3d434238e0ca64ff962711bed190 (patch) | |
tree | 578608cabcc5142a7a5b495ab2647c1e28865e70 /ssl/ssl_locl.h | |
parent | 423ceb831903339b589ea7b94c877ed190a7cb64 (diff) |
New extension callback features.
Support separate parse and add callback arguments.
Add new callback so an application can free extension data.
Change return value for send functions so < 0 is an error 0
omits extension and > 0 includes it. This is more consistent
with the behaviour of other functions in OpenSSL.
Modify parse_cb handling so <= 0 is an error.
Make SSL_CTX_set_custom_cli_ext and SSL_CTX_set_custom_cli_ext argument
order consistent.
NOTE: these changes WILL break existing code.
Remove (now inaccurate) in line documentation.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
(cherry picked from commit 33f653adf3bff5b0795e22de1f54b7c5472252d0)
Diffstat (limited to 'ssl/ssl_locl.h')
-rw-r--r-- | ssl/ssl_locl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 01beecf10e..ce5856aa8d 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -533,8 +533,10 @@ typedef struct { */ unsigned short ext_flags; custom_ext_add_cb add_cb; + custom_ext_free_cb free_cb; + void *add_arg; custom_ext_parse_cb parse_cb; - void *arg; + void *parse_arg; } custom_ext_method; /* ext_flags values */ |