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

diff --git a/lib/ext_authz.c b/lib/ext_authz.c
index 329e062e06657c61bde620e425406691d47c0b2b..418022436f98810db286d88a8d3d45058c1e0b0e 100644 (file)
--- 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)