From b7ce41b809a3b3533d398c0da8fd9787c149434c Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sun, 4 Aug 2013 17:52:06 +0200 Subject: [PATCH] Fix indentation of LOG() calls. "Broken" in 8b2ed4a58229f9b377f3a4ae74af36c31c5db1c0. --- src/connection.c | 36 ++++++++++++++++++------------------ src/verify.c | 42 +++++++++++++++++------------------------- 2 files changed, 35 insertions(+), 43 deletions(-) diff --git a/src/connection.c b/src/connection.c index 2875b76..5a08de7 100644 --- a/src/connection.c +++ b/src/connection.c @@ -150,7 +150,7 @@ void handle_connection(int client_socket) { /* Connect to proxy server or directly to server. */ if (global_proxy_host != NULL && global_proxy_port != NULL) { LOG(DEBUG, "connecting to %s:%s", global_proxy_host, - global_proxy_port); + global_proxy_port); server_socket = connect_to_host(global_proxy_host, global_proxy_port); } else { LOG(DEBUG, "connecting to %s:%s", host, port); @@ -241,7 +241,7 @@ void handle_connection(int client_socket) { result = gnutls_handshake(server_session); if (result != GNUTLS_E_SUCCESS) { LOG(WARNING, "server TLS handshake failed: %s", - gnutls_strerror(result)); + gnutls_strerror(result)); send_forwarding_failure(client_fd_write); goto out; } @@ -284,7 +284,7 @@ void handle_connection(int client_socket) { result = gnutls_handshake(client_session); if (result != GNUTLS_E_SUCCESS) { LOG(WARNING, "client TLS handshake failed: %s", - gnutls_strerror(result)); + gnutls_strerror(result)); send_forwarding_failure(client_fd_write); goto out; } @@ -368,16 +368,16 @@ static int initialize_tls_session_client(int peer_socket, if (proxy_certificate_path(hostname, path, sizeof(path)) != 0) { LOG(ERROR, - "initialize_tls_session_client(): \ -failed to get proxy certificate path"); + "initialize_tls_session_client(): " + "failed to get proxy certificate path"); return -1; } result = gnutls_certificate_allocate_credentials(x509_cred); if (result != GNUTLS_E_SUCCESS) { LOG(ERROR, - "initialize_tls_session_client(): \ -gnutls_certificate_allocate_credentials(): %s", + "initialize_tls_session_client(): " + "gnutls_certificate_allocate_credentials(): %s", gnutls_strerror(result)); return -1; } @@ -413,8 +413,8 @@ gnutls_certificate_allocate_credentials(): %s", } if (result != GNUTLS_E_SUCCESS) { LOG(ERROR, - "initialize_tls_session_client(): \ -can't read server certificate ('%s') or key file ('%s'): %s", + "initialize_tls_session_client(): " + "can't read server certificate ('%s') or key file ('%s'): %s", path, PROXY_KEY_FILE, gnutls_strerror(result)); gnutls_certificate_free_credentials(*x509_cred); /* Could be a missing certificate. */ @@ -463,8 +463,8 @@ static int initialize_tls_session_server(int peer_socket, result = gnutls_certificate_allocate_credentials(x509_cred); if (result != GNUTLS_E_SUCCESS) { LOG(ERROR, - "initialize_tls_session_server(): \ -gnutls_certificate_allocate_credentials(): %s", + "initialize_tls_session_server(): " + "gnutls_certificate_allocate_credentials(): %s", gnutls_strerror(result)); return -1; } @@ -676,7 +676,7 @@ static int read_from_write_to(int from, int to) { } 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); + (long int)size_written, (long int)size_read); return -1; } @@ -704,7 +704,7 @@ static void transfer_data_tls(int client, int server, buffer_size = gnutls_record_get_max_size(server_session); } LOG(DEBUG, "transfer_data_tls(): suggested buffer size: %ld", - (long int)buffer_size); + (long int)buffer_size); for (;;) { int result = poll(fds, 2 /* fd count */, -1 /* no timeout */); @@ -753,12 +753,12 @@ static int read_from_write_to_tls(gnutls_session_t from, buffer_size = sizeof(buffer); } LOG(DEBUG, "read_from_write_to_tls(): used buffer size: %ld", - (long int)buffer_size); + (long int)buffer_size); size_read = gnutls_record_recv(from, buffer, buffer_size); if (size_read < 0) { LOG(WARNING, "read_from_write_to_tls(): gnutls_record_recv(): %s", - gnutls_strerror((int)size_read)); + gnutls_strerror((int)size_read)); return -1; /* EOF */ } else if (size_read == 0) { @@ -768,12 +768,12 @@ static int read_from_write_to_tls(gnutls_session_t from, size_written = gnutls_record_send(to, buffer, (size_t)size_read); if (size_written < 0) { LOG(WARNING, "read_from_write_to_tls(): gnutls_record_send(): %s", - gnutls_strerror((int)size_written)); + gnutls_strerror((int)size_written)); 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); + (long int)size_written, (long int)size_read); return -1; } @@ -807,7 +807,7 @@ static int connect_to_host(const char *hostname, const char *port) { LOG_PERROR(WARNING, "connect_to_host(): getaddrinfo()"); } else { LOG(WARNING, "connect_to_host(): getaddrinfo(): %s", - gai_strerror(gai_return)); + gai_strerror(gai_return)); } return -1; } diff --git a/src/verify.c b/src/verify.c index f674236..34a0814 100644 --- a/src/verify.c +++ b/src/verify.c @@ -49,7 +49,8 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { * more checks. */ if (result < 0) { LOG(WARNING, - "verify_tls_connection(): gnutls_certificate_verify_peers2() failed: %s", + "verify_tls_connection(): " + "gnutls_certificate_verify_peers2() failed: %s", gnutls_strerror(result)); return -1; } @@ -58,8 +59,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { || status & GNUTLS_CERT_REVOKED || status & GNUTLS_CERT_NOT_ACTIVATED || status & GNUTLS_CERT_INSECURE_ALGORITHM) { - LOG(WARNING, - "verify_tls_connection(): invalid server certificate"); + LOG(WARNING, "verify_tls_connection(): invalid server certificate"); return -1; } @@ -67,8 +67,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { * prevent an attacker from changing the certificate type to prevent * detection. */ if (gnutls_certificate_type_get(session) != GNUTLS_CRT_X509) { - LOG(WARNING, - "verify_tls_connection(): no X509 server certificate"); + LOG(WARNING, "verify_tls_connection(): no X509 server certificate"); return -1; } @@ -137,9 +136,8 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { strcat(stored_cert, buffer); } if (ferror(file)) { - LOG(WARNING, - "verify_tls_connection(): failed to read from '%s': %s", - path, strerror(errno)); + LOG(WARNING, "verify_tls_connection(): failed to read from '%s': %s", + path, strerror(errno)); fclose(file); LOG(DEBUG, "server certificate:\n%s", server_cert); @@ -149,9 +147,8 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { /* Check if the server certificate matches our stored certificate. */ if (strcmp(stored_cert, server_cert)) { - LOG(ERROR, - "verify_tls_connection(): server certificate changed!", - path, strerror(errno)); + LOG(ERROR, "verify_tls_connection(): server certificate changed!", + path, strerror(errno)); LOG(WARNING, "server certificate:\n%s", server_cert); return -2; @@ -183,16 +180,14 @@ static int get_certificate_path(const char *format, /* Hostname too long. */ assert(size > strlen(format)); if (size - strlen(format) <= strlen(hostname)) { - LOG(WARNING, - "get_certificate_path(): hostname too long: '%s'", - hostname); + LOG(WARNING, "get_certificate_path(): hostname too long: '%s'", + hostname); return -1; } /* Try to prevent path traversals in hostnames. */ if (strstr(hostname, "..") != NULL) { - LOG(WARNING, - "get_certificate_path(): possible path traversal: '%s'", - hostname); + LOG(WARNING, "get_certificate_path(): possible path traversal: '%s'", + hostname); return -1; } /* Safe as format is no user input. */ @@ -217,8 +212,7 @@ int server_certificate_file(FILE **file, const char *hostname, char *path, size_t size) { if (get_certificate_path(STORED_SERVER_CERT_FORMAT, hostname, path, size) != 0) { - LOG_PERROR(ERROR, - "server_certificate_file(): failed to get path"); + LOG_PERROR(ERROR, "server_certificate_file(): failed to get path"); return -1; } @@ -226,13 +220,11 @@ int server_certificate_file(FILE **file, const char *hostname, *file = fopen(path, "rb"); if (*file == NULL) { if (global_passthrough_unknown) { - LOG(DEBUG, - "server_certificate_file(): failed to open '%s': %s", - path, strerror(errno)); + LOG(DEBUG, "server_certificate_file(): failed to open '%s': %s", + path, strerror(errno)); } else { - LOG(WARNING, - "server_certificate_file(): failed to open '%s': %s", - path, strerror(errno)); + LOG(WARNING, "server_certificate_file(): failed to open '%s': %s", + path, strerror(errno)); } /* Couldn't open the file, special case. */ return -2; -- 2.43.2