Use %zu to print size_t and ssize_t.

[tlsproxy/tlsproxy.git] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 4a9b40d4af51d5e2e3347fd3cdbbcf279b79c565..07885dfdeed9337468593376c381c9a57411580f 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -28,6 +28,8 @@
 #include <poll.h>
 #include <unistd.h>
 
+#include <gnutls/x509.h>
+
 
 /* Maximum length of a HTTP request line. Longer request lines are aborted
  * with an error. The standard doesn't specify a maximum line length but this
@@ -38,7 +40,8 @@
 /* Format string used to send HTTP/1.0 error responses to the client.
  *
  * %s is used 5 times, first is the error code, then additional headers, next
- * two are the error code (no %n$s!), the last is the message. */
+ * two are the error code (no %n$s which is not in C98!), the last is the
+ * message. */
 #define HTTP_RESPONSE_FORMAT "HTTP/1.0 %s\r\n\
 Content-Type: text/html; charset=US-ASCII\r\n\
 %s\r\n\
@@ -84,6 +87,8 @@ static int connect_to_host(const char *hostname, const char *port);
 static int parse_request(const char *buffer, char *host, char *port,
                                              int *version_minor);
 
+static void log_session_information(gnutls_session_t session);
+
 
 void handle_connection(int client_socket) {
     int server_socket;
@@ -253,6 +258,10 @@ void handle_connection(int client_socket) {
 
     LOG(DEBUG1, "server TLS handshake finished");
 
+    if (global_log_level >= LOG_DEBUG2_LEVEL) {
+        log_session_information(server_session);
+    }
+
     /* Make sure the server certificate is valid and known. */
     if (verify_tls_connection(server_session, host) != 0) {
         LOG(ERROR, "server certificate validation failed!");
@@ -296,6 +305,10 @@ void handle_connection(int client_socket) {
 
     LOG(DEBUG1, "client TLS handshake finished");
 
+    if (global_log_level >= LOG_DEBUG2_LEVEL) {
+        log_session_information(client_session);
+    }
+
     /* Tell the client that the verification failed. Shouldn't be necessary as
      * the client should terminate the connection because he received the
      * invalid certificate but better be sure. */
@@ -337,8 +350,6 @@ out:
     }
     if (client_session_init) {
         gnutls_deinit(client_session);
-        gnutls_certificate_free_cas(client_x509_cred);
-        gnutls_certificate_free_keys(client_x509_cred);
         gnutls_certificate_free_credentials(client_x509_cred);
     }
 
@@ -685,8 +696,8 @@ static int read_from_write_to(int from, int to) {
         return -1;
     }
     if (size_read != size_written) {
-        LOG(ERROR, "read_from_write_to(): only written %ld of %ld bytes!",
-                   (long int)size_written, (long int)size_read);
+        LOG(ERROR, "read_from_write_to(): only written %zu of %zu bytes!",
+                   size_written, size_read);
         return -1;
     }
 
@@ -713,8 +724,8 @@ static void transfer_data_tls(int client, int server,
     if (gnutls_record_get_max_size(server_session) < buffer_size) {
         buffer_size = gnutls_record_get_max_size(server_session);
     }
-    LOG(DEBUG2, "transfer_data_tls(): suggested buffer size: %ld",
-                (long int)buffer_size);
+    LOG(DEBUG2, "transfer_data_tls(): suggested buffer size: %zu",
+                buffer_size);
 
     for (;;) {
         int result = poll(fds, 2 /* fd count */, -1 /* no timeout */);
@@ -757,11 +768,11 @@ static int read_from_write_to_tls(gnutls_session_t from,
                                   size_t buffer_size) {
     ssize_t size_read;
     ssize_t size_written;
-    char buffer[16384];
+    char buffer[16384]; /* GnuTLS default maximum */
 
     if (buffer_size > sizeof(buffer)) {
-        LOG(WARNING, "read_from_write_to_tls(): reduced buffer size to %ld",
-                     (long int)(sizeof(buffer)));
+        LOG(WARNING, "read_from_write_to_tls(): reduced buffer size to %zu",
+                     sizeof(buffer));
         buffer_size = sizeof(buffer);
     }
 
@@ -782,8 +793,8 @@ static int read_from_write_to_tls(gnutls_session_t from,
         return -1;
     }
     if (size_read != size_written) {
-        LOG(ERROR, "read_from_write_to_tls(): only written %ld of %ld bytes!",
-                   (long int)size_written, (long int)size_read);
+        LOG(ERROR, "read_from_write_to_tls(): only written %zu of %zu bytes!",
+                   size_written, size_read);
         return -1;
     }
 
@@ -888,3 +899,72 @@ static int parse_request(const char *request, char *host, char *port,
 
     return 0;
 }
+
+
+static void log_session_information(gnutls_session_t session) {
+    /* From doc/examples/ex-session-info.c of GnuTLS 3.2.3's tarball and
+     * modified, thanks. */
+
+    const char *tmp;
+    gnutls_credentials_type_t cred;
+    gnutls_kx_algorithm_t kx;
+    int dhe, ecdh;
+
+    dhe = 0;
+    ecdh = 0;
+
+    /* Key exchange algorithm. */
+    kx = gnutls_kx_get(session);
+    LOG(DEBUG2, "- key exchange: %s", gnutls_kx_get_name(kx));
+
+    /* Authentication type. */
+    cred = gnutls_auth_get_type(session);
+    switch (cred) {
+        case GNUTLS_CRD_CERTIFICATE:
+            if (kx == GNUTLS_KX_DHE_RSA
+                    || kx == GNUTLS_KX_DHE_DSS) {
+                dhe = 1;
+#ifdef GNUTLS_KX_ECDHE_RSA
+            } else if (kx == GNUTLS_KX_ECDHE_RSA
+                    || kx == GNUTLS_KX_ECDHE_ECDSA) {
+                ecdh = 1;
+#endif
+            }
+            break;
+
+        case GNUTLS_CRD_IA:
+        case GNUTLS_CRD_SRP:
+        case GNUTLS_CRD_PSK:
+        case GNUTLS_CRD_ANON:
+        default:
+            /* This shouldn't occur. */
+            LOG(WARNING, "unexpected authentication method: %d", cred);
+            break;
+    }
+
+    /* Information about key exchange. */
+    if (dhe) {
+        LOG(DEBUG2, "- ephemeral DH using prime of %d bits",
+                    gnutls_dh_get_prime_bits(session));
+    } else if (ecdh) {
+#ifdef GNUTLS_KX_ECDHE_RSA
+        LOG(DEBUG2, "- ephemeral ECDH using curve %s",
+                    gnutls_ecc_curve_get_name(gnutls_ecc_curve_get(session)));
+#endif
+    }
+
+    tmp = gnutls_protocol_get_name(gnutls_protocol_get_version(session));
+    LOG(DEBUG2, "- protocol: %s", tmp); /* e.g. TLS 1.0 */
+
+    tmp = gnutls_certificate_type_get_name(gnutls_certificate_type_get(session));
+    LOG(DEBUG2, "- certificate type: %s", tmp);
+
+    tmp = gnutls_compression_get_name(gnutls_compression_get(session));
+    LOG(DEBUG2, "- compression: %s", tmp);
+
+    tmp = gnutls_cipher_get_name(gnutls_cipher_get(session));
+    LOG(DEBUG2, "- cipher: %s", tmp);
+
+    tmp = gnutls_mac_get_name(gnutls_mac_get(session));
+    LOG(DEBUG2, "- MAC: %s", tmp);
+}