[SCM] GNU gnutls branch, master, updated. gnutls_2_99_2-82-g8914846

[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=891484628a2a9be0da7e2a156fdf81f8ffd11026

The branch, master has been updated
       via  891484628a2a9be0da7e2a156fdf81f8ffd11026 (commit)
       via  57f0e13b770a7b1c1e6a7c4aa1f002b8e98a1c7e (commit)
       via  125b3cbdbefe74f375c4e525dbde6178afeae1d9 (commit)
       via  e9462c1119b54ee15a4703ac915d6d01f91f0685 (commit)
      from  fcaf3a44232986ed13d6e4cd1f8b5d8b3b6f7dfd (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 891484628a2a9be0da7e2a156fdf81f8ffd11026
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Jun 7 07:14:27 2011 +0200

    Depend on automake 1.11.

commit 57f0e13b770a7b1c1e6a7c4aa1f002b8e98a1c7e
Author: Stef Walter <address@hidden>
Date:   Mon Jun 6 16:48:54 2011 +0000

    tests: Build eagain-cli with correct libraries
    
     * Add -ldl -lpthread to linker flags
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

commit 125b3cbdbefe74f375c4e525dbde6178afeae1d9
Author: Stef Walter <address@hidden>
Date:   Mon May 30 21:29:12 2011 +0200

    gnutls-cli: Fix uninitialized variable when PKCS#11 uris in use.
    
     * When PKCS#11 URIs are in use previously tried to free uninitialized
       memory. Initialize to zero.
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

commit e9462c1119b54ee15a4703ac915d6d01f91f0685
Author: Stef Walter <address@hidden>
Date:   Mon May 30 21:35:25 2011 +0200

    pkcs11: Accept CKR_USER_ALREADY_LOGGED_IN as successful result for PAP Login
    
     * When doing CKF_PROTECTED_AUTHENTICATION_PATH login, accept
       CKR_USER_ALREADY_LOGGED_IN as a successful result.
     * Another code path, or another consumer of the same PKCS#11 module
       may have already logged in.
     * This is what the non PAP code path already does.
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

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

Summary of changes:
 configure.ac            |    2 +-
 lib/pkcs11.c            |    4 ++--
 src/cli.c               |    2 +-
 tests/suite/Makefile.am |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index e02ed71..a0f962f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_INIT([GnuTLS], [2.99.3], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-bzip2 -Wall -Werror -Wno-override])
+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz -Wall -Werror -Wno-override])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AM_CONFIG_HEADER(config.h)
 
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index d33ecb7..5fdd756 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -2057,8 +2057,8 @@ pkcs11_login (pakchois_session_t * pks, const struct 
token_info *info, int so)
    * required. */
   if (info->tinfo.flags & CKF_PROTECTED_AUTHENTICATION_PATH)
     {
-      if (pakchois_login (pks, (so == 0) ? CKU_USER : CKU_SO, NULL, 0) ==
-          CKR_OK)
+      rv = pakchois_login (pks, (so == 0) ? CKU_USER : CKU_SO, NULL, 0);
+      if (rv == CKR_OK || rv == CKR_USER_ALREADY_LOGGED_IN)
         {
           return 0;
         }
diff --git a/src/cli.c b/src/cli.c
index fbefe7f..90b0643 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -169,7 +169,7 @@ load_keys (void)
 {
   unsigned int crt_num;
   int ret, i;
-  gnutls_datum_t data;
+  gnutls_datum_t data = { NULL, 0 };
   gnutls_x509_crt_t crt_list[MAX_CRT];
   gnutls_pkcs11_privkey_t pkcs11_key;
   gnutls_x509_privkey_t tmp_key;
diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am
index 17a587e..6113a70 100644
--- a/tests/suite/Makefile.am
+++ b/tests/suite/Makefile.am
@@ -67,7 +67,7 @@ nodist_libecore_la_SOURCES = ecore/src/lib/ecore_anim.c 
ecore/src/lib/ecore_app.
        ecore/src/lib/eina_stringshare.c ecore/src/lib/eina_tiler.c 
ecore/src/lib/eina_unicode.c \
        ecore/src/lib/eina_ustrbuf.c ecore/src/lib/eina_ustringshare.c 
ecore/src/lib/eina_value.c
 
-eagain_cli_LDADD = $(LDADD) libecore.la -lrt -lm
+eagain_cli_LDADD = $(LDADD) libecore.la -lrt -lm -ldl -lpthread
 nodist_eagain_cli_SOURCES = mini-eagain2.c
 
 noinst_PROGRAMS = eagain-cli


hooks/post-receive
-- 
GNU gnutls