diff options
| author | Matt Caswell <matt@openssl.org> | 2016-10-31 13:20:03 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-11-09 09:10:30 +0000 |
| commit | de7d61d5c264fd6883a1563d3d159d2591d9037b (patch) | |
| tree | 1499db35ade172f2280a9ecb9e319b19b59d664c /ssl | |
| parent | b1b4b543ee531606cddb5df9d56b17b27d4ac60d (diff) | |
Improve some comment documentation following the extensions refactor
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_sess.c | 3 | ||||
| -rw-r--r-- | ssl/statem/statem_lib.c | 4 | ||||
| -rw-r--r-- | ssl/t1_lib.c | 7 |
3 files changed, 10 insertions, 4 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index a8bfeb7761..291796e8ad 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -432,8 +432,7 @@ int ssl_get_new_session(SSL *s, int session) * ssl_get_prev attempts to find an SSL_SESSION to be used to resume this * connection. It is only called by servers. * - * ext: ClientHello extensions (including length prefix) - * session_id: ClientHello session ID. + * hello: The parsed ClientHello data * * Returns: * -1: error diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c index 120b277932..69f1200d64 100644 --- a/ssl/statem/statem_lib.c +++ b/ssl/statem/statem_lib.c @@ -175,6 +175,10 @@ static int compare_extensions(const void *p1, const void *p2) * types, and 0 if the extensions contain duplicates, could not be successfully * parsed, or an internal error occurred. */ +/* + * TODO(TLS1.3): Refactor ServerHello extension parsing to use this and then + * remove tls1_check_duplicate_extensions() + */ int tls_collect_extensions(PACKET *packet, RAW_EXTENSION **res, size_t *numfound, int *ad) { diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index ea876cf135..9f617ff3d5 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -2888,8 +2888,11 @@ int tls_get_ticket_from_client(SSL *s, CLIENTHELLO_MSG *hello, } /* - * Sets the extended master secret flag is set if the extension is present - * in the ClientHello + * Sets the extended master secret flag if the extension is present in the + * ClientHello + * Returns: + * 1 on success + * 0 on error */ int tls_check_client_ems_support(SSL *s, CLIENTHELLO_MSG *hello) { |