diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-10-09 14:21:09 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-10-09 14:21:11 +0200 |
| commit | 79a81363a564151483665009b66cac91b5ae0cd5 (patch) | |
| tree | 333084acd2f4e9bc3584f0a9062dffde14cfe1aa | |
| parent | 15d3612b48e2aac659bc729f766e3b13dbaaca5b (diff) | |
| download | gnutls-79a81363a564151483665009b66cac91b5ae0cd5.tar.gz | |
TLS extensions: only cache the extension IDs from exts that the server supports
That avoids imposing any artificial limits on the number of extensions that
a server can handle.
Resolves #136
| -rw-r--r-- | lib/extensions.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/extensions.c b/lib/extensions.c index 7a4d415be4..4aa9444a86 100644 --- a/lib/extensions.c +++ b/lib/extensions.c @@ -240,8 +240,6 @@ _gnutls_parse_extensions(gnutls_session_t session, gnutls_assert(); return ret; } - } else { - _gnutls_extension_list_add(session, type); } DECR_LENGTH_RET(next, 2, GNUTLS_E_UNEXPECTED_EXTENSIONS_LENGTH); @@ -261,6 +259,11 @@ _gnutls_parse_extensions(gnutls_session_t session, continue; } + /* only store the extension number if we support it */ + if (session->security_parameters.entity == GNUTLS_SERVER) { + _gnutls_extension_list_add(session, type); + } + _gnutls_handshake_log ("EXT[%p]: Parsing extension '%s/%d' (%d bytes)\n", session, gnutls_ext_get_name(type), type, @@ -279,8 +282,11 @@ _gnutls_parse_extensions(gnutls_session_t session, } /* Adds the extension we want to send in the extensions list. - * This list is used to check whether the (later) received + * This list is used in client side to check whether the (later) received * extensions are the ones we requested. + * + * In server side, this list is used to ensure we don't send + * extensions that we didn't receive a corresponding value. */ void _gnutls_extension_list_add(gnutls_session_t session, uint16_t type) { |