callbacks now get a GNUTLS_STATE argument.

diff --git a/lib/auth_x509.c b/lib/auth_x509.c
index 649acc7dde135e43285971058787d874d2672668..d13cf8b6729b4233a235d26c772ce2e79a4ff52f 100644 (file)
--- a/lib/auth_x509.c
+++ b/lib/auth_x509.c
@@ -223,7 +223,7 @@ static int _gnutls_find_acceptable_client_cert(GNUTLS_STATE state,
                 * will be prompted to choose one.
                 */
                try =
-                   state->gnutls_internals.client_cert_callback(NULL, 0,
+                   state->gnutls_internals.client_cert_callback( state, NULL, 0,
                                                                 NULL, 0);
        }
 
@@ -326,7 +326,7 @@ static int _gnutls_find_acceptable_client_cert(GNUTLS_STATE state,
                        my_certs[i] = cred->cert_list[i][0].raw;
                }
                indx =
-                   state->gnutls_internals.client_cert_callback(my_certs,
+                   state->gnutls_internals.client_cert_callback(state, my_certs,
                                                                 cred->
                                                                 ncerts,
                                                                 issuers_dn,
@@ -1333,7 +1333,7 @@ int _gnutls_server_find_cert_list_index(GNUTLS_STATE state,
                        my_certs[i] = cred->cert_list[i][0].raw;
                }
                index =
-                   state->gnutls_internals.server_cert_callback(my_certs,
+                   state->gnutls_internals.server_cert_callback(state, my_certs,
                                                                 cred->ncerts);
 
              clear:

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 3f214c4743ea4155b9675c9eef36239407d2fb68..648aaaa252dd0bfb8e0aea7b790f7815536d630c 100644 (file)
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -340,8 +340,8 @@ typedef struct {
 #define CompressionMethod_Priority GNUTLS_Priority
 #define Protocol_Priority GNUTLS_Priority
 
-typedef int x509pki_client_cert_callback_func(const gnutls_datum *, int, const gnutls_datum *, int);
-typedef int x509pki_server_cert_callback_func(const gnutls_datum *, int);
+typedef int x509pki_client_cert_callback_func(struct GNUTLS_STATE_INT*, const gnutls_datum *, int, const gnutls_datum *, int);
+typedef int x509pki_server_cert_callback_func(struct GNUTLS_STATE_INT*, const gnutls_datum *, int);
 
 typedef struct {
        opaque                          header[HANDSHAKE_HEADER_SIZE];

diff --git a/lib/gnutls_ui.h b/lib/gnutls_ui.h
index b5df28be89bc863492af807cdb0c37925d04318f..992344a31a3e23dc64b19c53dd99c93e6e363c7d 100644 (file)
--- a/lib/gnutls_ui.h
+++ b/lib/gnutls_ui.h
@@ -38,8 +38,8 @@ typedef struct {
 
 # ifdef LIBGNUTLS_VERSION /* These are defined only in gnutls.h */
 
-typedef int x509pki_client_cert_callback_func(const gnutls_datum *, int, const gnutls_datum *, int);
-typedef int x509pki_server_cert_callback_func(const gnutls_datum *, int);
+typedef int x509pki_client_cert_callback_func(GNUTLS_STATE, const gnutls_datum *, int, const gnutls_datum *, int);
+typedef int x509pki_server_cert_callback_func(GNUTLS_STATE, const gnutls_datum *, int);
 
 /* Functions that allow AUTH_INFO structures handling
  */