From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 12 Sep 2012 21:03:32 +0000 (+0200)
Subject: When requested gnutls_x509_trust_list_deinit() will deinitialized all certs (includin... 
X-Git-Tag: gnutls_3_1_2~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b3839b4fff469a341fbbc125fe72468af9b7df4;p=thirdparty%2Fgnutls.git

When requested gnutls_x509_trust_list_deinit() will deinitialized all certs (including the named)
---

diff --git a/lib/x509/verify-high.c b/lib/x509/verify-high.c
index 4ecab5b66f..0c299b120e 100644
--- a/lib/x509/verify-high.c
+++ b/lib/x509/verify-high.c
@@ -128,6 +128,11 @@ gnutls_x509_trust_list_deinit(gnutls_x509_trust_list_t list,
                 gnutls_x509_crl_deinit(list->node[i].crls[j]);
             }
         gnutls_free(list->node[i].crls);
+
+        if (all)
+            for (j = 0; j < list->node[i].named_cert_size; j++) {
+                gnutls_x509_crt_deinit(list->node[i].named_certs[j].cert);
+            }
         gnutls_free(list->node[i].named_certs);
     }
 
diff --git a/tests/x509cert-tl.c b/tests/x509cert-tl.c
index 0c432723ef..c2ff767ee9 100644
--- a/tests/x509cert-tl.c
+++ b/tests/x509cert-tl.c
@@ -255,9 +255,7 @@ doit (void)
   if (ret < 1)
     fail("gnutls_x509_trust_list_add_trust_mem: %d\n", __LINE__);
 
-  gnutls_x509_crt_deinit(ca_crt);
-  gnutls_x509_crt_deinit(server_crt);
-  gnutls_x509_trust_list_deinit(tl, 0);
+  gnutls_x509_trust_list_deinit(tl, 1);
   
   gnutls_global_deinit();