[GNUnet-SVN] r7601 - in libmicrohttpd/src: daemon include testcurl/https

[gnunet]

Author: grothoff
Date: 2008-08-24 13:16:20 -0600 (Sun, 24 Aug 2008)
New Revision: 7601

Modified:
   libmicrohttpd/src/daemon/connection_https.c
   libmicrohttpd/src/include/microhttpd.h
   libmicrohttpd/src/testcurl/https/mhds_session_info_test.c
Log:
fix

Modified: libmicrohttpd/src/daemon/connection_https.c
===================================================================
--- libmicrohttpd/src/daemon/connection_https.c 2008-08-24 19:14:53 UTC (rev 
7600)
+++ libmicrohttpd/src/daemon/connection_https.c 2008-08-24 19:16:20 UTC (rev 
7601)
@@ -57,25 +57,25 @@
   switch (infoType)
     {
 #if HTTPS_SUPPORT
-    case MHD_SESSION_INFO_CIPHER_ALGO:
+    case MHD_CONNECTION_INFO_CIPHER_ALGO:
       return (const union MHD_ConnectionInfo *) &connection->
         tls_session->security_parameters.read_bulk_cipher_algorithm;
-    case MHD_SESSION_INFO_KX_ALGO:
+    case MHD_CONNECTION_INFO_KX_ALGO:
       return (const union MHD_ConnectionInfo *) &connection->
         tls_session->security_parameters.kx_algorithm;
-    case MHD_SESSION_INFO_CREDENTIALS_TYPE:
+    case MHD_CONNECTION_INFO_CREDENTIALS_TYPE:
       return (const union MHD_ConnectionInfo *) &connection->
         tls_session->key->cred->algorithm;
-    case MHD_SESSION_INFO_MAC_ALGO:
+    case MHD_CONNECTION_INFO_MAC_ALGO:
       return (const union MHD_ConnectionInfo *) &connection->
         tls_session->security_parameters.read_mac_algorithm;
-    case MHD_SESSION_INFO_COMPRESSION_METHOD:
+    case MHD_CONNECTION_INFO_COMPRESSION_METHOD:
       return (const union MHD_ConnectionInfo *) &connection->
         tls_session->security_parameters.read_compression_algorithm;
-    case MHD_SESSION_INFO_PROTOCOL:
+    case MHD_CONNECTION_INFO_PROTOCOL:
       return (const union MHD_ConnectionInfo *) &connection->
         tls_session->security_parameters.version;
-    case MHD_SESSION_INFO_CERT_TYPE:
+    case MHD_CONNECTION_INFO_CERT_TYPE:
       return (const union MHD_ConnectionInfo *) &connection->
         tls_session->security_parameters.cert_type;
 #endif

Modified: libmicrohttpd/src/include/microhttpd.h
===================================================================
--- libmicrohttpd/src/include/microhttpd.h      2008-08-24 19:14:53 UTC (rev 
7600)
+++ libmicrohttpd/src/include/microhttpd.h      2008-08-24 19:16:20 UTC (rev 
7601)
@@ -681,43 +681,43 @@
    * What cipher algorithm is being used.
    * Takes no extra arguments.
    */
-  MHD_SESSION_INFO_CIPHER_ALGO,
+  MHD_CONNECTION_INFO_CIPHER_ALGO,
 
   /**
    * What key exchange algorithm is being used.
    * Takes no extra arguments.
    */
-  MHD_SESSION_INFO_KX_ALGO,
+  MHD_CONNECTION_INFO_KX_ALGO,
 
   /**
    *
    * Takes no extra arguments.
    */
-  MHD_SESSION_INFO_CREDENTIALS_TYPE,
+  MHD_CONNECTION_INFO_CREDENTIALS_TYPE,
 
   /**
    *
    * Takes no extra arguments.
    */
-  MHD_SESSION_INFO_MAC_ALGO,
+  MHD_CONNECTION_INFO_MAC_ALGO,
 
   /**
    * What compression method is being used.
    * Takes no extra arguments.
    */
-  MHD_SESSION_INFO_COMPRESSION_METHOD,
+  MHD_CONNECTION_INFO_COMPRESSION_METHOD,
 
   /**
    *
    * Takes no extra arguments.
    */
-  MHD_SESSION_INFO_PROTOCOL,
+  MHD_CONNECTION_INFO_PROTOCOL,
 
   /**
    *
    * Takes no extra arguments.
    */
-  MHD_SESSION_INFO_CERT_TYPE
+  MHD_CONNECTION_INFO_CERT_TYPE
 };
 
 /**

Modified: libmicrohttpd/src/testcurl/https/mhds_session_info_test.c
===================================================================
--- libmicrohttpd/src/testcurl/https/mhds_session_info_test.c   2008-08-24 
19:14:53 UTC (rev 7600)
+++ libmicrohttpd/src/testcurl/https/mhds_session_info_test.c   2008-08-24 
19:16:20 UTC (rev 7601)
@@ -69,7 +69,7 @@
   int ret;
 
   /* assert actual connection cipher is the one negotiated */
-  if (MHD_get_session_info (connection, MHD_INFO_CIPHER_ALGO)->cipher_algorithm
+  if (MHD_get_session_info (connection, 
MHD_CONNECTION_INFO_CIPHER_ALGO)->cipher_algorithm
       != MHD_GNUTLS_CIPHER_AES_256_CBC)
     {
       fprintf (stderr, "Error: requested cipher mismatch. %s\n",
@@ -77,7 +77,7 @@
       return -1;
     }
 
-  if (MHD_get_session_info (connection, MHD_INFO_KX_ALGO)->kx_algorithm !=
+  if (MHD_get_session_info (connection, 
MHD_CONNECTION_INFO_KX_ALGO)->kx_algorithm !=
       MHD_GNUTLS_KX_RSA)
     {
       fprintf (stderr, "Error: requested key exchange mismatch. %s\n",
@@ -85,7 +85,7 @@
       return -1;
     }
 
-  if (MHD_get_session_info (connection, MHD_INFO_MAC_ALGO)->mac_algorithm !=
+  if (MHD_get_session_info (connection, 
MHD_CONNECTION_INFO_MAC_ALGO)->mac_algorithm !=
       MHD_GNUTLS_MAC_SHA1)
     {
       fprintf (stderr, "Error: requested mac algorithm mismatch. %s\n",
@@ -95,7 +95,7 @@
 
   if (MHD_get_session_info
       (connection,
-       MHD_INFO_COMPRESSION_METHOD)->compression_method !=
+       MHD_CONNECTION_INFO_COMPRESSION_METHOD)->compression_method !=
       MHD_GNUTLS_COMP_NULL)
     {
       fprintf (stderr, "Error: requested compression mismatch. %s\n",
@@ -103,7 +103,7 @@
       return -1;
     }
 
-  if (MHD_get_session_info (connection, MHD_INFO_PROTOCOL)->protocol !=
+  if (MHD_get_session_info (connection, 
MHD_CONNECTION_INFO_PROTOCOL)->protocol !=
       MHD_GNUTLS_SSL3)
     {
       fprintf (stderr, "Error: requested compression mismatch. %s\n",
@@ -111,7 +111,7 @@
       return -1;
     }
 
-  if (MHD_get_session_info (connection, MHD_INFO_CERT_TYPE)->certificate_type
+  if (MHD_get_session_info (connection, 
MHD_CONNECTION_INFO_CERT_TYPE)->certificate_type
       != MHD_GNUTLS_CRT_X509)
     {
       fprintf (stderr, "Error: requested certificate mismatch. %s\n",
@@ -121,7 +121,7 @@
 
   if (MHD_get_session_info
       (connection,
-       MHD_INFO_CREDENTIALS_TYPE)->credentials_type !=
+       MHD_CONNECTION_INFO_CREDENTIALS_TYPE)->credentials_type !=
       MHD_GNUTLS_CRD_CERTIFICATE)
     {
       fprintf (stderr, "Error: requested certificate mismatch. %s\n",