[SCM] GNU gnutls branch, master, updated. gnutls_3_0_18-152-g50f1d87

[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=50f1d87876aae1ec9db4637025b71b1ef0719882

The branch, master has been updated
       via  50f1d87876aae1ec9db4637025b71b1ef0719882 (commit)
       via  4dd639950b605bd0385ac8823423574af6552f55 (commit)
       via  5a3f9615e40339f77ebafabb63778d503af014d6 (commit)
      from  2219b5a06a1ca5178375f37e9556a409c0b6220c (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 50f1d87876aae1ec9db4637025b71b1ef0719882
Author: Diego Elio Pettenò <address@hidden>
Date:   Fri Jun 15 12:19:12 2012 -0700

    build: make sure to declare the generated source files as BUILT_SOURCES
    
    This allows proper building when using parallel make on a multi-core
    system.
    
    Signed-off-by: Diego Elio Pettenò <address@hidden>
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

commit 4dd639950b605bd0385ac8823423574af6552f55
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Jun 19 00:38:57 2012 +0200

    correct comparison of sent data in dtls-stress.

commit 5a3f9615e40339f77ebafabb63778d503af014d6
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jun 10 21:33:47 2012 +0200

    small fix

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

Summary of changes:
 lib/gnutls_x509.c        |    4 ++--
 src/Makefile.am          |    3 +++
 tests/dtls/dtls-stress.c |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 62d547c..a757832 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -1113,8 +1113,8 @@ cleanup:
  * entity certificate (e.g., also an intermediate CA cert) then put
  * the certificate chain in @pcert_list. The @pcert_list and @key will
  * become part of the credentials structure and must not
- * be deallocated. They will be automatically deallocated when
- * @res is deinitialized.
+ * be deallocated. They will be automatically deallocated when @res
+ * is deinitialized.
  *
  * Returns: %GNUTLS_E_SUCCESS (0) on success, or a negative error code.
  *
diff --git a/src/Makefile.am b/src/Makefile.am
index 5550f3b..8b3b578 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -150,6 +150,9 @@ libcmd_p11tool_la_LIBADD += ../gl/libgnu.la $(INET_PTON_LIB)
 
 endif # ENABLE_PKCS11
 
+BUILT_SOURCES = ocsptool-args.c p11tool-args.c psk-args.c cli-debug-args.c \
+               cli-args.c serv-args.c srptool-args.c certtool-args.c
+
 ocsptool-args.c: $(srcdir)/args-std.def $(srcdir)/ocsptool-args.def
        -autogen ocsptool-args.def
 p11tool-args.c: $(srcdir)/args-std.def $(srcdir)/p11tool-args.def
diff --git a/tests/dtls/dtls-stress.c b/tests/dtls/dtls-stress.c
index 6e85a80..7bad751 100644
--- a/tests/dtls/dtls-stress.c
+++ b/tests/dtls/dtls-stress.c
@@ -663,7 +663,7 @@ static void client(int sock)
                len = process_error(gnutls_record_recv(session, buffer, 
sizeof(buffer)));
        } while (len < 0);
 
-       if (len > 0 && strcmp(line, buffer) == 0) {
+       if (len > 0 && strncmp(line, buffer, len) == 0) {
                exit(0);
        } else {
                exit(1);


hooks/post-receive
-- 
GNU gnutls