Patchwork vnc-tls: Fix compilation with newer versions of GNU-TLS

login
register
mail settings
Submitter Andre Przywara
Date Oct. 18, 2012, 9:16 a.m.
Message ID <1350551818-14717-1-git-send-email-andre.przywara@amd.com>
Download mbox | patch
Permalink /patch/192247/
State New
Headers show

Comments

Andre Przywara - Oct. 18, 2012, 9:16 a.m.
In my installation of GNU-TLS (v3.0.23) the type
gnutls_anon_server_credentials is marked deprecated, so -Werror
breaks compilation.
Simply replacing it with the newer ..._t version fixed the compilation
on my machine (Slackware 14.0). I cannot tell how far back this "new"
type goes, at least the header file in RHEL 5.0 (v1.4.1) seems to have
it already. If someone finds a broken distribution, tell me and I
insert some compat code.

Signed-off-by: Andre Przywara <andre.przywara@amd.com>
---
 ui/vnc-tls.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Gerd Hoffmann - Oct. 18, 2012, 9:23 a.m.
On 10/18/12 11:16, Andre Przywara wrote:
> In my installation of GNU-TLS (v3.0.23) the type
> gnutls_anon_server_credentials is marked deprecated, so -Werror
> breaks compilation.
> Simply replacing it with the newer ..._t version fixed the compilation
> on my machine (Slackware 14.0). I cannot tell how far back this "new"
> type goes, at least the header file in RHEL 5.0 (v1.4.1) seems to have
> it already. If someone finds a broken distribution, tell me and I
> insert some compat code.

Acked-by: Gerd Hoffmann <kraxel@redhat.com>

cheers,
  Gerd
dunrong huang - Nov. 6, 2012, 9:23 a.m.
Can anyone applied this patch, I also got this build error after upgrade
gnutls to version 3.1.3.


2012/10/18 Gerd Hoffmann <kraxel@redhat.com>

> On 10/18/12 11:16, Andre Przywara wrote:
> > In my installation of GNU-TLS (v3.0.23) the type
> > gnutls_anon_server_credentials is marked deprecated, so -Werror
> > breaks compilation.
> > Simply replacing it with the newer ..._t version fixed the compilation
> > on my machine (Slackware 14.0). I cannot tell how far back this "new"
> > type goes, at least the header file in RHEL 5.0 (v1.4.1) seems to have
> > it already. If someone finds a broken distribution, tell me and I
> > insert some compat code.
>
> Acked-by: Gerd Hoffmann <kraxel@redhat.com>
>
> cheers,
>   Gerd
>
>
Tim Hardeck - Feb. 17, 2013, 9:33 p.m.
Hi,

On Thu, 2012-10-18 at 11:23 +0200, Gerd Hoffmann wrote:
> On 10/18/12 11:16, Andre Przywara wrote:
> > In my installation of GNU-TLS (v3.0.23) the type
> > gnutls_anon_server_credentials is marked deprecated, so -Werror
> > breaks compilation.
> > Simply replacing it with the newer ..._t version fixed the compilation
> > on my machine (Slackware 14.0). I cannot tell how far back this "new"
> > type goes, at least the header file in RHEL 5.0 (v1.4.1) seems to have
> > it already. If someone finds a broken distribution, tell me and I
> > insert some compat code.
> 
> Acked-by: Gerd Hoffmann <kraxel@redhat.com>

is there a reason why this wasn't applied yet?

Regards
Tim
Anthony Liguori - Feb. 18, 2013, 4:02 p.m.
Applied.  Thanks.

Regards,

Anthony Liguori

Patch

diff --git a/ui/vnc-tls.c b/ui/vnc-tls.c
index a7f7d07..ba3827b 100644
--- a/ui/vnc-tls.c
+++ b/ui/vnc-tls.c
@@ -99,9 +99,9 @@  static ssize_t vnc_tls_pull(gnutls_transport_ptr_t transport,
 }
 
 
-static gnutls_anon_server_credentials vnc_tls_initialize_anon_cred(void)
+static gnutls_anon_server_credentials_t vnc_tls_initialize_anon_cred(void)
 {
-    gnutls_anon_server_credentials anon_cred;
+    gnutls_anon_server_credentials_t anon_cred;
     int ret;
 
     if ((ret = gnutls_anon_allocate_server_credentials(&anon_cred)) < 0) {
@@ -382,7 +382,7 @@  int vnc_tls_client_setup(struct VncState *vs,
             }
 
         } else {
-            gnutls_anon_server_credentials anon_cred = vnc_tls_initialize_anon_cred();
+            gnutls_anon_server_credentials_t anon_cred = vnc_tls_initialize_anon_cred();
             if (!anon_cred) {
                 gnutls_deinit(vs->tls.session);
                 vs->tls.session = NULL;