From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:51128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1Hlt-0003eK-Jj for qemu-devel@nongnu.org; Wed, 07 Sep 2011 09:02:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R1Hlm-0000Ao-86 for qemu-devel@nongnu.org; Wed, 07 Sep 2011 09:02:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11825) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1Hlm-0000AZ-0a for qemu-devel@nongnu.org; Wed, 07 Sep 2011 09:02:22 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p87D2LMC028270 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 7 Sep 2011 09:02:21 -0400 From: Gerd Hoffmann Date: Wed, 7 Sep 2011 15:02:17 +0200 Message-Id: <1315400537-25487-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1315400537-25487-1-git-send-email-kraxel@redhat.com> References: <1315400537-25487-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] vns/tls: don't use depricated gnutls functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Avoid using depricated gnutls functions with recent gnutls versions. Fixes build failure on Fedora 16. Keep the old way for compatibility with old installations such as RHEL-5 (gnutls 1.4.x). Based on a patch from Raghavendra D Prabhu Signed-off-by: Gerd Hoffmann --- ui/vnc-tls.c | 62 ++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 43 insertions(+), 19 deletions(-) diff --git a/ui/vnc-tls.c b/ui/vnc-tls.c index 2e2456e..276e127 100644 --- a/ui/vnc-tls.c +++ b/ui/vnc-tls.c @@ -283,13 +283,51 @@ int vnc_tls_validate_certificate(struct VncState *vs) return 0; } +#if defined(GNUTLS_VERSION_NUMBER) && \ + GNUTLS_VERSION_NUMBER >= 0x020200 /* 2.2.0 */ + +static int vnc_set_gnutls_priority(struct VncState *vs, int needX509Creds) +{ + const char *priority = needX509Creds ? "NORMAL" : "NORMAL:+ANON-DH"; + + if (gnutls_priority_set_direct(vs->tls.session, priority, NULL) < 0) { + return -1; + } + return 0; +} + +#else + +static int vnc_set_gnutls_priority(struct VncState *vs, int x509) +{ + static const int cert_types[] = { GNUTLS_CRT_X509, 0 }; + static const int protocols[] = { + GNUTLS_TLS1_1, GNUTLS_TLS1_0, GNUTLS_SSL3, 0 + }; + static const int kx_anon[] = { GNUTLS_KX_ANON_DH, 0 }; + static const int kx_x509[] = { + GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, + GNUTLS_KX_DHE_RSA, GNUTLS_KX_SRP, 0 + }; + + if (gnutls_kx_set_priority(vs->tls.session, x509 ? kx_x509 : kx_anon) < 0) { + return -1; + } + + if (gnutls_certificate_type_set_priority(vs->tls.session, cert_types) < 0) { + return -1; + } + + if (gnutls_protocol_set_priority(vs->tls.session, protocols) < 0) { + return -1; + } + return 0; +} + +#endif int vnc_tls_client_setup(struct VncState *vs, int needX509Creds) { - static const int cert_type_priority[] = { GNUTLS_CRT_X509, 0 }; - static const int protocol_priority[]= { GNUTLS_TLS1_1, GNUTLS_TLS1_0, GNUTLS_SSL3, 0 }; - static const int kx_anon[] = {GNUTLS_KX_ANON_DH, 0}; - static const int kx_x509[] = {GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, GNUTLS_KX_DHE_RSA, GNUTLS_KX_SRP, 0}; VNC_DEBUG("Do TLS setup\n"); if (vnc_tls_initialize() < 0) { @@ -310,21 +348,7 @@ int vnc_tls_client_setup(struct VncState *vs, return -1; } - if (gnutls_kx_set_priority(vs->tls.session, needX509Creds ? kx_x509 : kx_anon) < 0) { - gnutls_deinit(vs->tls.session); - vs->tls.session = NULL; - vnc_client_error(vs); - return -1; - } - - if (gnutls_certificate_type_set_priority(vs->tls.session, cert_type_priority) < 0) { - gnutls_deinit(vs->tls.session); - vs->tls.session = NULL; - vnc_client_error(vs); - return -1; - } - - if (gnutls_protocol_set_priority(vs->tls.session, protocol_priority) < 0) { + if (vnc_set_gnutls_priority(vs, needX509Creds) < 0) { gnutls_deinit(vs->tls.session); vs->tls.session = NULL; vnc_client_error(vs); -- 1.7.1