summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2011-09-08 00:03:48 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2011-09-08 00:06:21 +0200
commit7ae18e4644ae251717dd337c75911d652664732e (patch)
treecec6459490cdfc57016b26b70274699c9125584a
parent1be5f996286ce2d9e8435353e5d1fd3fa1d1f22e (diff)
downloadgnutls-7ae18e4644ae251717dd337c75911d652664732e.tar.gz
Do not send an empty extension structure in server hello. This affects
old implementations that do not support extensions. Reported by J. Cameijo Cerdeira.
-rw-r--r--NEWS4
-rw-r--r--lib/gnutls_extensions.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 406abafb1f..01649bf769 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,10 @@ See the end for copying conditions.
* Version 3.0.3 (unreleased)
+** libgnutls: Do not send an empty extension structure in server
+hello. This affected old implementations that do not support extensions.
+Reported by J. Cameijo Cerdeira.
+
** libgnutls: Allow CA importing of 0 certificates to succeed.
Reported by Jonathan Nieder <jrnieder@gmail.com> in
<http://bugs.debian.org/640639>.
diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c
index 2ec5c1578a..99238a096c 100644
--- a/lib/gnutls_extensions.c
+++ b/lib/gnutls_extensions.c
@@ -297,6 +297,7 @@ _gnutls_gen_extensions (gnutls_session_t session, gnutls_buffer_st * extdata,
if ( size > 0)
_gnutls_write_uint16(size, &extdata->data[pos]);
+ else if (size == 0) extdata->length = 0;
return size;
}