SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-09-03 19:42:11 +00:00
parent 151b4b8168
commit e70dd78b1d
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
19 changed files with 587 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

14
usr.sbin/rpki-client/mft.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: mft.c,v 1.96 2023/06/29 10:28:25 tb Exp $ */
/* $OpenBSD: mft.c,v 1.97 2023/09/03 10:48:50 job Exp $ */
/*
* Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
* Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@ -233,6 +233,7 @@ mft_parse_filehash(struct parse *p, const FileAndHash *fh)
int rc = 0;
struct mftfile *fent;
enum rtype type;
size_t new_idx = 0;
if (!valid_mft_filename(fh->file->data, fh->file->length)) {
warnx("%s: RFC 6486 section 4.2.2: bad filename", p->fn);
@ -256,8 +257,15 @@ mft_parse_filehash(struct parse *p, const FileAndHash *fh)
p->found_crl = 1;
}
/* Insert the filename and hash value. */
fent = &p->res->files[p->res->filesz++];
if (filemode)
fent = &p->res->files[p->res->filesz++];
else {
/* Fisher-Yates shuffle */
new_idx = arc4random_uniform(p->res->filesz + 1);
p->res->files[p->res->filesz++] = p->res->files[new_idx];
fent = &p->res->files[new_idx];
}
fent->type = type;
fent->file = fn;
fn = NULL;