From: Tim Kosse <tim.kosse@filezilla-project.org>
Date: Sat, 9 Jul 2016 10:24:33 +0000 (+0200)
Subject: gnutls_x509_crl_list_import2 was ignoring the passed flags if all CTLs in the list... 
X-Git-Tag: gnutls_3_5_3~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c6741d096f1069bdc8eec5caff15e794dc4a13f;p=thirdparty%2Fgnutls.git

gnutls_x509_crl_list_import2 was ignoring the passed flags if all CTLs in the list fit within the initially allocated memory.
---

diff --git a/lib/x509/crl.c b/lib/x509/crl.c
index f42271bd84..ebda949fde 100644
--- a/lib/x509/crl.c
+++ b/lib/x509/crl.c
@@ -1261,7 +1261,7 @@ gnutls_x509_crl_list_import2(gnutls_x509_crl_t ** crls,
 
 	ret =
 	    gnutls_x509_crl_list_import(*crls, &init, data, format,
-					GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED);
+					flags | GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED);
 	if (ret == GNUTLS_E_SHORT_MEMORY_BUFFER) {
 		*crls =
 		    gnutls_realloc_fast(*crls,