Fix semantics of (unused) _gnutls_trustlist_inlist.

diff --git a/lib/x509/verify-high.c b/lib/x509/verify-high.c
index ce6c00a76b726cb9f502b0c681716b0b142e24c0..5818be5ab79ae6fe6bb87f9244733e6192fc52d1 100644 (file)
--- 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 ec45fc78f810b3f8f4e1ec75756a51013e734d17..67d96c511383d630f46e654cd6680c62b2ce08db 100644 (file)
--- 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);