summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2020-02-05 17:40:57 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2020-02-05 17:40:57 +0100
commitfd399b2416191bd7f3b0f267bdb530ed829de271 (patch)
tree4c03047ffb71bab3ec1babae52207665d8fe26e4
parent6674063331cc37a6a496e44577d9be434cbfc9a2 (diff)
downloadca-certificates-fd399b2416191bd7f3b0f267bdb530ed829de271.tar.gz
ca-certificates-fd399b2416191bd7f3b0f267bdb530ed829de271.tar.bz2
ca-certificates-fd399b2416191bd7f3b0f267bdb530ed829de271.tar.xz
update-ca: insert newline between certs
There may be certificates that lack a trailing newline, which is allowed in the certificate format. We work around that by inject a newline after each cert. see https://gitlab.alpinelinux.org/alpine/aports/issues/8379
-rw-r--r--update-ca.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/update-ca.c b/update-ca.c
index 2b3195b..0260f83 100644
--- a/update-ca.c
+++ b/update-ca.c
@@ -191,6 +191,7 @@ static void proc_localglobaldir(const char *fullpath, struct hash *h, int tmpfil
fprintf(stderr, "Warning! Cannot hash: %s\n", fullpath);
if (!copyfile(fullpath, tmpfile_fd))
fprintf(stderr, "Warning! Cannot copy to bundle: %s\n", fullpath);
+ write(tmpfile_fd, "\n", 1);
free(actual_file);
}
@@ -260,7 +261,7 @@ static bool dir_readfiles(struct hash* d, const char* path,
DIR *dp = opendir(path);
if (!dp)
return false;
-
+
struct dirent *dirp;
while ((dirp = readdir(dp)) != NULL) {
if (str_begins(dirp->d_name, "."))