From patchwork Wed Jan 23 17:16:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: vnc: Clean up vncws_send_handshake_response() From: Markus Armbruster X-Patchwork-Id: 215008 Message-Id: <1358961360-15623-1-git-send-email-armbru@redhat.com> To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, thardeck@suse.de Date: Wed, 23 Jan 2013 18:16:00 +0100 Use appropriate types, drop superfluous casts, use sizeof, don't exploit that this particular call of gnutls_fingerprint() doesn't change its last argument. Signed-off-by: Markus Armbruster Reviewed-by: Tim Hardeck --- ui/vnc-ws.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c index 9ccdc19..de7e74c 100644 --- a/ui/vnc-ws.c +++ b/ui/vnc-ws.c @@ -120,8 +120,8 @@ static char *vncws_extract_handshake_entry(const char *handshake, static void vncws_send_handshake_response(VncState *vs, const char* key) { char combined_key[WS_CLIENT_KEY_LEN + WS_GUID_LEN + 1]; - char hash[SHA1_DIGEST_LEN]; - size_t hash_size = SHA1_DIGEST_LEN; + unsigned char hash[SHA1_DIGEST_LEN]; + size_t hash_size = sizeof(hash); char *accept = NULL, *response = NULL; gnutls_datum_t in; @@ -133,7 +133,7 @@ static void vncws_send_handshake_response(VncState *vs, const char* key) in.size = WS_CLIENT_KEY_LEN + WS_GUID_LEN; if (gnutls_fingerprint(GNUTLS_DIG_SHA1, &in, hash, &hash_size) == GNUTLS_E_SUCCESS) { - accept = g_base64_encode((guchar *)hash, SHA1_DIGEST_LEN); + accept = g_base64_encode(hash, hash_size); } if (accept == NULL) { VNC_DEBUG("Hashing Websocket combined key failed\n");