diff options
| author | Simon Josefsson <simon@josefsson.org> | 2007-10-17 16:46:50 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2007-10-17 16:46:50 +0200 |
| commit | de04fc2c5009ffec2799242a0c090ce12201ae2a (patch) | |
| tree | 9f98f4a4c1a85e296bacc0e09bfd8910ce34c9d1 | |
| parent | 59477a7acec357e59ddb67b5ed20c73841c2e0b1 (diff) | |
| download | gnutls-de04fc2c5009ffec2799242a0c090ce12201ae2a.tar.gz | |
Remove tls-authz.
| -rw-r--r-- | lib/gnutls_extensions.c | 9 | ||||
| -rw-r--r-- | lib/gnutls_int.h | 11 | ||||
| -rw-r--r-- | lib/gnutls_supplemental.c | 5 |
3 files changed, 0 insertions, 25 deletions
diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c index 4c54cbfb70..37ed878c8f 100644 --- 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 2cff4d1eda..e0edd162b8 100644 --- 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 13ae5bf7da..945582759f 100644 --- 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 } }; |