diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-07-07 16:29:56 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-07-08 10:55:12 +0100 |
| commit | 87388e9a381bac19d9ebcd900d1382f4ea37b13a (patch) | |
| tree | 5945819d1655043fffdbb107d6cae43be3ea8fc2 | |
| parent | 4c0dacf431b9e3da2296b9a1d3918f03734b7c96 (diff) | |
TLS: use GEnum for WockyTLSVerificationLevel names
This both simplifies the code, and squashes a set-but-unused warning
when building with --disable-debug.
| -rw-r--r-- | wocky/wocky-openssl.c | 11 | ||||
| -rw-r--r-- | wocky/wocky-tls.c | 10 |
2 files changed, 7 insertions, 14 deletions
diff --git a/wocky/wocky-openssl.c b/wocky/wocky-openssl.c index aa4d2bc..e242d37 100644 --- a/wocky/wocky-openssl.c +++ b/wocky/wocky-openssl.c @@ -62,6 +62,7 @@ #define DEBUG_ASYNC_DETAIL_LEVEL 6 #include "wocky-debug.h" +#include "wocky-tls-enumtypes.h" #include "wocky-utils.h" #include <openssl/ssl.h> @@ -1000,7 +1001,6 @@ wocky_tls_session_verify_peer (WockyTLSSession *session, WockyTLSCertStatus *status) { int rval = -1; - const gchar *check_level; X509 *cert; gboolean lenient = (level == WOCKY_TLS_VERIFY_LENIENT); @@ -1011,21 +1011,16 @@ wocky_tls_session_verify_peer (WockyTLSSession *session, switch (level) { case WOCKY_TLS_VERIFY_STRICT: - check_level = "WOCKY_TLS_VERIFY_STRICT"; - break; case WOCKY_TLS_VERIFY_NORMAL: - check_level = "WOCKY_TLS_VERIFY_NORMAL"; - break; case WOCKY_TLS_VERIFY_LENIENT: - check_level = "WOCKY_TLS_VERIFY_LENIENT"; break; default: g_warn_if_reached (); - check_level = "Unknown strictness level"; level = WOCKY_TLS_VERIFY_STRICT; } - DEBUG ("setting ssl verify flags level to: %s", check_level); + DEBUG ("setting ssl verify flags level to: %s", + wocky_enum_to_nick (WOCKY_TYPE_TLS_VERIFICATION_LEVEL, level)); cert = SSL_get_peer_certificate (session->ssl); rval = SSL_get_verify_result (session->ssl); DEBUG ("X509 cert: %p; verified: %d", cert, rval); diff --git a/wocky/wocky-tls.c b/wocky/wocky-tls.c index d642e9b..5a5e843 100644 --- a/wocky/wocky-tls.c +++ b/wocky/wocky-tls.c @@ -71,6 +71,8 @@ GNUTLS_VERIFY_DISABLE_CA_SIGN ) #include "wocky-debug.h" +#include "wocky-tls-enumtypes.h" +#include "wocky-utils.h" #include <gnutls/gnutls.h> #include <string.h> @@ -670,7 +672,6 @@ wocky_tls_session_verify_peer (WockyTLSSession *session, guint cls = -1; guint _stat = 0; gboolean peer_name_ok = TRUE; - const gchar *check_level; gnutls_certificate_verify_flags check; /* list gnutls cert error conditions in descending order of noteworthiness * @@ -696,25 +697,22 @@ wocky_tls_session_verify_peer (WockyTLSSession *session, switch (level) { case WOCKY_TLS_VERIFY_STRICT: - check_level = "WOCKY_TLS_VERIFY_STRICT"; check = VERIFY_STRICT; break; case WOCKY_TLS_VERIFY_NORMAL: - check_level = "WOCKY_TLS_VERIFY_NORMAL"; check = VERIFY_NORMAL; break; case WOCKY_TLS_VERIFY_LENIENT: - check_level = "WOCKY_TLS_VERIFY_LENIENT"; check = VERIFY_LENIENT; break; default: g_warn_if_reached (); - check_level = "Unknown strictness level"; check = VERIFY_STRICT; break; } - DEBUG ("setting gnutls verify flags level to: %s", check_level); + DEBUG ("setting gnutls verify flags level to: %s", + wocky_enum_to_nick (WOCKY_TYPE_TLS_VERIFICATION_LEVEL, level)); gnutls_certificate_set_verify_flags (session->gnutls_cert_cred, check); rval = gnutls_certificate_verify_peers2 (session->session, &_stat); |