Removed check on deprecated feature (finished).

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 15d03a44275779b2d6893ee7e89e0dc3d0db9222..bc099e46cda3949257d5c39aa16a3543cc7a8c6e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -56,7 +56,7 @@ libutils_la_SOURCES = utils.h utils.c
 
 ctests = simple gc set_pkcs12_cred certder certuniqueid mpi                    \
        certificate_set_x509_crl dn parse_ca moredn crypto_rng mini     \
-       finished hostname-check cve-2008-4989 pkcs12_s2k chainverify    \
+       hostname-check cve-2008-4989 pkcs12_s2k chainverify     \
        crq_key_id x509sign-verify cve-2009-1415 cve-2009-1416          \
        crq_apis init_roundtrip pkcs12_s2k_pem dn2 mini-eagain          \
        nul-in-x509-names x509_altname pkcs12_encode mini-x509          \

diff --git a/tests/finished.c b/tests/finished.c
deleted file mode 100644 (file)
index afbdbcf..0000000
--- a/tests/finished.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * Copyright (C) 2008, 2010 Free Software Foundation, Inc.
- *
- * Author: Simon Josefsson
- *
- * This file is part of GnuTLS.
- *
- * GnuTLS is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * GnuTLS is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GnuTLS; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/* Based on mini.c. */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <gnutls/gnutls.h>
-
-#include "utils.h"
-
-static void
-tls_log_func (int level, const char *str)
-{
-  fprintf (stderr, "|<%d>| %s", level, str);
-}
-
-char *to_server;
-size_t to_server_len;
-
-char *to_client;
-size_t to_client_len;
-
-static ssize_t
-client_pull (gnutls_transport_ptr_t tr, void *data, size_t len)
-{
-  if (debug)
-    success ("client_pull len %d has %d\n", (int) len, (int) to_client_len);
-
-  if (to_client_len < len)
-    {
-      gnutls_transport_set_global_errno (EAGAIN);
-      return -1;
-    }
-
-  memcpy (data, to_client, len);
-
-  memmove (to_client, to_client + len, to_client_len - len);
-  to_client_len -= len;
-
-  return len;
-}
-
-static ssize_t
-client_push (gnutls_transport_ptr_t tr, const void *data, size_t len)
-{
-  size_t newlen = to_server_len + len;
-  char *tmp;
-
-  if (debug)
-    {
-      success ("client_push len %d has %d\n", (int) len, (int) to_server_len);
-      hexprint (data, len);
-    }
-
-  tmp = realloc (to_server, newlen);
-  if (!tmp)
-    {
-      fail ("Memory allocation failure...\n");
-      exit (1);
-    }
-  to_server = tmp;
-
-  memcpy (to_server + to_server_len, data, len);
-  to_server_len = newlen;
-
-  return len;
-}
-
-static ssize_t
-server_pull (gnutls_transport_ptr_t tr, void *data, size_t len)
-{
-  if (debug)
-    success ("server_pull len %d has %d\n", (int) len, (int) to_server_len);
-
-  if (to_server_len < len)
-    {
-      gnutls_transport_set_global_errno (EAGAIN);
-      return -1;
-    }
-
-  memcpy (data, to_server, len);
-
-  memmove (to_server, to_server + len, to_server_len - len);
-  to_server_len -= len;
-
-  return len;
-}
-
-static ssize_t
-server_push (gnutls_transport_ptr_t tr, const void *data, size_t len)
-{
-  size_t newlen = to_client_len + len;
-  char *tmp;
-
-  if (debug)
-    {
-      success ("server_push len %d has %d\n", (int) len, (int) to_client_len);
-      hexprint (data, len);
-    }
-
-  tmp = realloc (to_client, newlen);
-  if (!tmp)
-    {
-      fail ("Memory allocation failure...\n");
-      exit (1);
-    }
-  to_client = tmp;
-
-  memcpy (to_client + to_client_len, data, len);
-  to_client_len = newlen;
-
-  return len;
-}
-
-static void
-client_finished_callback (gnutls_session_t session,
-                         const void *finished, size_t len)
-{
-  if (debug)
-    {
-      success ("client finished (length %d)\n", (int) len);
-      hexprint (finished, len);
-    }
-}
-
-static void
-server_finished_callback (gnutls_session_t session,
-                         const void *finished, size_t len)
-{
-  if (debug)
-    {
-      success ("server finished (length %d)\n", (int) len);
-      hexprint (finished, len);
-    }
-}
-
-#define MAX_BUF 1024
-#define MSG "Hello TLS"
-
-void
-doit (void)
-{
-  /* Server stuff. */
-  gnutls_anon_server_credentials_t s_anoncred;
-  const gnutls_datum_t p3 = { (char *) pkcs3, strlen (pkcs3) };
-  static gnutls_dh_params_t dh_params;
-  gnutls_session_t server;
-  int sret = GNUTLS_E_AGAIN;
-  /* Client stuff. */
-  gnutls_anon_client_credentials_t c_anoncred;
-  gnutls_session_t client;
-  int n, cret = GNUTLS_E_AGAIN;
-  /* Need to enable anonymous KX specifically. */
-  const int kx_prio[] = { GNUTLS_KX_ANON_DH, 0 };
-  char buffer[MAX_BUF + 1];
-  ssize_t ns;
-  int ret;
-
-  /* General init. */
-  gnutls_global_init ();
-  gnutls_global_set_log_function (tls_log_func);
-  if (debug)
-    gnutls_global_set_log_level (4711);
-
-  /* Init server */
-  gnutls_anon_allocate_server_credentials (&s_anoncred);
-  gnutls_dh_params_init (&dh_params);
-  gnutls_dh_params_import_pkcs3 (dh_params, &p3, GNUTLS_X509_FMT_PEM);
-  gnutls_anon_set_server_dh_params (s_anoncred, dh_params);
-  gnutls_init (&server, GNUTLS_SERVER);
-  gnutls_set_default_priority (server);
-  gnutls_kx_set_priority (server, kx_prio);
-  gnutls_credentials_set (server, GNUTLS_CRD_ANON, s_anoncred);
-  gnutls_dh_set_prime_bits (server, 1024);
-  gnutls_transport_set_push_function (server, server_push);
-  gnutls_transport_set_pull_function (server, server_pull);
-  gnutls_session_set_finished_function (server, server_finished_callback);
-
-  /* Init client */
-  gnutls_anon_allocate_client_credentials (&c_anoncred);
-  gnutls_init (&client, GNUTLS_CLIENT);
-  gnutls_set_default_priority (client);
-  gnutls_kx_set_priority (client, kx_prio);
-  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_session_set_finished_function (client, client_finished_callback);
-
-  do
-    {
-      if (cret == GNUTLS_E_AGAIN)
-       {
-         if (debug)
-           success ("loop invoking client:\n");
-         cret = gnutls_handshake (client);
-         if (debug)
-           success ("client %d: %s\n", cret, gnutls_strerror (cret));
-       }
-
-      if (sret == GNUTLS_E_AGAIN)
-       {
-         if (debug)
-           success ("loop invoking server:\n");
-         sret = gnutls_handshake (server);
-         if (debug)
-           success ("server %d: %s\n", sret, gnutls_strerror (sret));
-       }
-    }
-  while (cret == GNUTLS_E_AGAIN || sret == GNUTLS_E_AGAIN);
-
-  if (debug)
-    success ("Handshake established\n");
-
-  ns = gnutls_record_send (client, MSG, strlen (MSG));
-  if (debug)
-    success ("client: sent %d\n", (int) ns);
-
-  ret = gnutls_record_recv (server, buffer, MAX_BUF);
-  if (ret == 0)
-    fail ("server: didn't receive any data\n");
-  else if (ret < 0)
-    fail ("server: error: %s\n", gnutls_strerror (ret));
-  else if (debug)
-    {
-      printf ("server: received %d: ", ret);
-      for (n = 0; n < ret; n++)
-       fputc (buffer[n], stdout);
-      fputs ("\n", stdout);
-    }
-
-  ns = gnutls_record_send (server, MSG, strlen (MSG));
-  if (debug)
-    success ("server: sent %d\n", (int) ns);
-
-  ret = gnutls_record_recv (client, buffer, MAX_BUF);
-  if (ret == 0)
-    {
-      fail ("client: Peer has closed the TLS connection\n");
-    }
-  else if (ret < 0)
-    {
-      fail ("client: Error: %s\n", gnutls_strerror (ret));
-    }
-  else if (debug)
-    {
-      printf ("client: received %d: ", ret);
-      for (n = 0; n < ret; n++)
-       fputc (buffer[n], stdout);
-      fputs ("\n", stdout);
-    }
-
-  gnutls_bye (client, GNUTLS_SHUT_RDWR);
-  gnutls_bye (server, GNUTLS_SHUT_RDWR);
-
-  gnutls_deinit (client);
-  gnutls_deinit (server);
-
-  free (to_server);
-  free (to_client);
-
-  gnutls_anon_free_client_credentials (c_anoncred);
-  gnutls_anon_free_server_credentials (s_anoncred);
-
-  gnutls_dh_params_deinit (dh_params);
-
-  gnutls_global_deinit ();
-}