diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-10-09 14:21:09 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-10-09 20:08:35 +0200 |
| commit | 8a4ff2e843a856bc0e3d2741cd48daeb4af55cc5 (patch) | |
| tree | d2aa10379ec025043b1075ea4b955cbc0daf68e2 | |
| parent | a07b0ef326f1b297e43be0e57443e6cce801d66e (diff) | |
| download | gnutls-8a4ff2e843a856bc0e3d2741cd48daeb4af55cc5.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/gnutls_extensions.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c index 565734f798..61a92b2a40 100644 --- a/lib/gnutls_extensions.c +++ b/lib/gnutls_extensions.c @@ -172,8 +172,6 @@ _gnutls_parse_extensions(gnutls_session_t session, gnutls_assert(); return ret; } - } else { - _gnutls_extension_list_add(session, type); } DECR_LENGTH_RET(next, 2, 0); @@ -193,6 +191,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_extension_get_name(type), type, @@ -211,8 +214,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) { |