From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Fri, 9 Dec 2016 14:44:20 +0000 (+0100)
Subject: certtool: load_ca_cert() can load a CA from URLs
X-Git-Tag: gnutls_3_6_0~1161^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7bcce662b223fbb16927b95bebd6d2eb51197e53;p=thirdparty%2Fgnutls.git

certtool: load_ca_cert() can load a CA from URLs
---

diff --git a/src/certtool-common.c b/src/certtool-common.c
index 04af0e9429..85196629bf 100644
--- a/src/certtool-common.c
+++ b/src/certtool-common.c
@@ -590,6 +590,16 @@ gnutls_x509_crt_t load_ca_cert(unsigned mand, common_info_st * info)
 		exit(1);
 	}
 
+	if (gnutls_url_is_supported(info->ca) != 0) {
+		ret = gnutls_x509_crt_import_url(crt, info->ca, 0);
+		if (ret < 0) {
+			fprintf(stderr, "error importing --load-ca-certificate: %s: %s\n",
+				info->ca, gnutls_strerror(ret));
+			exit(1);
+		}
+		return crt;
+	}
+
 	dat.data = (void *) read_binary_file(info->ca, &size);
 	dat.size = size;
 
@@ -602,7 +612,7 @@ gnutls_x509_crt_t load_ca_cert(unsigned mand, common_info_st * info)
 	ret = gnutls_x509_crt_import(crt, &dat, info->incert_format);
 	free(dat.data);
 	if (ret < 0) {
-		fprintf(stderr, "importing --load-ca-certificate: %s: %s\n",
+		fprintf(stderr, "error importing --load-ca-certificate: %s: %s\n",
 			info->ca, gnutls_strerror(ret));
 		exit(1);
 	}