summaryrefslogtreecommitdiff
authorSiraj Razick <siraj.razick@collabora.co.uk>2012-01-26 20:14:02 (GMT)
committer Siraj Razick <siraj.razick@collabora.co.uk>2012-01-26 21:11:00 (GMT)
commit3b6bae256972241e12a7c47b1bb821dda348b409 (patch) (side-by-side diff)
tree77a0c3bb83a8a015e0e0fe9aa62d6a313ec9d50a
parent44a326f3ab2aafea7a78df6ac75e9b4c014fe0e8 (diff)
downloadwocky-3b6bae256972241e12a7c47b1bb821dda348b409.zip
wocky-3b6bae256972241e12a7c47b1bb821dda348b409.tar.gz
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
Diffstat (more/less context) (ignore whitespace changes)
-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,
WockyTLSCertStatus *status)
{
int rval = -1;
- guint _stat = 0;
+ guint peer_cert_status = 0;
gboolean peer_name_ok = TRUE;
gnutls_certificate_verify_flags check;
@@ -732,7 +732,7 @@ wocky_tls_session_verify_peer (WockyTLSSession *session,
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);
+ rval = gnutls_certificate_verify_peers2 (session->session, &peer_cert_status);
if (rval != GNUTLS_E_SUCCESS)
{
@@ -876,7 +876,7 @@ wocky_tls_session_verify_peer (WockyTLSSession *session,
for (x = 0; status_map[x].gnutls != 0; x++)
{
DEBUG ("checking gnutls error %d", status_map[x].gnutls);
- if (_stat & status_map[x].gnutls)
+ if (peer_cert_status & status_map[x].gnutls)
{
DEBUG ("gnutls error %d set", status_map[x].gnutls);
*status = status_map[x].wocky;