diff options
| author | Tim Kosse <tim.kosse@filezilla-project.org> | 2016-07-09 11:53:52 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-07-28 10:49:02 +0200 |
| commit | 41a03b9b9b7fb83ac7668c80e4bb9c9641ed76d5 (patch) | |
| tree | b60b1c6f40b5875217cff8c3144c8d2b52a34511 | |
| parent | 31ababffacb52d8d0565971349c7eb798cd2ca69 (diff) | |
| download | gnutls-41a03b9b9b7fb83ac7668c80e4bb9c9641ed76d5.tar.gz | |
gnutls_x509_crt_list_import2 was ignoring the passed flags if all certificates in the list fit within the initially allocated memory.
| -rw-r--r-- | lib/x509/x509.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/x509/x509.c b/lib/x509/x509.c index fbfe852a7c..a781d2e098 100644 --- a/lib/x509/x509.c +++ b/lib/x509/x509.c @@ -3278,7 +3278,7 @@ gnutls_x509_crt_list_import2(gnutls_x509_crt_t ** certs, ret = gnutls_x509_crt_list_import(*certs, &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) { *certs = gnutls_realloc_fast(*certs, |