summaryrefslogtreecommitdiff
path: root/src/certtool-common.c
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-03-08 14:40:15 +0100
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-03-08 14:43:38 +0100
commit3bc609cda52fdb7ccdb22f564b824b6073e7446c (patch)
treed8ccdc4274cacb272d69756e537d0826f2887fb0 /src/certtool-common.c
parentb095508def0b718137561a7d4743489a2a5193ca (diff)
downloadgnutls-3bc609cda52fdb7ccdb22f564b824b6073e7446c.tar.gz
certtool: enhance to allow writing CRLs in PKCS#12 files
In addition fallback to DER when --load-crl fails importing a PEM encoded CRL due to PEM issues. Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'src/certtool-common.c')
-rw-r--r--src/certtool-common.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/certtool-common.c b/src/certtool-common.c
index 85196629bf..0f47be53b0 100644
--- a/src/certtool-common.c
+++ b/src/certtool-common.c
@@ -477,6 +477,9 @@ gnutls_x509_crl_t *load_crl_list(int mand, size_t * crl_size,
dat.size = size;
ret = gnutls_x509_crl_list_import2(&crl, &crl_max, &dat, GNUTLS_X509_FMT_PEM, 0);
+ if (ret == GNUTLS_E_BASE64_DECODING_ERROR) {
+ ret = gnutls_x509_crl_list_import2(&crl, &crl_max, &dat, GNUTLS_X509_FMT_DER, 0);
+ }
if (ret < 0) {
fprintf(stderr, "Error loading CRLs: %s\n", gnutls_strerror(ret));
exit(1);