diff options
Diffstat (limited to 'libdane')
| -rw-r--r-- | libdane/dane.c | 10 | ||||
| -rw-r--r-- | libdane/includes/gnutls/dane.h | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/libdane/dane.c b/libdane/dane.c index 7c2be56a07..b8869d9e2b 100644 --- a/libdane/dane.c +++ b/libdane/dane.c @@ -430,7 +430,7 @@ gnutls_x509_crt_t crt = NULL, ca = NULL; if (!matches(&raw_crt[1], data, match)) { gnutls_assert(); - *verify |= DANE_VERIFY_CA_CONSTRAINS_VIOLATED; + *verify |= DANE_VERIFY_CA_CONSTRAINTS_VIOLATED; } } else if (ctype == DANE_CERT_PK && crt_type == GNUTLS_CRT_X509) { @@ -442,7 +442,7 @@ gnutls_x509_crt_t crt = NULL, ca = NULL; if (!matches(&pubkey, data, match)) { gnutls_assert(); - *verify |= DANE_VERIFY_CA_CONSTRAINS_VIOLATED; + *verify |= DANE_VERIFY_CA_CONSTRAINTS_VIOLATED; } } else { ret = gnutls_assert_val(DANE_E_UNKNOWN_DANE_DATA); @@ -477,7 +477,7 @@ gnutls_x509_crt_t crt = NULL, ca = NULL; ret = gnutls_x509_crt_check_issuer(crt, ca); if (ret == 0) { gnutls_assert(); - *verify |= DANE_VERIFY_CA_CONSTRAINS_VIOLATED; + *verify |= DANE_VERIFY_CA_CONSTRAINTS_VIOLATED; } ret = gnutls_x509_crt_verify(crt, &ca, 1, 0, &vstatus); @@ -486,7 +486,7 @@ gnutls_x509_crt_t crt = NULL, ca = NULL; goto cleanup; } if (vstatus != 0) - *verify |= DANE_VERIFY_CA_CONSTRAINS_VIOLATED; + *verify |= DANE_VERIFY_CA_CONSTRAINTS_VIOLATED; ret = 0; cleanup: @@ -710,7 +710,7 @@ dane_verification_status_print (unsigned int status, else _gnutls_buffer_append_str (&str, _("Verification failed. ")); - if (status & DANE_VERIFY_CA_CONSTRAINS_VIOLATED) + if (status & DANE_VERIFY_CA_CONSTRAINTS_VIOLATED) _gnutls_buffer_append_str (&str, _("CA constrains were violated. ")); if (status & DANE_VERIFY_CERT_DIFFERS) diff --git a/libdane/includes/gnutls/dane.h b/libdane/includes/gnutls/dane.h index cbaa539339..487e731142 100644 --- a/libdane/includes/gnutls/dane.h +++ b/libdane/includes/gnutls/dane.h @@ -139,7 +139,7 @@ typedef enum dane_verify_flags_t /** * dane_verify_status_t: - * @DANE_VERIFY_CA_CONSTRAINS_VIOLATED: The CA constrains was violated. + * @DANE_VERIFY_CA_CONSTRAINTS_VIOLATED: The CA constrains was violated. * @DANE_VERIFY_CERT_DIFFERS: The certificate obtained via DNS differs. * @DANE_VERIFY_NO_DANE_INFO: No DANE data were found in the DNS record. * @@ -147,11 +147,13 @@ typedef enum dane_verify_flags_t */ typedef enum dane_verify_status_t { - DANE_VERIFY_CA_CONSTRAINS_VIOLATED = 1, + DANE_VERIFY_CA_CONSTRAINTS_VIOLATED = 1, DANE_VERIFY_CERT_DIFFERS = 1<<1, DANE_VERIFY_NO_DANE_INFO = 1<<2, } dane_verify_status_t; +#define DANE_VERIFY_CA_CONSTRAINS_VIOLATED DANE_VERIFY_CA_CONSTRAINTS_VIOLATED + int dane_verification_status_print (unsigned int status, gnutls_datum_t * out, unsigned int flags); |