Re: [ipchat-devel] simple patch for error on centos 6

[ml]

another patch for tls.c and tls.h


address@hidden ipchat-0.5]$ diff -iu src/tls.c.old src/tls.c
--- src/tls.c.old       2012-07-06 04:35:26.128510215 +0200
+++ src/tls.c   2012-07-06 05:50:34.432591489 +0200
@@ -263,10 +263,27 @@
        /* check the authentication type used and switch to the appropriate */
        cred = gnutls_auth_get_type (session);
        switch (cred) {
+        case GNUTLS_CRD_IA:
+            printf ("- TLS/IA session\n");
+            break;
+#ifdef ENABLE_SRP  
        case GNUTLS_CRD_SRP:
                ui_output_info ("\\b\\2-\\0 SRP session with username %s",
                                gnutls_srp_server_get_username (session));
                break;
+#endif /* ENABLE_SRP */ 
+        case GNUTLS_CRD_PSK:
+      /* This returns NULL in server side.
+       */
+               if (gnutls_psk_client_get_hint (session) != NULL)
+                printf ("- PSK authentication. PSK hint '%s'\n",
+                gnutls_psk_client_get_hint (session));
+      /* This returns NULL in client side.
+       */
+               if (gnutls_psk_server_get_username (session) != NULL)
+               printf ("- PSK authentication. Connected as '%s'\n",
+                gnutls_psk_server_get_username (session));
+      break;
        case GNUTLS_CRD_ANON:   /* anonymous authentication */
                ui_output_info ("\\b\\2-\\0 Anonymous DH using prime of "
                                "%d bits", gnutls_dh_get_prime_bits (session));


address@hidden ipchat-0.5]$ diff -iu src/tls.h.old src/tls.h
--- src/tls.h.old       2012-07-06 05:54:29.444500556 +0200
+++ src/tls.h   2012-07-06 05:48:11.610591106 +0200
@@ -21,6 +21,7 @@
 
 #include <unistd.h>            /* size_t, ssize_t */
 #include "contact.h"
+#include "user_iface.h"
 
 /* Initialize TLS stuff. */
 extern void tls_init (void)


Le vendredi 06 juillet 2012 à 04:40 +0200, ml a écrit :
> better patch
> 
> address@hidden ipchat-0.5]$ diff -iu src/tls.c.old src/tls.c
> --- src/tls.c.old     2012-07-06 04:35:26.128510215 +0200
> +++ src/tls.c 2012-07-06 02:23:13.073593186 +0200
> @@ -263,10 +263,12 @@
>       /* check the authentication type used and switch to the appropriate */
>       cred = gnutls_auth_get_type (session);
>       switch (cred) {
> +#ifdef ENABLE_SRP  
>       case GNUTLS_CRD_SRP:
>               ui_output_info ("\\b\\2-\\0 SRP session with username %s",
>                               gnutls_srp_server_get_username (session));
>               break;
> +#endif /* ENABLE_SRP */ 
>       case GNUTLS_CRD_ANON:   /* anonymous authentication */
>               ui_output_info ("\\b\\2-\\0 Anonymous DH using prime of "
>                               "%d bits", gnutls_dh_get_prime_bits (session));
> 
> 
> 
> Le vendredi 06 juillet 2012 à 02:30 +0200, ml a écrit :
> > hello guys
> > 
> > 
> > this is a simple patch for remove error on centos 6 build
> > on centos 5 build fine
> > 
> > 
> > 
> > --- src/tls.c       2012-07-06 02:23:13.073593186 +0200
> > +++ src/tls.c~      2007-07-06 18:53:49.000000000 +0200
> > @@ -263,12 +263,10 @@
> >     /* check the authentication type used and switch to the appropriate */
> >     cred = gnutls_auth_get_type (session);
> >     switch (cred) {
> > -#ifdef ENABLE_SRP  
> >     case GNUTLS_CRD_SRP:
> >             ui_output_info ("\\b\\2-\\0 SRP session with username %s",
> >                             gnutls_srp_server_get_username (session));
> >             break;
> > -#endif /* ENABLE_SRP */ 
> >     case GNUTLS_CRD_ANON:   /* anonymous authentication */
> >             ui_output_info ("\\b\\2-\\0 Anonymous DH using prime of "
> >                             "%d bits", gnutls_dh_get_prime_bits (session));
> > 
> > 
> > 
> > the patch adds can be side effects but it can solve the problems of
> > compiling on centos 6.2
> > 
> > 
> > 
> > _______________________________________________
> > ipchat-devel mailing list
> > address@hidden
> > https://lists.nongnu.org/mailman/listinfo/ipchat-devel
> 
> _______________________________________________
> ipchat-devel mailing list
> address@hidden
> https://lists.nongnu.org/mailman/listinfo/ipchat-devel

-- 
  http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xC2626742
  gpg --keyserver pgp.mit.edu --recv-key C2626742

  http://urlshort.eu fakessh @
  http://gplus.to/sshfake
  http://gplus.to/sshswilting
  http://gplus.to/john.swilting
  https://lists.fakessh.eu/mailman/
  This list is moderated by me, but all applications will be accepted
  provided they receive a note of presentation

signature.asc
Description: Ceci est une partie de message numériquement signée