Remove tls-authz.

diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c
index 4c54cbfb70b736e8baa37ddad62d304535f597e4..37ed878c8f73c14b815e86c40c8dc2cef423a214 100644 (file)
--- a/lib/gnutls_extensions.c
+++ b/lib/gnutls_extensions.c
@@ -36,7 +36,6 @@
 #include <ext_oprfi.h>
 #include <ext_srp.h>
 #include <ext_inner_application.h>
-#include <ext_authz.h>
 #include <gnutls_num.h>
 
 /* Key Exchange Section */
@@ -51,14 +50,6 @@ gnutls_extension_entry _gnutls_extensions[MAX_EXT_SIZE] = {
   GNUTLS_EXTENSION_ENTRY (GNUTLS_EXTENSION_MAX_RECORD_SIZE,
                          _gnutls_max_record_recv_params,
                          _gnutls_max_record_send_params),
-#ifdef ENABLE_AUTHZ
-  GNUTLS_EXTENSION_ENTRY (GNUTLS_EXTENSION_AUTHZ_CLIENT,
-                         _gnutls_authz_ext_client_recv_params,
-                         _gnutls_authz_ext_client_send_params),
-  GNUTLS_EXTENSION_ENTRY (GNUTLS_EXTENSION_AUTHZ_SERVER,
-                         _gnutls_authz_ext_server_recv_params,
-                         _gnutls_authz_ext_server_send_params),
-#endif
   GNUTLS_EXTENSION_ENTRY (GNUTLS_EXTENSION_CERT_TYPE,
                          _gnutls_cert_type_recv_params,
                          _gnutls_cert_type_send_params),

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 2cff4d1eda4cba3591b220330ccf625651743599..e0edd162b80c8859919325bcf9af1f1b22ca8763 100644 (file)
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -141,8 +141,6 @@ typedef enum handshake_state_t
 typedef enum extensions_t
 { GNUTLS_EXTENSION_SERVER_NAME = 0,
   GNUTLS_EXTENSION_MAX_RECORD_SIZE = 1,
-  GNUTLS_EXTENSION_AUTHZ_CLIENT = 7,
-  GNUTLS_EXTENSION_AUTHZ_SERVER = 8,
   GNUTLS_EXTENSION_CERT_TYPE = 9,
 #ifdef ENABLE_OPRFI
   GNUTLS_EXTENSION_OPAQUE_PRF_INPUT = ENABLE_OPRFI,
@@ -263,7 +261,6 @@ typedef struct
 } server_name_st;
 
 #define MAX_SERVER_NAME_EXTENSIONS 3
-#define MAX_AUTHZ_FORMATS 5
 
 typedef struct
 {
@@ -280,14 +277,6 @@ typedef struct
   /* Used by extensions that enable supplemental data. */
   int do_recv_supplemental, do_send_supplemental;
 
-  /* Authz extension data. */
-  int authz_recvd_client, authz_recvd_server;
-  int authz_client_formats[MAX_AUTHZ_FORMATS + 1];
-  int authz_server_formats[MAX_AUTHZ_FORMATS + 1];
-  gnutls_authz_recv_callback_func authz_recv_callback;
-  gnutls_authz_send_callback_func authz_send_callback;
-  gnutls_buffer authz_data;
-
   /* Opaque PRF input. */
   gnutls_oprfi_callback_func oprfi_cb;
   void *oprfi_userdata;

diff --git a/lib/gnutls_supplemental.c b/lib/gnutls_supplemental.c
index 13ae5bf7da15cbfbe7823da31cd2eaef65078cc6..945582759fcdf48d40cf7d5bb7da3f13812ae693 100644 (file)
--- a/lib/gnutls_supplemental.c
+++ b/lib/gnutls_supplemental.c
@@ -49,7 +49,6 @@
 #include "gnutls_supplemental.h"
 #include "gnutls_errors.h"
 #include "gnutls_num.h"
-#include "ext_authz.h"
 
 typedef int (*supp_recv_func) (gnutls_session_t session,
                               const opaque *data,
@@ -66,10 +65,6 @@ typedef struct
 } gnutls_supplemental_entry;
 
 gnutls_supplemental_entry _gnutls_supplemental[] = {
-  { "authz_data",
-    GNUTLS_SUPPLEMENTAL_AUTHZ_DATA,
-    _gnutls_authz_supp_recv_params,
-    _gnutls_authz_supp_send_params },
   { 0, 0, 0, 0 }
 };