#include <gnutls/x509.h>
+/* 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);
gnutls_strerror(result));
return -1;
}
- /* Definitely an invalid certificate, abort. */
+ /* Definitely an invalid certificate, abort. We don't perform any CA
+ * verification so don't check for GNUTLS_CERT_INVALID. */
if (status & GNUTLS_CERT_REVOKED
+ || status & GNUTLS_CERT_SIGNER_NOT_CA
|| status & GNUTLS_CERT_INSECURE_ALGORITHM
|| status & GNUTLS_CERT_NOT_ACTIVATED
|| 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;
}
return -2;
}
- /* 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. */
+ /* Check that the proxy certificate file for this domain exists and is
+ * readable. This ensures we send an "invalid" certificate if the proxy
+ * certificate doesn't exist.
+ *
+ * If the file gets removed or becomes unreadable after the check we won't
+ * be able to establish a connection to the real server so this
+ * race-condition has no security issues and is only a convenience for the
+ * user. */
if (proxy_certificate_path(hostname, path, sizeof(path)) != 0) {
return -1;
}
}
int proxy_certificate_path(const char *hostname, char *path, size_t size) {
- return get_certificate_path(PROXY_SERVER_CERT_FORMAT,
+ return get_certificate_path(PROXY_SERVER_CERT_FILE_FORMAT,
hostname, path, size);
}
int server_certificate_file(FILE **file, const char *hostname,
char *path, size_t size) {
- if (get_certificate_path(STORED_SERVER_CERT_FORMAT,
+ if (get_certificate_path(STORED_SERVER_CERT_FILE_FORMAT,
hostname, path, size) != 0) {
LOG_PERROR(ERROR, "server_certificate_file(): failed to get path");
return -1;