diff options
author | Trevor <unsafe@trevp.net> | 2013-06-13 22:36:45 -0700 |
---|---|---|
committer | Ben Laurie <ben@links.org> | 2013-06-18 16:13:08 +0100 |
commit | 9cd50f738ff55eae2a64f872492d3a7ce115f18d (patch) | |
tree | ff3b9868dd02aa7b632d82a8f9ff9f7c0d8ebc18 /ssl/ssl.h | |
parent | 8ee3c7e676c5edb1d5fbe0d66b7ce307a4f92899 (diff) | |
download | openssl-9cd50f738ff55eae2a64f872492d3a7ce115f18d.tar.gz |
Cleanup of custom extension stuff.
serverinfo rejects non-empty extensions.
Omit extension if no relevant serverinfo data.
Improve error-handling in serverinfo callback.
Cosmetic cleanups.
s_client documentation.
s_server documentation.
SSL_CTX_serverinfo documentation.
Cleaup -1 and NULL callback handling for custom extensions, add tests.
Cleanup ssl_rsa.c serverinfo code.
Whitespace cleanup.
Improve comments in ssl.h for serverinfo.
Whitespace.
Cosmetic cleanup.
Reject non-zero-len serverinfo extensions.
Whitespace.
Make it build.
Diffstat (limited to 'ssl/ssl.h')
-rw-r--r-- | ssl/ssl.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -392,7 +392,8 @@ typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len, S * * All these functions return nonzero on success. Zero will terminate * the handshake (and return a specific TLS Fatal alert, if the function - * declaration has an "al" parameter). + * declaration has an "al" parameter). -1 for the "sending" functions + * will cause the TLS Extension to be omitted. * * "ext_type" is a TLS "ExtensionType" from 0-65535. * "in" is a pointer to TLS "extension_data" being provided to the cb. @@ -1240,9 +1241,8 @@ const char *SSL_get_psk_identity(const SSL *s); * * For the server functions, a NULL custom_srv_ext_first_cb_fn means the * ClientHello extension's data will be ignored, but the extension will still - * be noted and custom_srv_ext_second_cb_fn will still be invoked. If - * custom_srv_ext_second_cb_fn is NULL, an empty ServerHello extension is - * sent. + * be noted and custom_srv_ext_second_cb_fn will still be invoked. A NULL + * custom_srv_ext_second_cb doesn't send a ServerHello extension. */ int SSL_CTX_set_custom_cli_ext(SSL_CTX *ctx, unsigned short ext_type, custom_cli_ext_first_cb_fn fn1, |