X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fconnection.c;h=ac3bc21cb5db457f0553566e23cda32a690d4750;hb=a64101800c79c852cc4ab9d445c35aad0a6457eb;hp=0a69f78b228e1b4e64af911bdd4fe8ace64f1fbf;hpb=ceebf9e917885f33396b93504943d7b8e63e782b;p=tlsproxy%2Ftlsproxy.git

diff --git a/src/connection.c b/src/connection.c
index 0a69f78..ac3bc21 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,7 @@
 /*
  * Handle connections.
  *
- * Copyright (C) 2011  Simon Ruderich
+ * Copyright (C) 2011-2013  Simon Ruderich
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -199,7 +199,7 @@ void handle_connection(int client_socket) {
      * certificate then just pass through the connection and let the client
      * verify the server certificate. */
     if (global_passthrough_unknown) {
-        char path[1024];
+        char path[TLSPROXY_MAX_PATH_LENGTH];
         FILE *file = NULL;
 
         if (-2 == server_certificate_file(&file, host, path, sizeof(path))) {
@@ -353,11 +353,11 @@ static int initialize_tls_session_client(int peer_socket,
         gnutls_certificate_credentials_t *x509_cred) {
     int result;
     int use_invalid_cert;
-    char path[1024];
+    char path[TLSPROXY_MAX_PATH_LENGTH];
 
     /* 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 = (0 == strcmp(hostname, "invalid"));
 
     if (0 != proxy_certificate_path(hostname, path, sizeof(path))) {
         LOG(LOG_ERROR,
@@ -470,7 +470,7 @@ gnutls_certificate_allocate_credentials(): %s",
         gnutls_certificate_free_credentials(*x509_cred);
         return -1;
     }
-    gnutls_priority_set(*session, global_tls_priority_cache);
+    result = gnutls_priority_set(*session, global_tls_priority_cache);
     if (GNUTLS_E_SUCCESS != result) {
         LOG(LOG_ERROR,
             "initialize_tls_session_server(): gnutls_priority_set(): %s",
@@ -512,7 +512,7 @@ static int read_http_request(FILE *client_fd, char *request, size_t length) {
         return -2;
     }
 
-    while (NULL != fgets(buffer, MAX_REQUEST_LINE, client_fd)) {
+    while (NULL != fgets(buffer, sizeof(buffer), client_fd)) {
         /* End of header. */
         if (0 == strcmp(buffer, "\n") || 0 == strcmp(buffer, "\r\n")) {
             break;