summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiraj Razick <siraj.razick@collabora.co.uk>2012-01-26 15:14:02 -0500
committerSiraj Razick <siraj.razick@collabora.co.uk>2012-01-26 16:11:00 -0500
commit3b6bae256972241e12a7c47b1bb821dda348b409 (patch)
tree77a0c3bb83a8a015e0e0fe9aa62d6a313ec9d50a
parent44a326f3ab2aafea7a78df6ac75e9b4c014fe0e8 (diff)
TLS: Rename _stat variable to peer_cert_status
_stat shadows a global variable defined in mingw32 so this patch renames it to peer_cert_status in wocky_tls_session_verify_peer https://bugs.freedesktop.org/show_bug.cgi?id=45272
-rw-r--r--wocky/wocky-tls.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/wocky/wocky-tls.c b/wocky/wocky-tls.c
index 855b9e6..5040b66 100644
--- a/wocky/wocky-tls.c
+++ b/wocky/wocky-tls.c
@@ -688,7 +688,7 @@ wocky_tls_session_verify_peer (WockyTLSSession *session,
688 WockyTLSCertStatus *status) 688 WockyTLSCertStatus *status)
689{ 689{
690 int rval = -1; 690 int rval = -1;
691 guint _stat = 0; 691 guint peer_cert_status = 0;
692 gboolean peer_name_ok = TRUE; 692 gboolean peer_name_ok = TRUE;
693 gnutls_certificate_verify_flags check; 693 gnutls_certificate_verify_flags check;
694 694
@@ -732,7 +732,7 @@ wocky_tls_session_verify_peer (WockyTLSSession *session,
732 DEBUG ("setting gnutls verify flags level to: %s", 732 DEBUG ("setting gnutls verify flags level to: %s",
733 wocky_enum_to_nick (WOCKY_TYPE_TLS_VERIFICATION_LEVEL, level)); 733 wocky_enum_to_nick (WOCKY_TYPE_TLS_VERIFICATION_LEVEL, level));
734 gnutls_certificate_set_verify_flags (session->gnutls_cert_cred, check); 734 gnutls_certificate_set_verify_flags (session->gnutls_cert_cred, check);
735 rval = gnutls_certificate_verify_peers2 (session->session, &_stat); 735 rval = gnutls_certificate_verify_peers2 (session->session, &peer_cert_status);
736 736
737 if (rval != GNUTLS_E_SUCCESS) 737 if (rval != GNUTLS_E_SUCCESS)
738 { 738 {
@@ -876,7 +876,7 @@ wocky_tls_session_verify_peer (WockyTLSSession *session,
876 for (x = 0; status_map[x].gnutls != 0; x++) 876 for (x = 0; status_map[x].gnutls != 0; x++)
877 { 877 {
878 DEBUG ("checking gnutls error %d", status_map[x].gnutls); 878 DEBUG ("checking gnutls error %d", status_map[x].gnutls);
879 if (_stat & status_map[x].gnutls) 879 if (peer_cert_status & status_map[x].gnutls)
880 { 880 {
881 DEBUG ("gnutls error %d set", status_map[x].gnutls); 881 DEBUG ("gnutls error %d set", status_map[x].gnutls);
882 *status = status_map[x].wocky; 882 *status = status_map[x].wocky;