[SCM] GNU gnutls branch, master, updated. gnutls_3_0_8-12-g0184a74

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=0184a74cf7a9087c4d1e844029319b94ab2f2f98

The branch, master has been updated
       via  0184a74cf7a9087c4d1e844029319b94ab2f2f98 (commit)
      from  2337d6d4ecc087e4c359617c5675e1ba8394d43a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0184a74cf7a9087c4d1e844029319b94ab2f2f98
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Nov 19 17:10:51 2011 +0100

    updated/fixed SRP and PSK examples.

-----------------------------------------------------------------------

Summary of changes:
 doc/examples/ex-serv-psk.c |   12 +++++++++---
 doc/examples/ex-serv-srp.c |    3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/doc/examples/ex-serv-psk.c b/doc/examples/ex-serv-psk.c
index d2b907f..5a53da0 100644
--- a/doc/examples/ex-serv-psk.c
+++ b/doc/examples/ex-serv-psk.c
@@ -24,7 +24,6 @@
    authentication.
  */
 
-
 #define SA struct sockaddr
 #define SOCKET_ERR(err,s) if(err==-1) {perror(s);return(1);}
 #define MAX_BUF 1024
@@ -99,6 +98,7 @@ main (void)
   gnutls_session_t session;
   char buffer[MAX_BUF + 1];
   int optval = 1;
+  int kx;
 
   /* this must be called once in the program
    */
@@ -119,8 +119,7 @@ main (void)
 
   generate_dh_params ();
 
-  gnutls_priority_init (&priority_cache, "NORMAL:PSK", NULL);
-
+  gnutls_priority_init (&priority_cache, "NORMAL:+PSK:+ECDHE-PSK:+DHE-PSK", 
NULL);
 
   gnutls_certificate_set_dh_params (x509_cred, dh_params);
 
@@ -166,6 +165,13 @@ main (void)
           continue;
         }
       printf ("- Handshake was completed\n");
+      
+      kx = gnutls_kx_get(session);
+      if (kx == GNUTLS_KX_PSK || kx == GNUTLS_KX_DHE_PSK || 
+          kx == GNUTLS_KX_ECDHE_PSK)
+        {
+          printf("- User %s was connected\n", 
gnutls_psk_server_get_username(session));
+        }
 
       /* see the Getting peer's information example */
       /* print_info(session); */
diff --git a/doc/examples/ex-serv-srp.c b/doc/examples/ex-serv-srp.c
index c5300fb..5dbd8cf 100644
--- a/doc/examples/ex-serv-srp.c
+++ b/doc/examples/ex-serv-srp.c
@@ -41,7 +41,7 @@ initialize_tls_session (void)
 
   gnutls_init (&session, GNUTLS_SERVER);
 
-  gnutls_priority_set_direct (session, "NORMAL:+SRP:+SRP-DSS:+SRP-RSA", NULL);
+  gnutls_priority_set_direct (session, 
"NORMAL:-KX-ALL:+SRP:+SRP-DSS:+SRP-RSA", NULL);
 
   gnutls_credentials_set (session, GNUTLS_CRD_SRP, srp_cred);
   /* for the certificate authenticated ciphersuites.
@@ -127,6 +127,7 @@ main (void)
           continue;
         }
       printf ("- Handshake was completed\n");
+      printf ("- User %s was connected\n", 
gnutls_srp_server_get_username(session));
 
       /* print_info(session); */
 


hooks/post-receive
-- 
GNU gnutls