diff options
| author | Tom Vrancken <dev@tomvrancken.nl> | 2018-10-11 21:25:11 +0200 |
|---|---|---|
| committer | Tom Vrancken <dev@tomvrancken.nl> | 2018-10-18 21:39:48 +0200 |
| commit | 393de1d3e2220dbeb3f249232974ab857c7d0b9c (patch) | |
| tree | 7c02eb599276d9c7aad6f26d2d73e1e44c3641a4 | |
| parent | f628457eef8e69f2c2857c3bcf014c207fdab5dc (diff) | |
| download | gnutls-393de1d3e2220dbeb3f249232974ab857c7d0b9c.tar.gz | |
Renamed CHECK_AUTH macro to CHECK_AUTH_TYPE to be more clear what it checks.
Signed-off-by: Tom Vrancken <dev@tomvrancken.nl>
| -rw-r--r-- | lib/cert-session.c | 12 | ||||
| -rw-r--r-- | lib/psk.c | 4 | ||||
| -rw-r--r-- | lib/srp.c | 2 | ||||
| -rw-r--r-- | lib/state.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/lib/cert-session.c b/lib/cert-session.c index 580a871964..2726512f5d 100644 --- a/lib/cert-session.c +++ b/lib/cert-session.c @@ -61,7 +61,7 @@ const gnutls_datum_t *gnutls_certificate_get_ours(gnutls_session_t session) { gnutls_certificate_credentials_t cred; - CHECK_AUTH(GNUTLS_CRD_CERTIFICATE, NULL); + CHECK_AUTH_TYPE(GNUTLS_CRD_CERTIFICATE, NULL); cred = (gnutls_certificate_credentials_t) _gnutls_get_cred(session, GNUTLS_CRD_CERTIFICATE); @@ -103,7 +103,7 @@ const gnutls_datum_t *gnutls_certificate_get_peers(gnutls_session_t { cert_auth_info_t info; - CHECK_AUTH(GNUTLS_CRD_CERTIFICATE, NULL); + CHECK_AUTH_TYPE(GNUTLS_CRD_CERTIFICATE, NULL); info = _gnutls_get_auth_info(session, GNUTLS_CRD_CERTIFICATE); if (info == NULL) @@ -455,7 +455,7 @@ _gnutls_x509_cert_verify_peers(gnutls_session_t session, /* No OCSP check so far */ session->internals.ocsp_check_ok = 0; - CHECK_AUTH(GNUTLS_CRD_CERTIFICATE, GNUTLS_E_INVALID_REQUEST); + CHECK_AUTH_TYPE(GNUTLS_CRD_CERTIFICATE, GNUTLS_E_INVALID_REQUEST); info = _gnutls_get_auth_info(session, GNUTLS_CRD_CERTIFICATE); if (info == NULL) { @@ -708,7 +708,7 @@ gnutls_certificate_verify_peers(gnutls_session_t session, { cert_auth_info_t info; - CHECK_AUTH(GNUTLS_CRD_CERTIFICATE, GNUTLS_E_INVALID_REQUEST); + CHECK_AUTH_TYPE(GNUTLS_CRD_CERTIFICATE, GNUTLS_E_INVALID_REQUEST); info = _gnutls_get_auth_info(session, GNUTLS_CRD_CERTIFICATE); if (info == NULL) { @@ -808,7 +808,7 @@ time_t gnutls_certificate_expiration_time_peers(gnutls_session_t session) { cert_auth_info_t info; - CHECK_AUTH(GNUTLS_CRD_CERTIFICATE, GNUTLS_E_INVALID_REQUEST); + CHECK_AUTH_TYPE(GNUTLS_CRD_CERTIFICATE, GNUTLS_E_INVALID_REQUEST); info = _gnutls_get_auth_info(session, GNUTLS_CRD_CERTIFICATE); if (info == NULL) { @@ -844,7 +844,7 @@ time_t gnutls_certificate_activation_time_peers(gnutls_session_t session) { cert_auth_info_t info; - CHECK_AUTH(GNUTLS_CRD_CERTIFICATE, GNUTLS_E_INVALID_REQUEST); + CHECK_AUTH_TYPE(GNUTLS_CRD_CERTIFICATE, GNUTLS_E_INVALID_REQUEST); info = _gnutls_get_auth_info(session, GNUTLS_CRD_CERTIFICATE); if (info == NULL) { @@ -327,7 +327,7 @@ const char *gnutls_psk_server_get_username(gnutls_session_t session) { psk_auth_info_t info; - CHECK_AUTH(GNUTLS_CRD_PSK, NULL); + CHECK_AUTH_TYPE(GNUTLS_CRD_PSK, NULL); info = _gnutls_get_auth_info(session, GNUTLS_CRD_PSK); if (info == NULL) @@ -358,7 +358,7 @@ const char *gnutls_psk_client_get_hint(gnutls_session_t session) { psk_auth_info_t info; - CHECK_AUTH(GNUTLS_CRD_PSK, NULL); + CHECK_AUTH_TYPE(GNUTLS_CRD_PSK, NULL); info = _gnutls_get_auth_info(session, GNUTLS_CRD_PSK); if (info == NULL) @@ -708,7 +708,7 @@ const char *gnutls_srp_server_get_username(gnutls_session_t session) { srp_server_auth_info_t info; - CHECK_AUTH(GNUTLS_CRD_SRP, NULL); + CHECK_AUTH_TYPE(GNUTLS_CRD_SRP, NULL); info = _gnutls_get_auth_info(session, GNUTLS_CRD_SRP); if (info == NULL) diff --git a/lib/state.h b/lib/state.h index a93e5d49ce..e4fb85c461 100644 --- a/lib/state.h +++ b/lib/state.h @@ -71,7 +71,7 @@ _gnutls_hello_set_default_version(gnutls_session_t session, #include <auth.h> -#define CHECK_AUTH(auth, ret) if (gnutls_auth_get_type(session) != auth) { \ +#define CHECK_AUTH_TYPE(auth, ret) if (gnutls_auth_get_type(session) != auth) { \ gnutls_assert(); \ return ret; \ } |