X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fverify.c;h=f68d1bb771a63526f93fba00623fa30061b69e9e;hb=8f9459308e695a30874a6cdcd53aa26441b87131;hp=f6742361f3e9d111a4bc779c246a10d11914a6fe;hpb=780dee36f7c90cc505a64a8b4489dc1fbdeeb42a;p=tlsproxy%2Ftlsproxy.git diff --git a/src/verify.c b/src/verify.c index f674236..f68d1bb 100644 --- a/src/verify.c +++ b/src/verify.c @@ -26,6 +26,31 @@ #include +/* Compatibility for older GnuTLS versions. Define the constants in a way + * which doesn't affect the status check below. */ +#ifndef GNUTLS_CERT_SIGNER_NOT_CA +# define GNUTLS_CERT_SIGNER_NOT_CA 0 +#endif +#ifndef GNUTLS_CERT_SIGNATURE_FAILURE +# define GNUTLS_CERT_SIGNATURE_FAILURE 0 +#endif +#ifndef GNUTLS_CERT_REVOCATION_DATA_SUPERSEDED +# define GNUTLS_CERT_REVOCATION_DATA_SUPERSEDED 0 +#endif +#ifndef GNUTLS_CERT_UNEXPECTED_OWNER +# define GNUTLS_CERT_UNEXPECTED_OWNER 0 +#endif +#ifndef GNUTLS_CERT_REVOCATION_DATA_ISSUED_IN_FUTURE +# define GNUTLS_CERT_REVOCATION_DATA_ISSUED_IN_FUTURE 0 +#endif +#ifndef GNUTLS_CERT_SIGNER_CONSTRAINTS_FAILURE +# define GNUTLS_CERT_SIGNER_CONSTRAINTS_FAILURE 0 +#endif +#ifndef GNUTLS_CERT_MISMATCH +# define GNUTLS_CERT_MISMATCH 0 +#endif + + static int get_certificate_path(const char *format, const char *hostname, char *buffer, size_t size); @@ -49,17 +74,24 @@ 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; } /* Definitely an invalid certificate, abort. */ - if (status & GNUTLS_CERT_EXPIRED - || status & GNUTLS_CERT_REVOKED + if (status & GNUTLS_CERT_REVOKED + || status & GNUTLS_CERT_SIGNER_NOT_CA + || status & GNUTLS_CERT_INSECURE_ALGORITHM || status & GNUTLS_CERT_NOT_ACTIVATED - || status & GNUTLS_CERT_INSECURE_ALGORITHM) { - LOG(WARNING, - "verify_tls_connection(): invalid server certificate"); + || status & GNUTLS_CERT_EXPIRED + || status & GNUTLS_CERT_SIGNATURE_FAILURE + || status & GNUTLS_CERT_REVOCATION_DATA_SUPERSEDED + || status & GNUTLS_CERT_UNEXPECTED_OWNER + || status & GNUTLS_CERT_REVOCATION_DATA_ISSUED_IN_FUTURE + || status & GNUTLS_CERT_SIGNER_CONSTRAINTS_FAILURE + || status & GNUTLS_CERT_MISMATCH) { + LOG(WARNING, "verify_tls_connection(): invalid server certificate"); return -1; } @@ -67,8 +99,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; } @@ -116,7 +147,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { /* Open stored server certificate file. */ if (server_certificate_file(&file, hostname, path, sizeof(path)) != 0) { - LOG(DEBUG, "server certificate:\n%s", server_cert); + LOG(DEBUG1, "server certificate:\n%s", server_cert); return -1; } @@ -130,28 +161,26 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { LOG(WARNING, "verify_tls_connection(): '%s' too big", path); fclose(file); - LOG(DEBUG, "server certificate:\n%s", server_cert); + LOG(DEBUG1, "server certificate:\n%s", server_cert); return -1; } 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); + LOG(DEBUG1, "server certificate:\n%s", server_cert); return -1; } fclose(file); /* 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 +212,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 +244,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 +252,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(DEBUG1, "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;