cleanups

diff --git a/src/cli.c b/src/cli.c
index a31818cc769a91fa8d109d65508806c26f77b9be..db888b4e137e358268778205e27ce943ba85e0e4 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -366,9 +366,9 @@ int main(int argc, char **argv)
 
 
    if (srp_username != NULL)
-      gnutls_srp_free_client_cred(cred);
-   gnutls_certificate_free_cred(xcred);
-   gnutls_anon_free_client_cred(anon_cred);
+      gnutls_srp_free_client_credentials(cred);
+   gnutls_certificate_free_credentials(xcred);
+   gnutls_anon_free_client_credentials(anon_cred);
 
    gnutls_global_deinit();
 
@@ -662,7 +662,7 @@ int ret;
    }
 
    /* X509 stuff */
-   if (gnutls_certificate_allocate_cred(&xcred) < 0) {
+   if (gnutls_certificate_allocate_credentials(&xcred) < 0) {
       fprintf(stderr, "Certificate allocation memory error\n");
       exit(1);
    }
@@ -720,14 +720,14 @@ int ret;
 
    /* SRP stuff */
    if (srp_username != NULL) {
-      if (gnutls_srp_allocate_client_cred(&cred) < 0) {
+      if (gnutls_srp_allocate_client_credentials(&cred) < 0) {
         fprintf(stderr, "SRP authentication error\n");
       }
-      gnutls_srp_set_client_cred(cred, srp_username, srp_passwd);
+      gnutls_srp_set_client_credentials(cred, srp_username, srp_passwd);
    }
 
    /* ANON stuff */
-   if (gnutls_anon_allocate_client_cred(&anon_cred) < 0) {
+   if (gnutls_anon_allocate_client_credentials(&anon_cred) < 0) {
       fprintf(stderr, "Anonymous authentication error\n");
    }
 }

diff --git a/src/serv.c b/src/serv.c
index c2fdbf916863374914a1438b5aeacfde76a8e356..da709a7bcb3ac63a9b7c9c67e90a6b78e4c7bfbb 100644 (file)
--- a/src/serv.c
+++ b/src/serv.c
@@ -269,9 +269,9 @@ gnutls_session initialize_session (void)
     gnutls_mac_set_priority(session, mac_priority);
     gnutls_certificate_type_set_priority(session, cert_type_priority);
 
-    gnutls_cred_set(session, GNUTLS_CRD_ANON, dh_cred);
-    gnutls_cred_set(session, GNUTLS_CRD_SRP, srp_cred);
-    gnutls_cred_set (session, GNUTLS_CRD_CERTIFICATE, cert_cred);
+    gnutls_credentials_set(session, GNUTLS_CRD_ANON, dh_cred);
+    gnutls_credentials_set(session, GNUTLS_CRD_SRP, srp_cred);
+    gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, cert_cred);
 
     gnutls_certificate_server_set_request (session, GNUTLS_CERT_REQUEST);
 
@@ -519,7 +519,7 @@ int main(int argc, char **argv)
       generate_dh_primes();
    }
 
-   if (gnutls_certificate_allocate_cred(&cert_cred) < 0) {
+   if (gnutls_certificate_allocate_credentials(&cert_cred) < 0) {
       fprintf(stderr, "memory error\n");
       exit(1);
    }
@@ -582,10 +582,10 @@ int main(int argc, char **argv)
    /* this is a password file (created with the included srpcrypt utility) 
     * Read README.crypt prior to using SRP.
     */
-   gnutls_srp_allocate_server_cred(&srp_cred);
+   gnutls_srp_allocate_server_credentials(&srp_cred);
 
    if (srp_passwd!=NULL)
-   if ((ret=gnutls_srp_set_server_cred_file(srp_cred, srp_passwd, srp_passwd_conf)) < 0) {
+   if ((ret=gnutls_srp_set_server_credentials_file(srp_cred, srp_passwd, srp_passwd_conf)) < 0) {
        /* only exit is this function is not disabled 
         */
        fprintf(stderr, "Error while setting SRP parameters\n");
@@ -830,9 +830,9 @@ int main(int argc, char **argv)
     }
 
 
-   gnutls_certificate_free_cred(cert_cred);
-   gnutls_srp_free_server_cred(srp_cred);
-   gnutls_anon_free_server_cred(dh_cred);
+   gnutls_certificate_free_credentials(cert_cred);
+   gnutls_srp_free_server_credentials(srp_cred);
+   gnutls_anon_free_server_credentials(dh_cred);
 
    if (nodb==0) wrap_db_deinit();
    gnutls_global_deinit();

diff --git a/src/tests.c b/src/tests.c
index c42e51dd57cf1c5f648eb1a9393f53ea1277643e..65fead962dfd8366632717b1034ae4eae5c26c36 100644 (file)
--- a/src/tests.c
+++ b/src/tests.c
@@ -82,14 +82,14 @@ int ret, alert;
 }
 
 static int protocol_priority[16] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
-const static int kx_priority[16] =
+static const int kx_priority[16] =
     { GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, GNUTLS_KX_ANON_DH, 
     GNUTLS_KX_RSA_EXPORT, 0 };
-const static int cipher_priority[16] =
+static const int cipher_priority[16] =
     { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR_128, GNUTLS_CIPHER_ARCFOUR_40, 0 };
-const static int comp_priority[16] = { GNUTLS_COMP_NULL, 0 };
-const static int mac_priority[16] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
-const static int cert_type_priority[16] = { GNUTLS_CRT_X509, 0 };
+static const int comp_priority[16] = { GNUTLS_COMP_NULL, 0 };
+static const int mac_priority[16] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
+static const int cert_type_priority[16] = { GNUTLS_CRT_X509, 0 };
 
 #define ADD_ALL_CIPHERS(session) gnutls_cipher_set_priority(session, cipher_priority)
 #define ADD_ALL_COMP(session) gnutls_compression_set_priority(session, comp_priority)