#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. */
- if (status & GNUTLS_CERT_EXPIRED
- || status & GNUTLS_CERT_REVOKED
+ /* 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_INSECURE_ALGORITHM) {
+ || 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;
}
}
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;