[GNUnet-SVN] r7965 - in libmicrohttpd/src: daemon/https/tls testcurl/https

[gnunet]

Author: grothoff
Date: 2008-11-23 02:18:29 -0700 (Sun, 23 Nov 2008)
New Revision: 7965

Modified:
   libmicrohttpd/src/daemon/https/tls/auth_cert.c
   libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c
Log:
dce

Modified: libmicrohttpd/src/daemon/https/tls/auth_cert.c
===================================================================
--- libmicrohttpd/src/daemon/https/tls/auth_cert.c      2008-11-22 20:26:50 UTC 
(rev 7964)
+++ libmicrohttpd/src/daemon/https/tls/auth_cert.c      2008-11-23 09:18:29 UTC 
(rev 7965)
@@ -214,7 +214,7 @@
             {
               if ((result =
                    MHD__gnutls_cert_get_issuer_dn (&cred->cert_list[i][j],
-                                                   &odn)) < 0)
+                                                   &odn)) != 0)
                 {
                   MHD_gnutls_assert ();
                   return result;

Modified: libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c
===================================================================
--- libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c  2008-11-22 
20:26:50 UTC (rev 7964)
+++ libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c  2008-11-23 
09:18:29 UTC (rev 7965)
@@ -28,7 +28,6 @@
 #include "microhttpd.h"
 
 #include <sys/stat.h>
-
 #include "gnutls.h"
 #include <curl/curl.h>
 
@@ -382,50 +381,6 @@
   return 0;
 }
 
-
-static int
-tls_setup (MHD_gtls_session_t * session,
-           MHD_gnutls_datum_t * key,
-           MHD_gnutls_datum_t * cert, MHD_gtls_cert_credentials_t * xcred)
-{
-  int ret;
-  const char **err_pos;
-
-  MHD__gnutls_certificate_allocate_credentials (xcred);
-
-  MHD_gtls_set_datum_m (key, srv_key_pem, strlen (srv_key_pem), &malloc);
-  MHD_gtls_set_datum_m (cert, srv_self_signed_cert_pem,
-                        strlen (srv_self_signed_cert_pem), &malloc);
-
-  MHD__gnutls_certificate_set_x509_key_mem (*xcred, cert, key,
-                                            GNUTLS_X509_FMT_PEM);
-
-  MHD__gnutls_init (session, GNUTLS_CLIENT);
-  ret = MHD__gnutls_priority_set_direct (*session, "NORMAL", err_pos);
-  if (ret < 0)
-    {
-      return -1;
-    }
-
-  MHD__gnutls_credentials_set (*session, MHD_GNUTLS_CRD_CERTIFICATE, xcred);
-  return 0;
-}
-
-static int
-tls_teardown (MHD_gtls_session_t session,
-              MHD_gnutls_datum_t * key,
-              MHD_gnutls_datum_t * cert, MHD_gtls_cert_credentials_t xcred)
-{
-
-  MHD_gtls_free_datum_m (key, free);
-  MHD_gtls_free_datum_m (cert, free);
-
-  MHD__gnutls_deinit (session);
-
-  MHD__gnutls_certificate_free_credentials (xcred);
-  return 0;
-}
-
 /**
  * test single threaded server
  *
@@ -479,7 +434,6 @@
   unsigned int cpos;
   char test_name[64];
 
-  int mac[] = { MHD_GNUTLS_MAC_SHA1, 0 };
   int daemon_flags =
     MHD_USE_THREAD_PER_CONNECTION | MHD_USE_SSL | MHD_USE_DEBUG;