From: Simon Ruderich Date: Sun, 28 Jul 2013 02:37:45 +0000 (+0200) Subject: Use better readable order of arguments in if. X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=c5059d4c1e7f0de5a466d471e7ee26b6ccce8396;p=tlsproxy%2Ftlsproxy.git Use better readable order of arguments in if. if (5 == x) as safeguard against if (x = 5) is no longer necessary as modern compilers warn about if (x = 5). --- diff --git a/src/connection.c b/src/connection.c index ac3bc21..710963c 100644 --- a/src/connection.c +++ b/src/connection.c @@ -118,25 +118,25 @@ void handle_connection(int client_socket) { validation_failed = 0; client_fd = fdopen(client_socket, "a+"); - if (NULL == client_fd) { + if (client_fd == NULL) { LOG_PERROR(LOG_WARNING, "fdopen(): client failed"); goto out; } /* Read request line (CONNECT ..) and headers (they are discarded). */ result = read_http_request(client_fd, buffer, sizeof(buffer)); - if (-1 == result) { + if (result == -1) { /* Read error. */ LOG(LOG_WARNING, "read_http_request(): client read error"); goto out; - } else if (-2 == result) { + } else if (result == -2) { /* EOF */ LOG(LOG_WARNING, "read_http_request(): client EOF"); send_bad_request(client_fd); goto out; } - if (0 != parse_request(buffer, host, port, &version_minor)) { + if (parse_request(buffer, host, port, &version_minor) != 0) { LOG(LOG_WARNING, "bad request: %s", buffer); send_bad_request(client_fd); goto out; @@ -145,7 +145,7 @@ void handle_connection(int client_socket) { LOG(LOG_DEBUG, "target: %s:%s (HTTP 1.%d)", host, port, version_minor); /* Connect to proxy server or directly to server. */ - if (NULL != global_proxy_host && NULL != global_proxy_port) { + if (global_proxy_host != NULL && global_proxy_port != NULL) { LOG(LOG_DEBUG, "connecting to %s:%s", global_proxy_host, global_proxy_port); server_socket = connect_to_host(global_proxy_host, global_proxy_port); @@ -154,31 +154,31 @@ void handle_connection(int client_socket) { server_socket = connect_to_host(host, port); } - if (-1 == server_socket) { + if (server_socket == -1) { LOG(LOG_WARNING, "failed to connect to server"); send_forwarding_failure(client_fd); goto out; } server_fd = fdopen(server_socket, "a+"); - if (NULL == server_fd) { + if (server_fd == NULL) { LOG_PERROR(LOG_WARNING, "fdopen(): server failed"); send_forwarding_failure(client_fd); goto out; } /* Connect to proxy if requested (command line option). */ - if (NULL != global_proxy_host && NULL != global_proxy_port) { + if (global_proxy_host != NULL && global_proxy_port != NULL) { fprintf(server_fd, "CONNECT %s:%s HTTP/1.0\r\n", host, port); fprintf(server_fd, "\r\n"); /* Read response line from proxy server. */ result = read_http_request(server_fd, buffer, sizeof(buffer)); - if (-1 == result) { + if (result == -1) { /* Read error. */ LOG(LOG_WARNING, "read_http_request(): proxy read error"); send_forwarding_failure(client_fd); goto out; - } else if (-2 == result) { + } else if (result == -2) { /* EOF */ LOG(LOG_WARNING, "read_http_request(): proxy EOF"); send_forwarding_failure(client_fd); @@ -186,7 +186,7 @@ void handle_connection(int client_socket) { } /* Check response of proxy server. */ - if (0 != strncmp(buffer, "HTTP/1.0 200", 12)) { + if (strncmp(buffer, "HTTP/1.0 200", 12) != 0) { LOG(LOG_WARNING, "bad proxy response: %s", buffer); send_forwarding_failure(client_fd); goto out; @@ -202,7 +202,7 @@ void handle_connection(int client_socket) { char path[TLSPROXY_MAX_PATH_LENGTH]; FILE *file = NULL; - if (-2 == server_certificate_file(&file, host, path, sizeof(path))) { + if (server_certificate_file(&file, host, path, sizeof(path)) == -2) { /* We've established a connection, tell the client. */ fprintf(client_fd, "HTTP/1.0 200 Connection established\r\n"); fprintf(client_fd, "\r\n"); @@ -219,7 +219,7 @@ void handle_connection(int client_socket) { goto out; } /* server_certificate_file() may have opened the file, close it. */ - if (NULL != file) { + if (file != NULL) { fclose(file); } } @@ -227,7 +227,7 @@ void handle_connection(int client_socket) { /* Initialize TLS client credentials to talk to the server. */ result = initialize_tls_session_server(server_socket, &server_session, &server_x509_cred); - if (0 != result) { + if (result != 0) { LOG(LOG_WARNING, "initialize_tls_session_server() failed"); send_forwarding_failure(client_fd); goto out; @@ -238,7 +238,7 @@ void handle_connection(int client_socket) { /* Try to establish TLS handshake between us and server. */ result = gnutls_handshake(server_session); - if (GNUTLS_E_SUCCESS != result) { + if (result != GNUTLS_E_SUCCESS) { LOG(LOG_WARNING, "server TLS handshake failed: %s", gnutls_strerror(result)); send_forwarding_failure(client_fd); @@ -249,7 +249,7 @@ void handle_connection(int client_socket) { LOG(LOG_DEBUG, "server TLS handshake finished"); /* Make sure the server certificate is valid and known. */ - if (0 != verify_tls_connection(server_session, host)) { + if (verify_tls_connection(server_session, host) != 0) { LOG(LOG_ERROR, "server certificate validation failed!"); /* We send the error message over our TLS connection to the client, * but with an invalid certificate. No data is transfered from/to the @@ -265,7 +265,7 @@ void handle_connection(int client_socket) { : host, &client_session, &client_x509_cred); - if (0 != result) { + if (result != 0) { LOG(LOG_WARNING, "initialize_tls_session_client() failed"); send_forwarding_failure(client_fd); goto out; @@ -281,7 +281,7 @@ void handle_connection(int client_socket) { /* Try to establish TLS handshake between client and us. */ result = gnutls_handshake(client_session); - if (GNUTLS_E_SUCCESS != result) { + if (result != GNUTLS_E_SUCCESS) { LOG(LOG_WARNING, "client TLS handshake failed: %s", gnutls_strerror(result)); send_forwarding_failure(client_fd); @@ -311,17 +311,17 @@ void handle_connection(int client_socket) { out: /* Close TLS sessions if necessary. Use GNUTLS_SHUT_RDWR so the data is * reliable transmitted. */ - if (0 != server_session_started) { + if (server_session_started != 0) { gnutls_bye(server_session, GNUTLS_SHUT_RDWR); } - if (0 != client_session_started) { + if (client_session_started != 0) { gnutls_bye(client_session, GNUTLS_SHUT_RDWR); } - if (0 != server_session_init) { + if (server_session_init != 0) { gnutls_deinit(server_session); gnutls_certificate_free_credentials(server_x509_cred); } - if (0 != client_session_init) { + if (client_session_init != 0) { gnutls_deinit(client_session); gnutls_certificate_free_cas(client_x509_cred); gnutls_certificate_free_keys(client_x509_cred); @@ -329,14 +329,14 @@ out: } /* Close connection to server/proxy. */ - if (NULL != server_fd) { + if (server_fd != NULL) { fclose(server_fd); - } else if (-1 != server_socket) { + } else if (server_socket != -1) { close(server_socket); } LOG(LOG_DEBUG, "connection to server closed"); /* Close connection to client. */ - if (NULL != client_fd) { + if (client_fd != NULL) { fclose(client_fd); } else { close(client_socket); @@ -357,9 +357,9 @@ static int initialize_tls_session_client(int peer_socket, /* The "invalid" hostname is special. If it's used we send an invalid * certificate to let the client know something is wrong. */ - use_invalid_cert = (0 == strcmp(hostname, "invalid")); + use_invalid_cert = (strcmp(hostname, "invalid") == 0); - if (0 != proxy_certificate_path(hostname, path, sizeof(path))) { + if (proxy_certificate_path(hostname, path, sizeof(path)) != 0) { LOG(LOG_ERROR, "initialize_tls_session_client(): \ failed to get proxy certificate path"); @@ -367,7 +367,7 @@ failed to get proxy certificate path"); } result = gnutls_certificate_allocate_credentials(x509_cred); - if (GNUTLS_E_SUCCESS != result) { + if (result != GNUTLS_E_SUCCESS) { LOG(LOG_ERROR, "initialize_tls_session_client(): \ gnutls_certificate_allocate_credentials(): %s", @@ -380,7 +380,7 @@ gnutls_certificate_allocate_credentials(): %s", result = gnutls_certificate_set_x509_trust_file(*x509_cred, PROXY_CA_FILE, GNUTLS_X509_FMT_PEM); - if (0 >= result) { + if (result <= 0) { LOG(LOG_ERROR, "initialize_tls_session_client(): can't read CA file: '%s'", PROXY_CA_FILE); @@ -404,7 +404,7 @@ gnutls_certificate_allocate_credentials(): %s", PROXY_KEY_FILE, GNUTLS_X509_FMT_PEM); } - if (GNUTLS_E_SUCCESS != result) { + if (result != GNUTLS_E_SUCCESS) { LOG(LOG_ERROR, "initialize_tls_session_client(): \ can't read server certificate ('%s') or key file ('%s'): %s", @@ -417,7 +417,7 @@ can't read server certificate ('%s') or key file ('%s'): %s", gnutls_certificate_set_dh_params(*x509_cred, global_tls_dh_params); result = gnutls_init(session, GNUTLS_SERVER); - if (GNUTLS_E_SUCCESS != result) { + if (result != GNUTLS_E_SUCCESS) { LOG(LOG_ERROR, "initialize_tls_session_client(): gnutls_init(): %s", gnutls_strerror(result)); @@ -425,7 +425,7 @@ can't read server certificate ('%s') or key file ('%s'): %s", return -1; } result = gnutls_priority_set(*session, global_tls_priority_cache); - if (GNUTLS_E_SUCCESS != result) { + if (result != GNUTLS_E_SUCCESS) { LOG(LOG_ERROR, "initialize_tls_session_client(): gnutls_priority_set(): %s", gnutls_strerror(result)); @@ -435,7 +435,7 @@ can't read server certificate ('%s') or key file ('%s'): %s", } result = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE, *x509_cred); - if (GNUTLS_E_SUCCESS != result) { + if (result != GNUTLS_E_SUCCESS) { LOG(LOG_ERROR, "initialize_tls_session_client(): gnutls_credentials_set(): %s", gnutls_strerror(result)); @@ -454,7 +454,7 @@ static int initialize_tls_session_server(int peer_socket, int result; result = gnutls_certificate_allocate_credentials(x509_cred); - if (GNUTLS_E_SUCCESS != result) { + if (result != GNUTLS_E_SUCCESS) { LOG(LOG_ERROR, "initialize_tls_session_server(): \ gnutls_certificate_allocate_credentials(): %s", @@ -463,7 +463,7 @@ gnutls_certificate_allocate_credentials(): %s", } result = gnutls_init(session, GNUTLS_CLIENT); - if (GNUTLS_E_SUCCESS != result) { + if (result != GNUTLS_E_SUCCESS) { LOG(LOG_ERROR, "initialize_tls_session_server(): gnutls_init(): %s", gnutls_strerror(result)); @@ -471,7 +471,7 @@ gnutls_certificate_allocate_credentials(): %s", return -1; } result = gnutls_priority_set(*session, global_tls_priority_cache); - if (GNUTLS_E_SUCCESS != result) { + if (result != GNUTLS_E_SUCCESS) { LOG(LOG_ERROR, "initialize_tls_session_server(): gnutls_priority_set(): %s", gnutls_strerror(result)); @@ -481,7 +481,7 @@ gnutls_certificate_allocate_credentials(): %s", } result = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE, *x509_cred); - if (GNUTLS_E_SUCCESS != result) { + if (result != GNUTLS_E_SUCCESS) { LOG(LOG_ERROR, "initialize_tls_session_server(): gnutls_credentials_set(): %s", gnutls_strerror(result)); @@ -503,7 +503,7 @@ gnutls_certificate_allocate_credentials(): %s", static int read_http_request(FILE *client_fd, char *request, size_t length) { char buffer[MAX_REQUEST_LINE]; - if (NULL == fgets(request, (int)length, client_fd)) { + if (fgets(request, (int)length, client_fd) == NULL) { if (ferror(client_fd)) { LOG_PERROR(LOG_WARNING, "read_http_request(): fgets()"); return -1; @@ -512,9 +512,9 @@ static int read_http_request(FILE *client_fd, char *request, size_t length) { return -2; } - while (NULL != fgets(buffer, sizeof(buffer), client_fd)) { + while (fgets(buffer, sizeof(buffer), client_fd) != NULL) { /* End of header. */ - if (0 == strcmp(buffer, "\n") || 0 == strcmp(buffer, "\r\n")) { + if (strcmp(buffer, "\n") == 0 || strcmp(buffer, "\r\n") == 0) { break; } } @@ -596,14 +596,14 @@ static void transfer_data(int client, int server) { /* Data available from client. */ if (fds[0].revents & POLLIN || fds[0].revents & POLLPRI) { - if (0 != read_from_write_to(client, server)) { + if (read_from_write_to(client, server) != 0) { /* EOF (or other error) */ break; } } /* Data available from server. */ if (fds[1].revents & POLLIN || fds[1].revents & POLLPRI) { - if (0 != read_from_write_to(server, client)) { + if (read_from_write_to(server, client) != 0) { /* EOF (or other error) */ break; } @@ -630,17 +630,17 @@ static int read_from_write_to(int from, int to) { LOG(LOG_DEBUG, "read_from_write_to(): %d -> %d", from, to); size_read = read(from, buffer, sizeof(buffer)); - if (0 > size_read) { + if (size_read < 0) { LOG_PERROR(LOG_WARNING, "read_from_write_to(): read()"); return -1; } /* EOF */ - if (0 == size_read) { + if (size_read == 0) { return -1; } size_written = write(to, buffer, (size_t)size_read); - if (0 > size_written) { + if (size_written < 0) { LOG_PERROR(LOG_WARNING, "read_from_write_to(): write()"); return -1; } @@ -670,7 +670,7 @@ static void transfer_data_tls(int client, int server, /* Get maximum possible buffer size. */ buffer_size = gnutls_record_get_max_size(client_session); - if (buffer_size > gnutls_record_get_max_size(server_session)) { + if (gnutls_record_get_max_size(server_session) < buffer_size) { buffer_size = gnutls_record_get_max_size(server_session); } LOG(LOG_DEBUG, "transfer_data_tls(): suggested buffer size: %ld", @@ -685,16 +685,16 @@ static void transfer_data_tls(int client, int server, /* Data available from client. */ if (fds[0].revents & POLLIN || fds[0].revents & POLLPRI) { - if (0 != read_from_write_to_tls(client_session, server_session, - buffer_size)) { + if (read_from_write_to_tls(client_session, server_session, + buffer_size) != 0) { /* EOF (or other error) */ break; } } /* Data available from server. */ if (fds[1].revents & POLLIN || fds[1].revents & POLLPRI) { - if (0 != read_from_write_to_tls(server_session, client_session, - buffer_size)) { + if (read_from_write_to_tls(server_session, client_session, + buffer_size) != 0) { /* EOF (or other error) */ break; } @@ -726,18 +726,18 @@ static int read_from_write_to_tls(gnutls_session_t from, (long int)buffer_size); size_read = gnutls_record_recv(from, buffer, buffer_size); - if (0 > size_read) { + if (size_read < 0) { LOG(LOG_WARNING, "read_from_write_to_tls(): gnutls_record_recv(): %s", gnutls_strerror((int)size_read)); return -1; } /* EOF */ - if (0 == size_read) { + if (size_read == 0) { return -1; } size_written = gnutls_record_send(to, buffer, (size_t)size_read); - if (0 > size_written) { + if (size_written < 0) { LOG(LOG_WARNING, "read_from_write_to_tls(): gnutls_record_send(): %s", gnutls_strerror((int)size_written)); return -1; @@ -760,7 +760,7 @@ static int connect_to_host(const char *hostname, const char *port) { int server_socket; struct addrinfo *server; - if (NULL == hostname || NULL == port) { + if (hostname == NULL || port == NULL) { return -1; } @@ -773,24 +773,23 @@ static int connect_to_host(const char *hostname, const char *port) { | AI_ADDRCONFIG /* supported by this computer */ | AI_V4MAPPED; /* support IPv4 through IPv6 */ gai_return = getaddrinfo(hostname, port, &gai_hints, &gai_result); - if (0 != gai_return) { + if (gai_return != 0) { LOG_PERROR(LOG_WARNING, "connect_to_host(): getaddrinfo()"); return -1; } /* Now try to connect to each server returned by getaddrinfo(), use the * first successful connect. */ - for (server = gai_result; NULL != server; server = server->ai_next) { + for (server = gai_result; server != NULL; server = server->ai_next) { server_socket = socket(server->ai_family, server->ai_socktype, server->ai_protocol); - if (-1 == server_socket) { + if (server_socket == -1) { LOG_PERROR(LOG_DEBUG, "connect_to_host(): socket(), trying next"); continue; } - if (-1 != connect(server_socket, server->ai_addr, - server->ai_addrlen)) { + if (connect(server_socket, server->ai_addr, server->ai_addrlen) != -1) { break; } LOG_PERROR(LOG_DEBUG, "connect_to_host(): connect(), trying next"); @@ -800,7 +799,7 @@ static int connect_to_host(const char *hostname, const char *port) { /* Make sure we free the result from getaddrinfo(). */ freeaddrinfo(gai_result); - if (NULL == server) { + if (server == NULL) { LOG_PERROR(LOG_WARNING, "connect_to_host(): no server found, abort"); return -1; } @@ -822,20 +821,19 @@ static int parse_request(const char *request, char *host, char *port, char *position; /* scanf() doesn't check spaces. */ - if (0 != strncmp(request, "CONNECT ", 8)) { + if (strncmp(request, "CONNECT ", 8) != 0) { return -1; } /* Check request and extract data, "host:port" is not yet separated. */ - if (2 != sscanf(request, "CONNECT %s HTTP/1.%d", - host, version_minor)) { + if (sscanf(request, "CONNECT %s HTTP/1.%d", host, version_minor) != 2) { return -1; } /* Make sure ":port" is there. */ - if (NULL == (position = strchr(host, ':'))) { + if ((position = strchr(host, ':')) == NULL) { return -1; } /* Make sure port is numeric. */ - if (1 != sscanf(position + 1, "%d", &port_unused)) { + if (sscanf(position + 1, "%d", &port_unused) != 1) { return -1; } /* Store it in *port. */ diff --git a/src/sem.c b/src/sem.c index 3c911cd..c184453 100644 --- a/src/sem.c +++ b/src/sem.c @@ -31,15 +31,15 @@ struct SEM { SEM *sem_init(int init_value) { SEM *sem = malloc(sizeof(*sem)); - if (NULL == sem) { + if (sem == NULL) { return NULL; } - if (0 != pthread_mutex_init(&sem->mutex, NULL)) { + if (pthread_mutex_init(&sem->mutex, NULL) != 0) { free(sem); return NULL; } - if (0 != pthread_cond_init(&sem->condition, NULL)) { + if (pthread_cond_init(&sem->condition, NULL) != 0) { pthread_mutex_destroy(&sem->mutex); free(sem); return NULL; @@ -50,15 +50,15 @@ SEM *sem_init(int init_value) { } int sem_del(SEM *sem) { - if (NULL == sem) { + if (sem == NULL) { return 0; } - if (0 != pthread_mutex_destroy(&sem->mutex)) { + if (pthread_mutex_destroy(&sem->mutex) != 0) { free(sem); return -1; } - if (0 != pthread_cond_destroy(&sem->condition)) { + if (pthread_cond_destroy(&sem->condition) != 0) { free(sem); return -1; } @@ -69,7 +69,7 @@ int sem_del(SEM *sem) { void P(SEM *sem) { pthread_mutex_lock(&sem->mutex); - while (0 == sem->value) { + while (sem->value == 0) { pthread_cond_wait(&sem->condition, &sem->mutex); } sem->value--; diff --git a/src/tlsproxy.c b/src/tlsproxy.c index 4bfc88d..1e8642f 100644 --- a/src/tlsproxy.c +++ b/src/tlsproxy.c @@ -52,7 +52,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL; /* For gnutls_*() functions. */ #define GNUTLS_ERROR_EXIT(error, message) \ - if (GNUTLS_E_SUCCESS != error) { \ + if (error != GNUTLS_E_SUCCESS) { \ fprintf(stderr, "%s: %s\n", message, gnutls_strerror(error)); \ exit(EXIT_FAILURE); \ } @@ -103,7 +103,7 @@ int main(int argc, char **argv) { parse_arguments(argc, argv); port = atoi(argv[argc - 1]); - if (0 >= port || 0xffff < port) { + if (port <= 0 || port > 0xffff ) { print_usage(argv[0]); fprintf(stderr, "\ninvalid port: '%s'\n", argv[argc - 1]); return EXIT_FAILURE; @@ -138,7 +138,7 @@ int main(int argc, char **argv) { /* Spawn worker threads to handle requests. */ threads = malloc(thread_count * sizeof(*threads)); - if (NULL == threads) { + if (threads == NULL) { perror("thread malloc failed"); return EXIT_FAILURE; } @@ -149,7 +149,7 @@ int main(int argc, char **argv) { result = pthread_create(&thread, NULL, (void * (*)(void *))&worker_thread, NULL); - if (0 != result) { + if (result != 0) { fprintf(stderr, "failed to create worker thread: %s\n", strerror(result)); return EXIT_FAILURE; @@ -163,13 +163,13 @@ int main(int argc, char **argv) { #else server_socket = socket(PF_INET6, SOCK_STREAM, 0); #endif - if (-1 == server_socket) { + if (server_socket == -1) { perror("socket()"); return EXIT_FAILURE; } /* Fast rebinding for debug mode, could cause invalid packets. */ - if (LOG_DEBUG_LEVEL <= global_log_level) { + if (global_log_level >= LOG_DEBUG_LEVEL) { int socket_option = 1; setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR, &socket_option, sizeof(socket_option)); @@ -186,22 +186,22 @@ int main(int argc, char **argv) { server_in.sin6_addr = in6addr_any; /* bind to any address */ server_in.sin6_port = htons((uint16_t)port); /* port to bind to */ #endif - if (-1 == bind(server_socket, (struct sockaddr *)&server_in, - sizeof(server_in))) { + if (bind(server_socket, (struct sockaddr *)&server_in, + sizeof(server_in)) == -1) { perror("bind()"); return EXIT_FAILURE; } /* And accept connections. */ - if (-1 == listen(server_socket, 5)) { + if (listen(server_socket, 5) == -1) { perror("listen()"); return EXIT_FAILURE; } - if (LOG_DEBUG_LEVEL <= global_log_level) { + if (global_log_level >= LOG_DEBUG_LEVEL) { printf("tlsproxy %s\n", VERSION); printf("Listening for connections on port %d.\n", port); - if (NULL != global_proxy_host && NULL != global_proxy_port) { + if (global_proxy_host != NULL && global_proxy_port != NULL) { printf("Using proxy: %s:%s.\n", global_proxy_host, global_proxy_port); } @@ -210,7 +210,7 @@ int main(int argc, char **argv) { while (!done) { /* Accept new connection. */ client_socket = accept(server_socket, NULL, NULL); - if (-1 == client_socket) { + if (client_socket == -1) { perror("accept()"); break; } @@ -233,7 +233,7 @@ int main(int argc, char **argv) { } for (i = 0; i < thread_count; i++) { errno = pthread_join(threads[i], NULL); - if (0 != errno) { + if (errno != 0) { perror("pthread_join()"); } } @@ -272,10 +272,10 @@ static void parse_arguments(int argc, char **argv) { #endif global_passthrough_unknown = 0; - while (-1 != (option = getopt(argc, argv, "d:p:t:uh?"))) { + while ((option = getopt(argc, argv, "d:p:t:uh?")) != -1) { switch (option) { case 'd': { - if (0 > atoi(optarg)) { + if (atoi(optarg) < 0) { print_usage(argv[0]); fprintf(stderr, "\n-d positive number required: '%s'\n", optarg); @@ -288,11 +288,11 @@ static void parse_arguments(int argc, char **argv) { char *position; /* -p must have the format host:port. */ - if (NULL == (position = strchr(optarg, ':')) - || position == optarg - || 0 == strlen(position + 1) - || 0 >= atoi(position + 1) - || 0xffff < atoi(position + 1)) { + if ((position = strchr(optarg, ':')) == NULL + || optarg == position + || strlen(position + 1) == 0 + || atoi(position + 1) <= 0 + || atoi(position + 1) > 0xffff) { print_usage(argv[0]); fprintf(stderr, "\ninvalid -p: '%s', format host:port\n", optarg); @@ -300,7 +300,7 @@ static void parse_arguments(int argc, char **argv) { } global_proxy_host = malloc((size_t)(position - optarg) + 1); - if (NULL == global_proxy_host) { + if (global_proxy_host == NULL) { perror("malloc()"); exit(EXIT_FAILURE); } @@ -308,7 +308,7 @@ static void parse_arguments(int argc, char **argv) { global_proxy_host[position - optarg] = '\0'; global_proxy_port = malloc(strlen(position + 1) + 1); - if (NULL == global_proxy_port) { + if (global_proxy_port == NULL) { perror("malloc()"); exit(EXIT_FAILURE); } @@ -317,7 +317,7 @@ static void parse_arguments(int argc, char **argv) { break; } case 't': { - if (0 >= atoi(optarg)) { + if (atoi(optarg) <= 0) { print_usage(argv[0]); fprintf(stderr, "\n-t positive number required: '%s'\n", optarg); @@ -410,7 +410,7 @@ static void worker_thread(void) { V(ringbuffer_free); /* Negative value indicates we should shut down our thread. */ - if (0 > client_socket) { + if (client_socket < 0) { break; } diff --git a/src/verify.c b/src/verify.c index 6ea5f1b..96c49a5 100644 --- a/src/verify.c +++ b/src/verify.c @@ -47,7 +47,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { result = gnutls_certificate_verify_peers2(session, &status); /* Verification failed (!= invalid certificate but worse), no need for any * more checks. */ - if (0 > result) { + if (result < 0) { LOG(LOG_WARNING, "verify_tls_connection(): gnutls_certificate_verify_peers2() failed: %s", gnutls_strerror(result)); @@ -66,7 +66,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { /* We only handle X509 certificates for now. Let validation fail to * prevent an attacker from changing the certificate type to prevent * detection. */ - if (GNUTLS_CRT_X509 != gnutls_certificate_type_get(session)) { + if (gnutls_certificate_type_get(session) != GNUTLS_CRT_X509) { LOG(LOG_WARNING, "verify_tls_connection(): no X509 server certificate"); return -1; @@ -74,7 +74,8 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { /* Get server certificate. */ - if (0 > (result = gnutls_x509_crt_init(&cert))) { + result = gnutls_x509_crt_init(&cert); + if (result < 0) { LOG(LOG_WARNING, "verify_tls_connection(): gnutls_x509_crt_init() failed: %s", gnutls_strerror(result)); @@ -82,15 +83,15 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { } cert_list = gnutls_certificate_get_peers(session, &cert_list_size); - if (NULL == cert_list) { + if (cert_list == NULL) { LOG(LOG_WARNING, "verify_tls_connection(): gnutls_certificate_get_peers() failed"); gnutls_x509_crt_deinit(cert); return -1; } - if (0 > (result = gnutls_x509_crt_import(cert, &cert_list[0], - GNUTLS_X509_FMT_DER))) { + result = gnutls_x509_crt_import(cert, &cert_list[0], GNUTLS_X509_FMT_DER); + if (result < 0) { LOG(LOG_WARNING, "verify_tls_connection(): gnutls_x509_crt_import() failed: %s", gnutls_strerror(result)); @@ -103,7 +104,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { size = sizeof(server_cert); result = gnutls_x509_crt_export(cert, GNUTLS_X509_FMT_PEM, server_cert, &size); - if (GNUTLS_E_SUCCESS != result) { + if (result != GNUTLS_E_SUCCESS) { LOG(LOG_WARNING, "verify_tls_connection(): gnutls_x509_crt_export() failed: %s", gnutls_strerror(result)); @@ -114,7 +115,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { gnutls_x509_crt_deinit(cert); /* Open stored server certificate file. */ - if (0 != server_certificate_file(&file, hostname, path, sizeof(path))) { + if (server_certificate_file(&file, hostname, path, sizeof(path)) != 0) { LOG(LOG_DEBUG, "server certificate:\n%s", server_cert); return -1; } @@ -122,10 +123,10 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { size = 1; /* '\0' */ stored_cert[0] = '\0'; /* for strcat() */ - while (NULL != fgets(buffer, sizeof(buffer), file)) { + while (fgets(buffer, sizeof(buffer), file) != NULL) { size += strlen(buffer); /* Make sure the buffer is big enough. */ - if (sizeof(stored_cert) <= size) { + if (size >= sizeof(stored_cert)) { LOG(LOG_WARNING, "verify_tls_connection(): '%s' too big", path); fclose(file); @@ -147,7 +148,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { fclose(file); /* Check if the server certificate matches our stored certificate. */ - if (0 != strcmp(stored_cert, server_cert)) { + if (strcmp(stored_cert, server_cert) != 0) { LOG(LOG_ERROR, "verify_tls_connection(): server certificate changed!", path, strerror(errno)); @@ -159,11 +160,11 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { /* Check that the proxy certificate file exists and is readable for this * domain. This ensures we send an "invalid" certificate even if the proxy * certificate doesn't exist. */ - if (0 != proxy_certificate_path(hostname, path, sizeof(path))) { + if (proxy_certificate_path(hostname, path, sizeof(path)) != 0) { return -1; } file = fopen(path, "r"); - if (NULL == file) { + if (file == NULL) { LOG(LOG_WARNING, "verify_tls_connection(): proxy certificate doesn't exist: '%s'", path); @@ -187,7 +188,7 @@ static int get_certificate_path(const char *format, return -1; } /* Try to prevent path traversals in hostnames. */ - if (NULL != strstr(hostname, "..")) { + if (strstr(hostname, "..") != NULL) { LOG(LOG_WARNING, "get_certificate_path(): possible path traversal: '%s'", hostname); @@ -213,8 +214,8 @@ int proxy_certificate_path(const char *hostname, char *path, size_t size) { int server_certificate_file(FILE **file, const char *hostname, char *path, size_t size) { - if (0 != get_certificate_path(STORED_SERVER_CERT_FORMAT, - hostname, path, size)) { + if (get_certificate_path(STORED_SERVER_CERT_FORMAT, + hostname, path, size) != 0) { LOG_PERROR(LOG_ERROR, "server_certificate_file(): failed to get path"); return -1; @@ -222,7 +223,7 @@ int server_certificate_file(FILE **file, const char *hostname, /* Open the stored certificate file. */ *file = fopen(path, "rb"); - if (NULL == *file) { + if (*file == NULL) { if (global_passthrough_unknown) { LOG(LOG_DEBUG, "server_certificate_file(): failed to open '%s': %s",