From 3b6bae256972241e12a7c47b1bb821dda348b409 Mon Sep 17 00:00:00 2001 From: Siraj Razick Date: Thu, 26 Jan 2012 15:14:02 -0500 Subject: 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 --- wocky/wocky-tls.c | 6 +++--- 1 file 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; -- cgit v1.2.3 From 97a5823f03850f70bbd1da12af1364adc925e494 Mon Sep 17 00:00:00 2001 From: Siraj Razick Date: Thu, 26 Jan 2012 16:13:18 -0500 Subject: TLS: replace gsize and gssize with size_t and ssize_t gnutls_transport_set_push_function expects a function of ssize_t (*gnutls_push_func)(gnutls_transport_ptr_t, const void*, size_t); and in mingw32 gsize and gssize doesn't expend to size_t or ssize_t. this results in mingw32 builds fail due to the warning. https://bugs.freedesktop.org/show_bug.cgi?id=45272 --- wocky/wocky-tls.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wocky/wocky-tls.c b/wocky/wocky-tls.c index 5040b66..6bf2e3a 100644 --- a/wocky/wocky-tls.c +++ b/wocky/wocky-tls.c @@ -1232,10 +1232,10 @@ wocky_tls_session_write_ready (GObject *object, wocky_tls_session_try_operation (session, WOCKY_TLS_OP_WRITE); } -static gssize +static ssize_t wocky_tls_session_push_func (gpointer user_data, const void *buffer, - gsize count) + size_t count) { WockyTLSSession *session = WOCKY_TLS_SESSION (user_data); GOutputStream *stream; @@ -1325,10 +1325,10 @@ wocky_tls_session_push_func (gpointer user_data, } } -static gssize +static ssize_t wocky_tls_session_pull_func (gpointer user_data, void *buffer, - gsize count) + size_t count) { WockyTLSSession *session = WOCKY_TLS_SESSION (user_data); GInputStream *stream; -- cgit v1.2.3 From 8a4afe112d4a61ffe9fa0fd629dd92fdc90e68b7 Mon Sep 17 00:00:00 2001 From: Siraj Razick Date: Thu, 26 Jan 2012 16:20:04 -0500 Subject: Fix warnings from wocky-connector-test.c under mingw32 In windows socket API setsockopt takes a const char * as the fourth parameter, while on Linux it takes a void * so we cast to const char * which will work under both the platforms. This patch also move flags veriable in client_connected to the unix part of the ifdef, to remove warnings which shows up with mingw32. --- tests/wocky-connector-test.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/wocky-connector-test.c b/tests/wocky-connector-test.c index 624a551..7476540 100644 --- a/tests/wocky-connector-test.c +++ b/tests/wocky-connector-test.c @@ -3140,10 +3140,11 @@ client_connected (GIOChannel *channel, ConnectorProblem *cproblem = &test->server_parameters.problem.conn; #ifdef G_OS_WIN32 u_long mode = 0; +#else + long flags; #endif GSocketConnection *gconn; - long flags; if (csock < 0) { @@ -3199,7 +3200,7 @@ start_dummy_xmpp_server (test_t *test) server.sin_addr.s_addr = inet_addr ((const char * ) REACHABLE); server.sin_port = htons (port); ssock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); - setsockopt (ssock, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof (reuse)); + setsockopt (ssock, SOL_SOCKET, SO_REUSEADDR, (const char *) &reuse, sizeof (reuse)); res = bind (ssock, (struct sockaddr *) &server, sizeof (server)); -- cgit v1.2.3