From: Simon Josefsson <simon@josefsson.org>
Date: Thu, 22 Feb 2007 07:42:56 +0000 (+0000)
Subject: Don't send authz extension when we shouldn't.
X-Git-Tag: gnutls_1_7_7~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a889b77f14edffca4eb0da775064ede9125c844a;p=thirdparty%2Fgnutls.git

Don't send authz extension when we shouldn't.
---

diff --git a/lib/ext_authz.c b/lib/ext_authz.c
index 329e062e06..418022436f 100644
--- a/lib/ext_authz.c
+++ b/lib/ext_authz.c
@@ -128,7 +128,7 @@ send_extension (gnutls_session_t session,
 
   for (total_size = 0; authz_formats[total_size]; total_size++)
     {
-      _gnutls_debug_log ("EXT[%x]: Sending authz client format %02x\n",
+      _gnutls_debug_log ("EXT[%x]: Sending authz format %02x\n",
 			 session, authz_formats[total_size]);
       DECR_LENGTH_RET (data_size, 1, GNUTLS_E_SHORT_MEMORY_BUFFER);
       *data++ = authz_formats[total_size] - 1;
@@ -172,6 +172,10 @@ _gnutls_authz_ext_client_send_params (gnutls_session_t session,
     session->security_parameters.extensions.authz_client_formats;
   int ret;
 
+  /* Should we be sending this? */
+  if (!_gnutls_extension_list_check (session, GNUTLS_EXTENSION_AUTHZ_CLIENT))
+    return 0;
+
   ret = send_extension (session, data, _data_size, client_formats);
 
   if (session->security_parameters.entity == GNUTLS_SERVER && ret > 0)
@@ -217,6 +221,10 @@ _gnutls_authz_ext_server_send_params (gnutls_session_t session,
     session->security_parameters.extensions.authz_server_formats;
   int ret;
 
+  /* Should we be sending this? */
+  if (!_gnutls_extension_list_check (session, GNUTLS_EXTENSION_AUTHZ_SERVER))
+    return 0;
+
   ret = send_extension (session, data, _data_size, server_formats);
 
   if (session->security_parameters.entity == GNUTLS_SERVER && ret > 0)