Tests compile with --enable-gcc-warnings.

diff --git a/tests/chainverify.c b/tests/chainverify.c
index 0407d141566a88086ddadb6cf802a0e16b40c657..7dccea144ecf077425e20f8ef3dabb8632d0b0f2 100644 (file)
--- a/tests/chainverify.c
+++ b/tests/chainverify.c
@@ -833,7 +833,7 @@ main (int argc, char *argv[])
                                         &verify_status);
       if (ret < 0)
        error (EXIT_FAILURE, 0, "gnutls_x509_crt_list_verify[%d,%d]: %s",
-              i, j, gnutls_strerror (ret));
+              (int)i, (int)j, gnutls_strerror (ret));
 
       if (verify_status != chains[i].expected_verify_result)
        {

diff --git a/tests/crq_apis.c b/tests/crq_apis.c
index 63742b228a7663a1ab2b7b29055612d437def2c0..26ab32120831480f6b0d022cbf5dbe61523ae286 100644 (file)
--- a/tests/crq_apis.c
+++ b/tests/crq_apis.c
@@ -126,13 +126,13 @@ doit (void)
   s = 0;
   ret = gnutls_x509_crq_get_challenge_password (crq, NULL, &s);
   if (ret != 0 || s != 3)
-    fail ("gnutls_x509_crq_get_challenge_password2 %d/%d\n", ret, s);
+    fail ("gnutls_x509_crq_get_challenge_password2 %d/%d\n", ret, (int)s);
 
   s = 10;
   ret = gnutls_x509_crq_get_challenge_password (crq, smallbuf, &s);
   if (ret != 0 || s != 3 || strcmp (smallbuf, "foo") != 0)
     fail ("gnutls_x509_crq_get_challenge_password3 %d/%d/%s\n",
-         ret, s, smallbuf);
+         ret,(int) s, smallbuf);
 
   s = 0;
   ret = gnutls_x509_crq_get_extension_info (crq, 0, NULL, &s, NULL);

diff --git a/tests/crq_key_id.c b/tests/crq_key_id.c
index 0ba128b5a3f870058987a9dd4e3a39a1272ee284..7658874dbd6a8063d3f682c05c4218f1ca02403b 100644 (file)
--- a/tests/crq_key_id.c
+++ b/tests/crq_key_id.c
@@ -159,7 +159,7 @@ doit (void)
       else
        {
          fail ("Key_id lengths differ incorrectly: %d - %d\n",
-               crq_key_id_len, pkey_key_id_len);
+               (int)crq_key_id_len, (int)pkey_key_id_len);
        }
 
 

diff --git a/tests/cve-2008-4989.c b/tests/cve-2008-4989.c
index fd4fb85fe7f6d8744abb70cd1e57f6c391426857..84413a46ca161064c1bb8108ae33d0219f1e1d09 100644 (file)
--- a/tests/cve-2008-4989.c
+++ b/tests/cve-2008-4989.c
@@ -165,7 +165,7 @@ main (int argc, char *argv[])
     {
       ret = gnutls_x509_crt_init (&certs[i]);
       if (ret < 0)
-       error (EXIT_FAILURE, 0, "gnutls_x509_crt_init[%d]: %s", i,
+       error (EXIT_FAILURE, 0, "gnutls_x509_crt_init[%d]: %s", (int)i,
               gnutls_strerror (ret));
 
       tmp.data = (char *) pem_certs[i];
@@ -173,7 +173,7 @@ main (int argc, char *argv[])
 
       ret = gnutls_x509_crt_import (certs[i], &tmp, GNUTLS_X509_FMT_PEM);
       if (ret < 0)
-       error (EXIT_FAILURE, 0, "gnutls_x509_crt_import[%d]: %s", i,
+       error (EXIT_FAILURE, 0, "gnutls_x509_crt_import[%d]: %s", (int)i,
               gnutls_strerror (ret));
     }
 
@@ -196,7 +196,7 @@ main (int argc, char *argv[])
                                     GNUTLS_VERIFY_DISABLE_TIME_CHECKS,
                                     &verify_status);
   if (ret < 0)
-    error (EXIT_FAILURE, 0, "gnutls_x509_crt_list_verify[%d]: %s", i,
+    error (EXIT_FAILURE, 0, "gnutls_x509_crt_list_verify[%d]: %s", (int)i,
           gnutls_strerror (ret));
 
   if (verify_status != (GNUTLS_CERT_SIGNER_NOT_FOUND | GNUTLS_CERT_INVALID))
@@ -228,7 +228,7 @@ main (int argc, char *argv[])
                                     GNUTLS_VERIFY_DISABLE_TIME_CHECKS,
                                     &verify_status);
   if (ret < 0)
-    error (EXIT_FAILURE, 0, "gnutls_x509_crt_list_verify[%d]: %s", i,
+    error (EXIT_FAILURE, 0, "gnutls_x509_crt_list_verify[%d]: %s", (int)i,
           gnutls_strerror (ret));
 
   if (verify_status != 0)

diff --git a/tests/dn2.c b/tests/dn2.c
index 5ea4fb9e11fba6a25f0e3a591307e850c6fb0695..ebe189e49e98fbd99f0364602ca097ad9d105da0 100644 (file)
--- a/tests/dn2.c
+++ b/tests/dn2.c
@@ -94,7 +94,7 @@ doit (void)
     success ("comparison ok\n");
   else
     fail ("comparison fail (%d/%d)\nexpect: %s\n   got: %.*s\n",
-         out.size, strlen (info), info, out.size, out.data);
+         out.size, (int)strlen (info), info, out.size, out.data);
 
   gnutls_x509_crt_deinit (cert);
   gnutls_global_deinit ();

diff --git a/tests/finished.c b/tests/finished.c
index f482ef8d8311245d49ce1ae7d2237612817fcc32..8567d470f214a2b82047b36a5baf45003e312671 100644 (file)
--- a/tests/finished.c
+++ b/tests/finished.c
@@ -49,7 +49,7 @@ size_t to_client_len;
 static ssize_t
 client_pull (gnutls_transport_ptr_t tr, void *data, size_t len)
 {
-  success ("client_pull len %d has %d\n", len, to_client_len);
+  success ("client_pull len %d has %d\n", (int)len, (int)to_client_len);
 
   if (to_client_len < len)
     {
@@ -71,7 +71,7 @@ client_push (gnutls_transport_ptr_t tr, const void *data, size_t len)
   size_t newlen = to_server_len + len;
   char *tmp;
 
-  success ("client_push len %d has %d\n", len, to_server_len);
+  success ("client_push len %d has %d\n", (int)len, (int)to_server_len);
   hexprint (data, len);
 
   tmp = realloc (to_server, newlen);
@@ -91,7 +91,7 @@ client_push (gnutls_transport_ptr_t tr, const void *data, size_t len)
 static ssize_t
 server_pull (gnutls_transport_ptr_t tr, void *data, size_t len)
 {
-  success ("server_pull len %d has %d\n", len, to_server_len);
+  success ("server_pull len %d has %d\n", (int)len, (int)to_server_len);
 
   if (to_server_len < len)
     {
@@ -113,7 +113,7 @@ server_push (gnutls_transport_ptr_t tr, const void *data, size_t len)
   size_t newlen = to_client_len + len;
   char *tmp;
 
-  success ("server_push len %d has %d\n", len, to_client_len);
+  success ("server_push len %d has %d\n", (int)len, (int)to_client_len);
 
   hexprint (data, len);
 
@@ -135,7 +135,7 @@ static void
 client_finished_callback (gnutls_session_t session,
                          const void *finished, size_t len)
 {
-  success ("client finished (length %d)\n", len);
+  success ("client finished (length %d)\n", (int)len);
   hexprint (finished, len);
 }
 
@@ -143,7 +143,7 @@ static void
 server_finished_callback (gnutls_session_t session,
                          const void *finished, size_t len)
 {
-  success ("server finished (length %d)\n", len);
+  success ("server finished (length %d)\n", (int)len);
   hexprint (finished, len);
 }
 
@@ -220,7 +220,7 @@ doit (void)
   success ("Handshake established\n");
 
   ns = gnutls_record_send (client, MSG, strlen (MSG));
-  success ("client: sent %d\n", ns);
+  success ("client: sent %d\n", (int)ns);
 
   ret = gnutls_record_recv (server, buffer, MAX_BUF);
   if (ret == 0)
@@ -236,7 +236,7 @@ doit (void)
     }
 
   ns = gnutls_record_send (server, MSG, strlen (MSG));
-  success ("server: sent %d\n", ns);
+  success ("server: sent %d\n", (int)ns);
 
   ret = gnutls_record_recv (client, buffer, MAX_BUF);
   if (ret == 0)

diff --git a/tests/mini.c b/tests/mini.c
index 21a426ee7e418e59899fc10b85d4e72716ef859b..e1da277632d1e2ba1d8bd664fa36d1f65d841abd 100644 (file)
--- a/tests/mini.c
+++ b/tests/mini.c
@@ -47,7 +47,7 @@ size_t to_client_len;
 static ssize_t
 client_pull (gnutls_transport_ptr_t tr, void *data, size_t len)
 {
-  success ("client_pull len %d has %d\n", len, to_client_len);
+  success ("client_pull len %d has %d\n", (int)len, (int)to_client_len);
 
   if (to_client_len < len)
     {
@@ -69,7 +69,7 @@ client_push (gnutls_transport_ptr_t tr, const void *data, size_t len)
   size_t newlen = to_server_len + len;
   char *tmp;
 
-  success ("client_push len %d has %d\n", len, to_server_len);
+  success ("client_push len %d has %d\n", (int)len, (int)to_server_len);
   hexprint (data, len);
 
   tmp = realloc (to_server, newlen);
@@ -89,7 +89,7 @@ client_push (gnutls_transport_ptr_t tr, const void *data, size_t len)
 static ssize_t
 server_pull (gnutls_transport_ptr_t tr, void *data, size_t len)
 {
-  success ("server_pull len %d has %d\n", len, to_server_len);
+  success ("server_pull len %d has %d\n", (int)len, (int)to_server_len);
 
   if (to_server_len < len)
     {
@@ -111,7 +111,7 @@ server_push (gnutls_transport_ptr_t tr, const void *data, size_t len)
   size_t newlen = to_client_len + len;
   char *tmp;
 
-  success ("server_push len %d has %d\n", len, to_client_len);
+  success ("server_push len %d has %d\n", (int)len, (int)to_client_len);
 
   hexprint (data, len);
 
@@ -200,7 +200,7 @@ doit (void)
   success ("Handshake established\n");
 
   ns = gnutls_record_send (client, MSG, strlen (MSG));
-  success ("client: sent %d\n", ns);
+  success ("client: sent %d\n", (int)ns);
 
   ret = gnutls_record_recv (server, buffer, MAX_BUF);
   if (ret == 0)
@@ -216,7 +216,7 @@ doit (void)
     }
 
   ns = gnutls_record_send (server, MSG, strlen (MSG));
-  success ("server: sent %d\n", ns);
+  success ("server: sent %d\n", (int)ns);
 
   ret = gnutls_record_recv (client, buffer, MAX_BUF);
   if (ret == 0)

diff --git a/tests/pkcs12_s2k_pem.c b/tests/pkcs12_s2k_pem.c
index 7298e19685d5df9d9e6a380fe2dd04afa355147f..9db3842162774c068305a4de0c242049c217c8df 100644 (file)
--- a/tests/pkcs12_s2k_pem.c
+++ b/tests/pkcs12_s2k_pem.c
@@ -284,7 +284,7 @@ main (void)
                                              keys[i].password, 0);
       if (ret != keys[i].expected_result)
        {
-         printf ("fail[%d]: %d: %s\n", i, ret, gnutls_strerror (ret));
+         printf ("fail[%d]: %d: %s\n", (int)i, ret, gnutls_strerror (ret));
          return 1;
        }
 

diff --git a/tests/tlsia.c b/tests/tlsia.c
index cc1dbce3453c8b06e7ab11a6c500503b46caf5d2..b2f684154a7e5f26348d4f1adf7d086815dea006 100644 (file)
--- a/tests/tlsia.c
+++ b/tests/tlsia.c
@@ -59,7 +59,7 @@ client_avp (gnutls_session_t session, void *ptr,
 
   if (last)
     printf ("client: received %d bytes AVP: `%.*s'\n",
-           lastlen, (int) lastlen, last);
+           (int)lastlen, (int) lastlen, last);
   else
     printf ("client: new application phase\n");
 
@@ -93,7 +93,7 @@ client_avp (gnutls_session_t session, void *ptr,
     return -1;
   *newlen = strlen (*new);
 
-  printf ("client: sending %d bytes AVP: `%s'\n", *newlen, *new);
+  printf ("client: sending %d bytes AVP: `%s'\n", (int)*newlen, *new);
 
   gnutls_ia_permute_inner_secret (session, 3, "foo");
 
@@ -291,7 +291,7 @@ server_avp (gnutls_session_t session, void *ptr,
 
   if (last)
     printf ("server: received %d bytes AVP: `%.*s'\n",
-           lastlen, (int) lastlen, last);
+           (int)lastlen, (int) lastlen, last);
 
   gnutls_ia_permute_inner_secret (session, 3, "foo");
 
@@ -355,7 +355,7 @@ server_avp (gnutls_session_t session, void *ptr,
     return -1;
   *newlen = strlen (*new);
 
-  printf ("server: sending %d bytes AVP: `%s'\n", *newlen, *new);
+  printf ("server: sending %d bytes AVP: `%s'\n", (int)*newlen, *new);
 
   return 0;
 }

diff --git a/tests/x509sign-verify.c b/tests/x509sign-verify.c
index 532114f297d127d07a508ff4834271e71a0bdf81..c844c35429996fbbd66269b5d973dc0254793a7b 100644 (file)
--- a/tests/x509sign-verify.c
+++ b/tests/x509sign-verify.c
@@ -147,7 +147,7 @@ doit (void)
 
   for (i = 0; i < sizeof (key_dat) / sizeof (key_dat[0]); i++)
     {
-      success ("loop %d\n", i);
+      success ("loop %d\n", (int)i);
 
       ret = gnutls_x509_privkey_init (&key);
       if (ret < 0)