From 64f0d6aaa81ffd4fc38e8473d221318c55d89352 Mon Sep 17 00:00:00 2001 From: Jim Hague Date: Fri, 7 Dec 2018 11:09:20 +0000 Subject: [PATCH] Rename _getdns_tls_connection_verify() to _getdns_tls_connection_certificate_verify(). I managed to mislead myself about what it did, which suggests the name should be clearer. --- src/gnutls/tls.c | 2 +- src/openssl/tls.c | 2 +- src/stub.c | 2 +- src/tls.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gnutls/tls.c b/src/gnutls/tls.c index 8588670c..2d515b3a 100644 --- a/src/gnutls/tls.c +++ b/src/gnutls/tls.c @@ -327,7 +327,7 @@ getdns_return_t _getdns_tls_connection_set_host_pinset(_getdns_tls_connection* c return GETDNS_RETURN_GOOD; } -getdns_return_t _getdns_tls_connection_verify(_getdns_tls_connection* conn, long* errnum, const char** errmsg) +getdns_return_t _getdns_tls_connection_certificate_verify(_getdns_tls_connection* conn, long* errnum, const char** errmsg) { (void) errnum; (void) errmsg; diff --git a/src/openssl/tls.c b/src/openssl/tls.c index de913b42..dcc68494 100644 --- a/src/openssl/tls.c +++ b/src/openssl/tls.c @@ -507,7 +507,7 @@ getdns_return_t _getdns_tls_connection_set_host_pinset(_getdns_tls_connection* c return GETDNS_RETURN_GOOD; } -getdns_return_t _getdns_tls_connection_verify(_getdns_tls_connection* conn, long* errnum, const char** errmsg) +getdns_return_t _getdns_tls_connection_certificate_verify(_getdns_tls_connection* conn, long* errnum, const char** errmsg) { if (!conn || !conn->ssl) return GETDNS_RETURN_INVALID_PARAMETER; diff --git a/src/stub.c b/src/stub.c index 723bd149..b6a9cdf1 100644 --- a/src/stub.c +++ b/src/stub.c @@ -957,7 +957,7 @@ tls_do_handshake(getdns_upstream *upstream) long verify_errno; const char* verify_errmsg; - if (_getdns_tls_connection_verify(upstream->tls_obj, &verify_errno, &verify_errmsg)) { + if (_getdns_tls_connection_certificate_verify(upstream->tls_obj, &verify_errno, &verify_errmsg)) { upstream->tls_auth_state = GETDNS_AUTH_OK; if (verify_errno != 0) { _getdns_upstream_log(upstream, diff --git a/src/tls.h b/src/tls.h index d475ee53..fe05dc52 100644 --- a/src/tls.h +++ b/src/tls.h @@ -271,7 +271,7 @@ getdns_return_t _getdns_tls_connection_set_host_pinset(_getdns_tls_connection* c * @return GETDNS_RETURN_INVALID_PARAMETER if conn is null or has no SSL. * @return GETDNS_RETURN_GENERIC_ERROR if verification failed. */ -getdns_return_t _getdns_tls_connection_verify(_getdns_tls_connection* conn, long* errnum, const char** errmsg); +getdns_return_t _getdns_tls_connection_certificate_verify(_getdns_tls_connection* conn, long* errnum, const char** errmsg); /** * Read from TLS.