[SCM] GNU gnutls branch, master, updated. gnutls_3_0_11-77-gc579165

[Simon Josefsson]

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=c5791654cc44e5398b3db10c4ddcc099a992a9c3

The branch, master has been updated
       via  c5791654cc44e5398b3db10c4ddcc099a992a9c3 (commit)
       via  992d646f1deefc2740cc22eb9a9da345a26ffef3 (commit)
      from  99e6a2b8fc1097ca69bc66eb1dd962004ea2fb04 (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 c5791654cc44e5398b3db10c4ddcc099a992a9c3
Author: Simon Josefsson <address@hidden>
Date:   Fri Jan 20 13:32:46 2012 +0100

    Fix semantics of (unused) _gnutls_trustlist_inlist.

commit 992d646f1deefc2740cc22eb9a9da345a26ffef3
Author: Simon Josefsson <address@hidden>
Date:   Fri Jan 20 13:31:16 2012 +0100

    Bump copyright year on manpages.

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

Summary of changes:
 doc/manpages/Makefile.am |   18 +++++++++---------
 lib/x509/verify-high.c   |   11 ++++++-----
 lib/x509/verify-high.h   |    6 +++---
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index cb0c5e1..fc49dab 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -712,7 +712,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/gnutls.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2011 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation" \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 
2>/dev/null && \
                echo -n "."; \
@@ -726,7 +726,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/compat.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2011 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation" \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 
2>/dev/null && \
                echo -n "."; \
@@ -740,7 +740,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/x509.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2011 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation" \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 
2>/dev/null && \
                echo -n "."; \
@@ -754,7 +754,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/abstract.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2011 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation" \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 
2>/dev/null && \
                echo -n "."; \
@@ -768,7 +768,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/pkcs12.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2011 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation" \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 
2>/dev/null && \
                echo -n "."; \
@@ -782,7 +782,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/pkcs11.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2011 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation" \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 
2>/dev/null && \
                echo -n "."; \
@@ -796,7 +796,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/dtls.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2011 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation" \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 
2>/dev/null && \
                echo -n "."; \
@@ -810,7 +810,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/openpgp.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2011 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation" \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 
2>/dev/null && \
                echo -n "."; \
@@ -824,7 +824,7 @@ doit:
                        -pkg-name "$(PACKAGE_NAME)" \
                        -include "gnutls/crypto.h" \
                        -seeinfo $(PACKAGE) -verbatimcopying \
-                       -copyright "2011 Free Software Foundation" \
+                       -copyright "2012 Free Software Foundation" \
                        -function $$i \
                        $(top_srcdir)/lib/*.c $(top_srcdir)/lib/*/*.c > $$i.3 
2>/dev/null && \
                echo -n "."; \
diff --git a/lib/x509/verify-high.c b/lib/x509/verify-high.c
index ce6c00a..5818be5 100644
--- a/lib/x509/verify-high.c
+++ b/lib/x509/verify-high.c
@@ -620,9 +620,10 @@ 
gnutls_x509_trust_list_verify_named_crt(gnutls_x509_trust_list_t list,
     return 0;
 }
 
+/* return 0 if @cert is in @list, 1 if not, or < 0 on error. */
 int
-_gnutls_trustlist_inlist_p (gnutls_x509_trust_list_t list,
-                           gnutls_x509_crt_t cert)
+_gnutls_trustlist_inlist (gnutls_x509_trust_list_t list,
+                         gnutls_x509_crt_t cert)
 {
   gnutls_datum_t dn;
   int ret, i;
@@ -649,9 +650,9 @@ _gnutls_trustlist_inlist_p (gnutls_x509_trust_list_t list,
          return ret;
        }
 
-      if (ret == 1)
-       return 1;
+      if (ret == 0)
+       return 0;
     }
 
-  return 0;
+  return 1;
 }
diff --git a/lib/x509/verify-high.h b/lib/x509/verify-high.h
index ec45fc7..67d96c5 100644
--- a/lib/x509/verify-high.h
+++ b/lib/x509/verify-high.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2011-2012 Free Software Foundation, Inc.
  *
- * Author: Nikos Mavrogiannopoulos
+ * Author: Simon Josefsson
  *
  * This file is part of GnuTLS.
  *
@@ -20,5 +20,5 @@
  *
  */
 
-int _gnutls_trustlist_inlist_p (gnutls_x509_trust_list_t list,
-                               gnutls_x509_crt_t cert);
+int _gnutls_trustlist_inlist (gnutls_x509_trust_list_t list,
+                             gnutls_x509_crt_t cert);


hooks/post-receive
-- 
GNU gnutls