diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2023-02-23 09:50:41 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2023-02-23 09:50:41 +0000 |
| commit | b18f8648740f074d3b926e4ab72f008c2b5cf60c (patch) | |
| tree | 4e8f74064185157932845f0af5933ff141945ac8 /usr.sbin/rpki-client/main.c | |
| parent | fc8689f68ea2401fa573c4ef557344036e2a6745 (diff) | |
When parsing MFT the CRL referenced by the MFT is loaded and verified at
the same time. So in case of a valid crl pass the CRL filename as entity
message to the parent process together with the MFT. This way the MFT and
CRL end up both in the valid cache even if some files in the MFT are missing.
On severe errors (like X.509 verify errors) the CRL is not moved since it
is not considered valid.
With and OK job@, tb@
Diffstat (limited to 'usr.sbin/rpki-client/main.c')
| -rw-r--r-- | usr.sbin/rpki-client/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/rpki-client/main.c b/usr.sbin/rpki-client/main.c index 7150511f64c..84aefa62311 100644 --- a/usr.sbin/rpki-client/main.c +++ b/usr.sbin/rpki-client/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.231 2023/01/13 08:58:36 claudio Exp $ */ +/* $OpenBSD: main.c,v 1.232 2023/02/23 09:50:40 claudio Exp $ */ /* * Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org> * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> @@ -383,7 +383,7 @@ queue_add_from_mft(const struct mft *mft) for (i = 0; i < mft->filesz; i++) { f = &mft->files[i]; - if (f->type == RTYPE_INVALID) + if (f->type == RTYPE_INVALID || f->type == RTYPE_CRL) continue; if (mft->path != NULL) @@ -605,6 +605,8 @@ entity_process(struct ibuf *b, struct stats *st, struct vrp_tree *tree, mft_free(mft); break; case RTYPE_CRL: + /* CRLs are sent together with MFT and not accounted for */ + entity_queue++; break; case RTYPE_ROA: io_read_buf(b, &c, sizeof(c)); |