fix transport parameter casts in tests

diff --git a/tests/anonself.c b/tests/anonself.c
index 843647164e870373cfd485cede2902caf38ee3e3..9cdaaf576ca8ad4de47cac1bdad7677fb58d761d 100644 (file)
--- a/tests/anonself.c
+++ b/tests/anonself.c
@@ -93,7 +93,7 @@ client (int sd)
    */
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+  gnutls_transport_set_int (session, sd);
 
   /* Perform the TLS handshake
    */
@@ -225,7 +225,7 @@ server (int sd)
 
   session = initialize_tls_session ();
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+  gnutls_transport_set_int (session, sd);
   ret = gnutls_handshake (session);
   if (ret < 0)
     {

diff --git a/tests/dhepskself.c b/tests/dhepskself.c
index ef7373bae2ec5d48919feec8cd714b74768e005a..dcb91fa15e0f49f534746d4859e441f63df82030 100644 (file)
--- a/tests/dhepskself.c
+++ b/tests/dhepskself.c
@@ -94,7 +94,7 @@ client (int sd)
    */
   gnutls_credentials_set (session, GNUTLS_CRD_PSK, pskcred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+  gnutls_transport_set_int (session, sd);
 
   /* Perform the TLS handshake
    */
@@ -227,7 +227,7 @@ server (int sd)
 
   session = initialize_tls_session ();
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+  gnutls_transport_set_int (session, sd);
   ret = gnutls_handshake (session);
   if (ret < 0)
     {

diff --git a/tests/dtls/dtls-stress.c b/tests/dtls/dtls-stress.c
index 814ea1b9a3f792f099828c946c0fda2f8f7d5de4..7e758bbbf3c44890954ef82a6bef04de3c3e94a6 100644 (file)
--- a/tests/dtls/dtls-stress.c
+++ b/tests/dtls/dtls-stress.c
@@ -396,7 +396,7 @@ static void filter_run_next(gnutls_transport_ptr_t fd,
        if (fn) {
                fn(fd, buffer, len);
        } else {
-               send((intptr_t) fd, buffer, len, 0);
+               send((int)(intptr_t) fd, buffer, len, 0);
        }
        filter_current_idx--;
 }
@@ -613,7 +613,7 @@ static void session_init(int sock, int server)
        gnutls_init(&session, GNUTLS_DATAGRAM | (server ? GNUTLS_SERVER : GNUTLS_CLIENT)
                        | GNUTLS_NONBLOCK * nonblock);
        gnutls_priority_set_direct(session, "+CTYPE-OPENPGP:+CIPHER-ALL:+MAC-ALL:+ECDHE-RSA:+ANON-ECDH", 0);
-       gnutls_transport_set_ptr(session, (gnutls_transport_ptr_t) (intptr_t) sock);
+       gnutls_transport_set_int(session, sock);
 
        if (full) {
                gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, cred);

diff --git a/tests/mini-alpn.c b/tests/mini-alpn.c
index 27f8d0fa3653f8bbf18c66c8dc52da1d59b3e07e..69ddd88191c81e1cd341c22bcba7b068be744004 100644 (file)
--- a/tests/mini-alpn.c
+++ b/tests/mini-alpn.c
@@ -117,7 +117,7 @@ client (int fd, const char* protocol1, const char* protocol2)
      */
     gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-    gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+    gnutls_transport_set_int (session, fd);
 
     /* Perform the TLS handshake
      */
@@ -221,7 +221,7 @@ server (int fd, const char* protocol1, const char* protocol2)
 
     gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-    gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+    gnutls_transport_set_int (session, fd);
 
     do
       {

diff --git a/tests/mini-deflate.c b/tests/mini-deflate.c
index f0789d7cabe3ac4f73f90ff150252cd75e2e89a3..f90d8cab36abd1a1f9a98064346c39372a5b4b9c 100644 (file)
--- a/tests/mini-deflate.c
+++ b/tests/mini-deflate.c
@@ -88,7 +88,7 @@ doit (void)
   gnutls_dh_set_prime_bits (server, 1024);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_anon_allocate_client_credentials (&c_anoncred);
@@ -102,7 +102,7 @@ doit (void)
   gnutls_credentials_set (client, GNUTLS_CRD_ANON, c_anoncred);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   HANDSHAKE(client, server);
 

diff --git a/tests/mini-dtls-heartbeat.c b/tests/mini-dtls-heartbeat.c
index 9fd6a487a10287c9b66421cafd3a6e60c52a2010..5b4d995aebdef5f7065dba07394c9730cfee60a6 100644 (file)
--- a/tests/mini-dtls-heartbeat.c
+++ b/tests/mini-dtls-heartbeat.c
@@ -109,7 +109,7 @@ client (int fd, int server_init)
      */
     gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-    gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+    gnutls_transport_set_int (session, fd);
 
     /* Perform the TLS handshake
      */
@@ -248,7 +248,7 @@ server (int fd, int server_init)
     session = initialize_tls_session ();
     gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-    gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+    gnutls_transport_set_int (session, fd);
 
     do
       {

diff --git a/tests/mini-dtls-hello-verify.c b/tests/mini-dtls-hello-verify.c
index fd45258f684e4f6b2e34be85fa6fe1e1b7a2b9c5..534d8a6178107dc931fe39bf85c31e540a599e87 100644 (file)
--- a/tests/mini-dtls-hello-verify.c
+++ b/tests/mini-dtls-hello-verify.c
@@ -110,7 +110,7 @@ client (int fd)
    */
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
   gnutls_transport_set_push_function (session, push);
 
   /* Perform the TLS handshake
@@ -223,7 +223,7 @@ gnutls_session_t session;
 
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
   gnutls_transport_set_push_function (session, push);
 
   for (;;)
@@ -241,7 +241,7 @@ gnutls_session_t session;
         {
           if (debug) success("Sending hello verify request\n");
 
-          ret = gnutls_dtls_cookie_send(&cookie_key, CLI_ADDR, CLI_ADDR_LEN, &prestate, (gnutls_transport_ptr_t)fd, push);
+          ret = gnutls_dtls_cookie_send(&cookie_key, CLI_ADDR, CLI_ADDR_LEN, &prestate, (gnutls_transport_ptr_t)(long)fd, push);
           if (ret < 0)
             {
               fail("Cannot send data\n");

diff --git a/tests/mini-dtls-large.c b/tests/mini-dtls-large.c
index 58c76afd4d40b8d0a840efae3078928349d7fab0..2aeea92421aee00f2898fc1b45834a0e50b88a1f 100644 (file)
--- a/tests/mini-dtls-large.c
+++ b/tests/mini-dtls-large.c
@@ -108,7 +108,7 @@ client (int fd)
      */
     gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-    gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+    gnutls_transport_set_int (session, fd);
 
     /* Perform the TLS handshake
      */
@@ -199,7 +199,7 @@ server (int fd)
 
     gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-    gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+    gnutls_transport_set_int (session, fd);
 
     do
       {

diff --git a/tests/mini-dtls-record.c b/tests/mini-dtls-record.c
index 6ff6a4a65be7367e1a3b61f67d668520a0dbfaca..5128d2ed9d98b79d844330a43f37b9d961143e82 100644 (file)
--- a/tests/mini-dtls-record.c
+++ b/tests/mini-dtls-record.c
@@ -217,7 +217,7 @@ client (int fd)
      */
     gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-    gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+    gnutls_transport_set_int (session, fd);
 
     /* Perform the TLS handshake
      */
@@ -334,7 +334,7 @@ server (int fd)
                                 NULL);
     gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-    gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+    gnutls_transport_set_int (session, fd);
 
     do
       {

diff --git a/tests/mini-dtls-rehandshake.c b/tests/mini-dtls-rehandshake.c
index c0af043a88429ce4df7092656f9b8858d13fd9ef..187d9297b4d0cecaea4ec08de80a0981b10a0c6e 100644 (file)
--- a/tests/mini-dtls-rehandshake.c
+++ b/tests/mini-dtls-rehandshake.c
@@ -111,7 +111,7 @@ client (int fd, int server_init)
    */
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
   gnutls_transport_set_push_function (session, push);
 
   /* Perform the TLS handshake
@@ -253,7 +253,7 @@ char buffer[MAX_BUF + 1];
 
   session = initialize_tls_session ();
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
   gnutls_transport_set_push_function (session, push);
 
   do 

diff --git a/tests/mini-dtls-srtp.c b/tests/mini-dtls-srtp.c
index 85686b53d4779f9a453425fe3e8daa2c5bfa73c1..6d3d8000bd6beb7b98743e0d984909e1dbc812f1 100644 (file)
--- a/tests/mini-dtls-srtp.c
+++ b/tests/mini-dtls-srtp.c
@@ -121,7 +121,7 @@ client (int fd, int profile)
      */
     gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-    gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+    gnutls_transport_set_int (session, fd);
 
     /* Perform the TLS handshake
      */
@@ -243,7 +243,7 @@ server (int fd, int profile)
 
     gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-    gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+    gnutls_transport_set_int (session, fd);
 
     do
       {

diff --git a/tests/mini-eagain-dtls.c b/tests/mini-eagain-dtls.c
index fe05621f170c8e146385c397723ac193ad292846..93041114f451814abf09202de7374ac762f5ac60 100644 (file)
--- a/tests/mini-eagain-dtls.c
+++ b/tests/mini-eagain-dtls.c
@@ -84,7 +84,7 @@ doit (void)
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
   gnutls_transport_set_pull_timeout_function (server, server_pull_timeout_func);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_anon_allocate_client_credentials (&c_anoncred);
@@ -96,7 +96,7 @@ doit (void)
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
   gnutls_transport_set_pull_timeout_function (client, client_pull_timeout_func);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   handshake = 1;
   HANDSHAKE(client, server);

diff --git a/tests/mini-eagain.c b/tests/mini-eagain.c
index 7d7d779c813855a27b3c95a47d245137b6a0c73d..da856932f1292cb4bf274654bc7b09a50aaa82e4 100644 (file)
--- a/tests/mini-eagain.c
+++ b/tests/mini-eagain.c
@@ -84,7 +84,7 @@ doit (void)
   gnutls_dh_set_prime_bits (server, 1024);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_anon_allocate_client_credentials (&c_anoncred);
@@ -95,7 +95,7 @@ doit (void)
   gnutls_credentials_set (client, GNUTLS_CRD_ANON, c_anoncred);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   handshake = 1;
   HANDSHAKE(client, server);

diff --git a/tests/mini-emsgsize-dtls.c b/tests/mini-emsgsize-dtls.c
index dadb82f0850b15312df4fcb5df7eb4537b8a238c..ba1313d4bb421e258ae458142c7fe1612020cb84 100644 (file)
--- a/tests/mini-emsgsize-dtls.c
+++ b/tests/mini-emsgsize-dtls.c
@@ -131,7 +131,7 @@ doit (void)
   gnutls_transport_set_push_function (server, server_push_300);
   gnutls_transport_set_pull_function (server, server_pull);
   gnutls_transport_set_pull_timeout_function (server, server_pull_timeout_func);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_anon_allocate_client_credentials (&c_anoncred);
@@ -143,7 +143,7 @@ doit (void)
   gnutls_transport_set_push_function (client, client_push_300);
   gnutls_transport_set_pull_function (client, client_pull);
   gnutls_transport_set_pull_timeout_function (client, client_pull_timeout_func);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   handshake = 1;
   HANDSHAKE_DTLS(client, server);

diff --git a/tests/mini-handshake-timeout.c b/tests/mini-handshake-timeout.c
index 0b220097abef2337f6dabd6fb26bb57c8716df23..7079aff7ee50f9dd90061153035ef751cf4f51ff 100644 (file)
--- a/tests/mini-handshake-timeout.c
+++ b/tests/mini-handshake-timeout.c
@@ -97,7 +97,7 @@ client (int fd, int wait)
    */
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
 
   /* Perform the TLS handshake
    */
@@ -167,7 +167,7 @@ gnutls_anon_server_credentials_t anoncred;
   initialize_tls_session (&session);
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
 
   if (wait) sleep(25);
   else do 

diff --git a/tests/mini-loss-time.c b/tests/mini-loss-time.c
index 659a5fcc448aec90920cb3616db2c52f193b18fb..6b88eb93783cadcc17917409a0c48396a52b987b 100644 (file)
--- a/tests/mini-loss-time.c
+++ b/tests/mini-loss-time.c
@@ -152,7 +152,7 @@ client (int fd, int packet)
   counter = 0;
   packet_to_lose = packet;
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
   gnutls_transport_set_push_function (session, push);
 
   /* Perform the TLS handshake
@@ -226,7 +226,7 @@ int ret;
   counter = 0;
   packet_to_lose = packet;
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
   gnutls_transport_set_push_function (session, push);
 
   do 

diff --git a/tests/mini-overhead.c b/tests/mini-overhead.c
index 1802079461f65b6868a15991c10e27d4f47ff518..fb6ceae35287bd6f11202de8e8b1c8f1661d3ed2 100644 (file)
--- a/tests/mini-overhead.c
+++ b/tests/mini-overhead.c
@@ -152,7 +152,7 @@ client (int fd, const char* prio, unsigned overhead)
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
   gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
 
   /* Perform the TLS handshake
    */
@@ -254,7 +254,7 @@ gnutls_session_t session;
 
   session = initialize_tls_session (prio);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
 
   do 
     {

diff --git a/tests/mini-record-range.c b/tests/mini-record-range.c
index 5d53d4aa5139828a23203d1be005553c860c8bd9..532ace27a3c829e136dd8d902bed13ee0c8987b3 100644 (file)
--- a/tests/mini-record-range.c
+++ b/tests/mini-record-range.c
@@ -162,7 +162,7 @@ client (int fd, const char* prio)
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
   gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
 
   /* Perform the TLS handshake
    */
@@ -276,7 +276,7 @@ gnutls_range_st range;
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
   gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
 
   do 
     {

diff --git a/tests/mini-record.c b/tests/mini-record.c
index 88a8ccbe4fc669dc2d724bf269ce351c9e5ff9d5..4f0316f4e94133e3803fab47cfd17456dd791f8a 100644 (file)
--- a/tests/mini-record.c
+++ b/tests/mini-record.c
@@ -191,7 +191,7 @@ client (int fd, const char* prio)
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
   gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
   gnutls_transport_set_push_function (session, push);
 
   /* Perform the TLS handshake
@@ -301,7 +301,7 @@ gnutls_certificate_credentials_t x509_cred;
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
   gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
   gnutls_transport_set_push_function (session, push_crippled);
 
   do 

diff --git a/tests/mini-rehandshake.c b/tests/mini-rehandshake.c
index ad5f9b9f4f59fc32afbbf137c246d5e924a1e3fe..d3fe336319035ed670e13b11e04f18ae87a836ea 100644 (file)
--- a/tests/mini-rehandshake.c
+++ b/tests/mini-rehandshake.c
@@ -110,7 +110,7 @@ doit (void)
   gnutls_priority_set_direct (server, "NORMAL", NULL);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_certificate_allocate_credentials (&clientx509cred);
@@ -119,7 +119,7 @@ doit (void)
   gnutls_priority_set_direct (client, "NORMAL", NULL);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   HANDSHAKE(client, server);
 

diff --git a/tests/mini-termination.c b/tests/mini-termination.c
index f7c406feff60d9365a71e8923c0d2a6788f3ab4d..c4741b59eddb37833ec9f91db10c6d937ba77c0b 100644 (file)
--- a/tests/mini-termination.c
+++ b/tests/mini-termination.c
@@ -147,7 +147,7 @@ client (int fd, const char* prio)
   gnutls_credentials_set (session, GNUTLS_CRD_ANON, anoncred);
   gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
 
   /* Perform the TLS handshake
    */
@@ -258,7 +258,7 @@ gnutls_session_t session;
 
   session = initialize_tls_session (prio);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
 
   do 
     {

diff --git a/tests/mini-x509-2.c b/tests/mini-x509-2.c
index f34dc956d64eb9db40b450ef87b3fd4f1af7ca20..7e98e5ab8d07944864262188b26711fce0568460 100644 (file)
--- a/tests/mini-x509-2.c
+++ b/tests/mini-x509-2.c
@@ -145,7 +145,7 @@ void doit(void)
   gnutls_priority_set_direct (server, "NORMAL:-CIPHER-ALL:+AES-128-GCM", NULL);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_certificate_allocate_credentials (&clientx509cred);
@@ -154,7 +154,7 @@ void doit(void)
   gnutls_priority_set_direct (client, "NORMAL", NULL);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   HANDSHAKE(client, server);
 

diff --git a/tests/mini-x509-callbacks.c b/tests/mini-x509-callbacks.c
index 64315525ec7d56e02612e91c27ea75e4a473a28c..9531c1cc2e5dcd89afc31490f35e977e4916a53e 100644 (file)
--- a/tests/mini-x509-callbacks.c
+++ b/tests/mini-x509-callbacks.c
@@ -160,7 +160,7 @@ void doit(void)
   gnutls_priority_set_direct (server, "NORMAL", NULL);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
   gnutls_certificate_set_verify_function (serverx509cred, server_callback);
   gnutls_certificate_server_set_request (server, GNUTLS_CERT_REQUEST);
   gnutls_handshake_set_post_client_hello_function (server, post_client_hello_callback);
@@ -173,7 +173,7 @@ void doit(void)
   gnutls_priority_set_direct (client, "NORMAL", NULL);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
   gnutls_certificate_set_verify_function (clientx509cred, client_callback);
 
   HANDSHAKE(client, server);

diff --git a/tests/mini-x509-cas.c b/tests/mini-x509-cas.c
index e17c438507842e587fdba5e336f05b41fc5c9439..5e42093292148de5a858fa1d7fdb02ae0974b053 100644 (file)
--- a/tests/mini-x509-cas.c
+++ b/tests/mini-x509-cas.c
@@ -127,7 +127,7 @@ void doit(void)
   gnutls_priority_set_direct (server, "NORMAL", NULL);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_certificate_allocate_credentials (&clientx509cred);
@@ -136,7 +136,7 @@ void doit(void)
   gnutls_priority_set_direct (client, "NORMAL", NULL);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   HANDSHAKE(client, server);
 

diff --git a/tests/mini-x509.c b/tests/mini-x509.c
index 8c8e51b2f627ad84d283952e3a1f9463ddc018a2..d05dbf821e18a6772c53329be69b130ba859c237 100644 (file)
--- a/tests/mini-x509.c
+++ b/tests/mini-x509.c
@@ -109,7 +109,7 @@ void doit(void)
   gnutls_priority_set_direct (server, "NORMAL:-CIPHER-ALL:+ARCFOUR-128", NULL);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_certificate_allocate_credentials (&clientx509cred);
@@ -118,7 +118,7 @@ void doit(void)
   gnutls_priority_set_direct (client, "NORMAL", NULL);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   HANDSHAKE(client, server);
 

diff --git a/tests/mini-xssl.c b/tests/mini-xssl.c
index 1eef7c84d976a529eafda4674e41877fe7cb74ea..f448ca964480f7fb990cbeb469cb44cf14bac16a 100644 (file)
--- a/tests/mini-xssl.c
+++ b/tests/mini-xssl.c
@@ -201,7 +201,7 @@ client (int fd, unsigned int vmethod, unsigned use_cert)
 
   /* Initialize TLS session
    */
-  ret = xssl_client_init(&sb, "localhost", NULL, (gnutls_transport_ptr_t)fd,
+  ret = xssl_client_init(&sb, "localhost", NULL, (gnutls_transport_ptr_t)(long)fd,
                                 NULL, cred, &status, 0);
   if (ret < 0)
     {
@@ -299,7 +299,7 @@ server (int fd, unsigned vmethod)
 
   /* Initialize TLS session
    */
-  ret = xssl_server_init(&sb, (gnutls_transport_ptr_t)fd,
+  ret = xssl_server_init(&sb, (gnutls_transport_ptr_t)(long)fd,
                                 NULL, cred, NULL, 0);
   if (ret < 0)
     err_quit(ret);

diff --git a/tests/openpgp-auth.c b/tests/openpgp-auth.c
index d2a1e95f5fef0575aa6d40ada64d160c4f549cfb..ac2b61635750b00f6a7e82b2d3f581b0500bccae 100644 (file)
--- a/tests/openpgp-auth.c
+++ b/tests/openpgp-auth.c
@@ -137,9 +137,7 @@ doit ()
             gnutls_priority_set_direct (session,
                                       "NONE:+VERS-TLS1.0:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+DHE-DSS:+DHE-RSA:+CTYPE-OPENPGP",
                                       NULL);
-          gnutls_transport_set_ptr (session,
-                                    (gnutls_transport_ptr_t) (intptr_t)
-                                    sockets[0]);
+          gnutls_transport_set_int (session, sockets[0]);
 
           err = gnutls_certificate_allocate_credentials (&cred);
           if (err != 0)
@@ -209,9 +207,7 @@ doit ()
           gnutls_priority_set_direct (session,
                                       "NONE:+VERS-TLS1.0:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+DHE-DSS:+DHE-RSA:+RSA:+CTYPE-OPENPGP",
                                       NULL);
-          gnutls_transport_set_ptr (session,
-                                    (gnutls_transport_ptr_t) (intptr_t)
-                                    sockets[1]);
+          gnutls_transport_set_int (session, sockets[1]);
 
           err = gnutls_certificate_allocate_credentials (&cred);
           if (err != 0)

diff --git a/tests/openpgp-auth2.c b/tests/openpgp-auth2.c
index 9de1497d78e85a7f0714b026c9175071931aff63..ab2f3a92bcfa9e1713c80b59b88e292d8994b353 100644 (file)
--- a/tests/openpgp-auth2.c
+++ b/tests/openpgp-auth2.c
@@ -119,9 +119,7 @@ doit ()
         fail ("client session %d\n", err);
 
       gnutls_priority_set_direct (session, "NONE:+VERS-TLS1.2:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+DHE-DSS:+DHE-RSA:+CTYPE-OPENPGP", NULL);
-      gnutls_transport_set_ptr (session,
-                                (gnutls_transport_ptr_t) (intptr_t)
-                                sockets[0]);
+      gnutls_transport_set_int (session, sockets[0]);
 
       err = gnutls_certificate_allocate_credentials (&cred);
       if (err != 0)
@@ -182,9 +180,7 @@ doit ()
         fail ("server session %d\n", err);
 
       gnutls_priority_set_direct (session, "NONE:+VERS-TLS1.2:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+DHE-DSS:+DHE-RSA:+CTYPE-OPENPGP", NULL);
-      gnutls_transport_set_ptr (session,
-                                (gnutls_transport_ptr_t) (intptr_t)
-                                sockets[1]);
+      gnutls_transport_set_int (session, sockets[1]);
 
       err = gnutls_certificate_allocate_credentials (&cred);
       if (err != 0)

diff --git a/tests/openpgpself.c b/tests/openpgpself.c
index 80b016d8530ecb26c83348243c4961e55dbccb79..950c67f64eb3930ebee91733944ba1deb7d0aa74 100644 (file)
--- a/tests/openpgpself.c
+++ b/tests/openpgpself.c
@@ -186,7 +186,7 @@ client (int sds[])
        */
       gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);
 
-      gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+      gnutls_transport_set_int (session, sd);
 
       /* Perform the TLS handshake
        */
@@ -532,7 +532,7 @@ server (int sds[])
 
       session = initialize_tls_session ();
 
-      gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+      gnutls_transport_set_int (session, sd);
       ret = gnutls_handshake (session);
       if (ret < 0)
         {

diff --git a/tests/pskself.c b/tests/pskself.c
index ed5229dba485ae99ac08354a0ccfd4e64f556df0..3c924dddf2c03653341a6738512b1f88cce14c5b 100644 (file)
--- a/tests/pskself.c
+++ b/tests/pskself.c
@@ -98,7 +98,7 @@ client (int sd)
    */
   gnutls_credentials_set (session, GNUTLS_CRD_PSK, pskcred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+  gnutls_transport_set_int (session, sd);
 
   /* Perform the TLS handshake
    */
@@ -216,7 +216,7 @@ server (int sd)
 
   session = initialize_tls_session ();
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+  gnutls_transport_set_int (session, sd);
   ret = gnutls_handshake (session);
   if (ret < 0)
     {

diff --git a/tests/record-sizes-range.c b/tests/record-sizes-range.c
index 9ad15957720ddb155970f4b8c3dfb992516482da..e3eac2fc878ed3f9b1589fae57adad4e376be118 100644 (file)
--- a/tests/record-sizes-range.c
+++ b/tests/record-sizes-range.c
@@ -122,7 +122,7 @@ doit (void)
   gnutls_dh_set_prime_bits (server, 1024);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_anon_allocate_client_credentials (&c_anoncred);
@@ -131,7 +131,7 @@ doit (void)
   gnutls_credentials_set (client, GNUTLS_CRD_ANON, c_anoncred);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   memset(b1, 0, sizeof(b1));
   HANDSHAKE(client, server);

diff --git a/tests/record-sizes.c b/tests/record-sizes.c
index 7c84c5f5fb5784f05d010266c9bc7d0a29f99269..67773ba3245f50f3ee78e746e3906ff47c2eac5a 100644 (file)
--- a/tests/record-sizes.c
+++ b/tests/record-sizes.c
@@ -82,7 +82,7 @@ doit (void)
   gnutls_dh_set_prime_bits (server, 1024);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_anon_allocate_client_credentials (&c_anoncred);
@@ -91,7 +91,7 @@ doit (void)
   gnutls_credentials_set (client, GNUTLS_CRD_ANON, c_anoncred);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   memset(b1, 0, sizeof(b1));
   HANDSHAKE(client, server);

diff --git a/tests/resume-dtls.c b/tests/resume-dtls.c
index 65cf3c2ea537c8f08544378cc81ba6d0ae1cd069..fdb55452552aac0ad3cf04ef73ba5a7a6e3ba167 100644 (file)
--- a/tests/resume-dtls.c
+++ b/tests/resume-dtls.c
@@ -140,7 +140,7 @@ client (int sds[], struct params_res *params)
           gnutls_free (session_data.data);
         }
 
-      gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+      gnutls_transport_set_int (session, sd);
 
       /* Perform the TLS handshake
        */
@@ -340,7 +340,7 @@ server (int sds[], struct params_res *params)
 
       session = initialize_tls_session (params);
 
-      gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+      gnutls_transport_set_int (session, sd);
       ret = gnutls_handshake (session);
       if (ret < 0)
         {

diff --git a/tests/resume.c b/tests/resume.c
index 6156007ef96304ce8173826235af25e07d491fd9..fda40013d9cf429328ad86773581cd98446b60d6 100644 (file)
--- a/tests/resume.c
+++ b/tests/resume.c
@@ -141,7 +141,7 @@ client (int sds[], struct params_res *params)
           gnutls_free (session_data.data);
         }
 
-      gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+      gnutls_transport_set_int (session, sd);
 
       /* Perform the TLS handshake
        */
@@ -341,7 +341,7 @@ server (int sds[], struct params_res *params)
 
       session = initialize_tls_session (params);
 
-      gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+      gnutls_transport_set_int (session, sd);
       ret = gnutls_handshake (session);
       if (ret < 0)
         {

diff --git a/tests/safe-renegotiation/srn0.c b/tests/safe-renegotiation/srn0.c
index 6de25f5018f51e1b00a399dfa09caa4994c0134e..3ef03687e1c8d565b501703ef3e9ce9ca715fc72 100644 (file)
--- a/tests/safe-renegotiation/srn0.c
+++ b/tests/safe-renegotiation/srn0.c
@@ -115,7 +115,7 @@ void doit(void)
   gnutls_priority_set_direct (server, "NORMAL", NULL);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_certificate_allocate_credentials (&clientx509cred);
@@ -124,7 +124,7 @@ void doit(void)
   gnutls_priority_set_direct (client, "NORMAL", NULL);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   HANDSHAKE(client, server);
 

diff --git a/tests/safe-renegotiation/srn1.c b/tests/safe-renegotiation/srn1.c
index 4d400d0b0dc9db88f3719774221277bb853f5c64..6a1df1ac98b787fc8d6e4cc4958254524b8b8f93 100644 (file)
--- a/tests/safe-renegotiation/srn1.c
+++ b/tests/safe-renegotiation/srn1.c
@@ -114,7 +114,7 @@ void doit(void)
   gnutls_priority_set_direct (server, "NORMAL:%SAFE_RENEGOTIATION", NULL);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_certificate_allocate_credentials (&clientx509cred);
@@ -124,7 +124,7 @@ void doit(void)
                               NULL);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   /* Check that initially no session use the extension. */
   if (gnutls_safe_renegotiation_status (server)

diff --git a/tests/safe-renegotiation/srn2.c b/tests/safe-renegotiation/srn2.c
index 613470f749bd5a4e7c0b4605bfef2bcf68c60ec6..789c29cc893962a880723f4af1be0c3323e83c20 100644 (file)
--- a/tests/safe-renegotiation/srn2.c
+++ b/tests/safe-renegotiation/srn2.c
@@ -112,7 +112,7 @@ void doit(void)
   gnutls_priority_set_direct (server, "NORMAL", NULL);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_certificate_allocate_credentials (&clientx509cred);
@@ -121,7 +121,7 @@ void doit(void)
   gnutls_priority_set_direct (client, "NORMAL", NULL);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   /* Check that initially no session use the extension. */
   if (gnutls_safe_renegotiation_status (server)

diff --git a/tests/safe-renegotiation/srn3.c b/tests/safe-renegotiation/srn3.c
index aef6f18fe45790f1e1a00a9d89532bd2de8c1358..ecade2afad4d5ed884ccc5a8b0ab4fbbd83cbdfc 100644 (file)
--- a/tests/safe-renegotiation/srn3.c
+++ b/tests/safe-renegotiation/srn3.c
@@ -115,7 +115,7 @@ void doit(void)
                               NULL);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_certificate_allocate_credentials (&clientx509cred);
@@ -124,7 +124,7 @@ void doit(void)
   gnutls_priority_set_direct (client, "NORMAL:%SAFE_RENEGOTIATION", NULL);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   /* Check that initially no session use the extension. */
   if (gnutls_safe_renegotiation_status (server)

diff --git a/tests/safe-renegotiation/srn4.c b/tests/safe-renegotiation/srn4.c
index 5e47154604401646801ccd650120837bb2f0db8e..45552612da8e7664d5cd64890b33d89c5f04713d 100644 (file)
--- a/tests/safe-renegotiation/srn4.c
+++ b/tests/safe-renegotiation/srn4.c
@@ -114,7 +114,7 @@ void doit(void)
   gnutls_priority_set_direct (server, "NORMAL", NULL);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_certificate_allocate_credentials (&clientx509cred);
@@ -124,7 +124,7 @@ void doit(void)
                               NULL);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   HANDSHAKE(client, server);
 

diff --git a/tests/safe-renegotiation/srn5.c b/tests/safe-renegotiation/srn5.c
index fd2a2cf41d2b840ac0bd76a1c472d088d42c7ee1..8b7926347f41977406042a010ccd29f85db6b717 100644 (file)
--- a/tests/safe-renegotiation/srn5.c
+++ b/tests/safe-renegotiation/srn5.c
@@ -116,7 +116,7 @@ void doit(void)
                               NULL);
   gnutls_transport_set_push_function (server, server_push);
   gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_transport_set_ptr (server, (gnutls_transport_ptr_t)server);
+  gnutls_transport_set_ptr (server, server);
 
   /* Init client */
   gnutls_certificate_allocate_credentials (&clientx509cred);
@@ -125,7 +125,7 @@ void doit(void)
   gnutls_priority_set_direct (client, "NORMAL", NULL);
   gnutls_transport_set_push_function (client, client_push);
   gnutls_transport_set_pull_function (client, client_pull);
-  gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
+  gnutls_transport_set_ptr (client, client);
 
   HANDSHAKE(client, server);
 

diff --git a/tests/srp/mini-srp.c b/tests/srp/mini-srp.c
index f6c7d0e48464306a0b324f0d937b145ad4476581..70a684f0d96f4ebdff286feb41e6b712533220a2 100644 (file)
--- a/tests/srp/mini-srp.c
+++ b/tests/srp/mini-srp.c
@@ -140,7 +140,7 @@ client (int fd, const char* prio)
   gnutls_credentials_set (session, GNUTLS_CRD_SRP, srp_cred);
   gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, x509_cred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
 
   /* Perform the TLS handshake
    */
@@ -239,7 +239,7 @@ gnutls_session_t session;
 
   session = initialize_tls_session (prio);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
 
   do 
     {

diff --git a/tests/suite/mini-eagain2.c b/tests/suite/mini-eagain2.c
index e1ee2115cb8a0d83cc12e1d97a6e9f2fe8f7eb08..11a91a4ddb93d00972942db49ccc34d6e22f5ac1 100644 (file)
--- a/tests/suite/mini-eagain2.c
+++ b/tests/suite/mini-eagain2.c
@@ -188,7 +188,7 @@ main (void)
       sd = tcp_connect ();
 
       /* associate gnutls with socket */
-      gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t) sd);
+      gnutls_transport_set_int (client, sd);
       /* add a callback for data being available for send/receive on socket */
       if (!ecore_main_fd_handler_add(sd, ECORE_FD_READ | ECORE_FD_WRITE, (Ecore_Fd_Cb)_process_data, client, NULL, NULL))
         {

diff --git a/tests/suite/mini-record-timing.c b/tests/suite/mini-record-timing.c
index 527c3ba5dedcef5c885a3334783439a5b4bcb183..bdc7a451054b54e9f6b747fecbb9d8f65039b000 100644 (file)
--- a/tests/suite/mini-record-timing.c
+++ b/tests/suite/mini-record-timing.c
@@ -305,7 +305,7 @@ restart:
   /* put the anonymous credentials to the current session
    */
   gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, x509_cred);
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
 
   /* Perform the TLS handshake
    */
@@ -483,7 +483,7 @@ restart:
   }
 
   gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, x509_cred);
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) fd);
+  gnutls_transport_set_int (session, fd);
 
   do 
     {

diff --git a/tests/x509dn.c b/tests/x509dn.c
index 1ecc51941e40a777207c0a9809b6dd7ec90d8ac3..0af95e5c4f149a774cf7ed4434e22caf206b4b93 100644 (file)
--- a/tests/x509dn.c
+++ b/tests/x509dn.c
@@ -223,7 +223,7 @@ client (int sd)
    */
   gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+  gnutls_transport_set_int (session, sd);
 
   /* Perform the TLS handshake
    */
@@ -409,7 +409,7 @@ server (int sd)
 
   session = initialize_tls_session ();
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+  gnutls_transport_set_int (session, sd);
   ret = gnutls_handshake (session);
   if (ret < 0)
     {

diff --git a/tests/x509self.c b/tests/x509self.c
index e52c0558c2d98a3b76573d83a485f78aaa02f604..91a696d843f63684db1693c475fb8a4f941c3d7c 100644 (file)
--- a/tests/x509self.c
+++ b/tests/x509self.c
@@ -152,7 +152,7 @@ client (int sd)
    */
   gnutls_credentials_set (session, GNUTLS_CRD_CERTIFICATE, xcred);
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+  gnutls_transport_set_int (session, sd);
 
   /* Perform the TLS handshake
    */
@@ -371,7 +371,7 @@ server (int sd)
 
   session = initialize_tls_session ();
 
-  gnutls_transport_set_ptr (session, (gnutls_transport_ptr_t) sd);
+  gnutls_transport_set_int (session, sd);
   ret = gnutls_handshake (session);
   if (ret < 0)
     {