From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 16 May 2010 09:04:23 +0000 (+0200)
Subject: Use the new callback function.
X-Git-Tag: gnutls_2_11_3~299
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e825733ffc13cecd5c550ee3fee6b4607ebe19d;p=thirdparty%2Fgnutls.git

Use the new callback function.
---

diff --git a/lib/gnutlsxx.cpp b/lib/gnutlsxx.cpp
index b9f5c3ea8f..400d87bed8 100644
--- a/lib/gnutlsxx.cpp
+++ b/lib/gnutlsxx.cpp
@@ -716,16 +716,10 @@ namespace gnutls
     RETWRAP (gnutls_certificate_set_x509_crl (cred, crl_list, crl_list_size));
   }
 
-  void certificate_server_credentials::
-    set_retrieve_function (gnutls_certificate_server_retrieve_function * func)
-  {
-    gnutls_certificate_server_set_retrieve_function (cred, func);
-  }
-
-  void certificate_client_credentials::
-    set_retrieve_function (gnutls_certificate_client_retrieve_function * func)
+  void certificate_credentials::
+    set_retrieve_function (gnutls_certificate_retrieve_function * func)
   {
-    gnutls_certificate_client_set_retrieve_function (cred, func);
+    gnutls_certificate_set_retrieve_function (cred, func);
   }
 
 // SRP
diff --git a/lib/includes/gnutls/gnutlsxx.h b/lib/includes/gnutls/gnutlsxx.h
index b3013d2d02..9f88fe87b6 100644
--- a/lib/includes/gnutls/gnutlsxx.h
+++ b/lib/includes/gnutls/gnutlsxx.h
@@ -310,6 +310,9 @@ namespace gnutls
 				 gnutls_x509_crt_fmt_t type,
 				 const char *password);
 
+    void set_retrieve_function (gnutls_certificate_retrieve_function *
+				func);
+
   protected:
       gnutls_certificate_credentials_t cred;
   };
@@ -317,16 +320,12 @@ namespace gnutls
   class certificate_server_credentials:public certificate_credentials
   {
   public:
-    void set_retrieve_function (gnutls_certificate_server_retrieve_function *
-				func);
     void set_params_function (gnutls_params_function * func);
   };
 
   class certificate_client_credentials:public certificate_credentials
   {
   public:
-    void set_retrieve_function (gnutls_certificate_client_retrieve_function *
-				func);
   };
 
 
diff --git a/src/tests.c b/src/tests.c
index f9d10f5f4a..2382d8b98b 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -975,7 +975,7 @@ static int
 cert_callback (gnutls_session_t session,
 	       const gnutls_datum_t * req_ca_rdn, int nreqs,
 	       const gnutls_pk_algorithm_t * sign_algos,
-	       int sign_algos_length, gnutls_retr_st * st)
+	       int sign_algos_length, gnutls_retr2_st * st)
 {
   char issuer_dn[256];
   int i, ret;
@@ -1025,10 +1025,10 @@ test_server_cas (gnutls_session_t session)
   _gnutls_priority_set_direct (session, prio_str);
 
   gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);
-  gnutls_certificate_client_set_retrieve_function (xcred, cert_callback);
+  gnutls_certificate_set_retrieve_function (xcred, cert_callback);
 
   ret = do_handshake (session);
-  gnutls_certificate_client_set_retrieve_function (xcred, NULL);
+  gnutls_certificate_set_retrieve_function (xcred, NULL);
 
   if (ret == TEST_FAILED)
     return ret;