diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2022-01-20 09:24:09 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2022-01-20 09:24:09 +0000 |
| commit | 206b837847fc325d763c8cfa1cc9ccd887da7ec3 (patch) | |
| tree | d3d5c252a8c8c97b64346a85ffc5aeb83516c5ad /usr.sbin/rpki-client | |
| parent | 84dc3503595054d05286a842d648d336a8be00ca (diff) | |
Rename mft_check() to proc_parser_mft_check() and make it a static function.
Diffstat (limited to 'usr.sbin/rpki-client')
| -rw-r--r-- | usr.sbin/rpki-client/extern.h | 3 | ||||
| -rw-r--r-- | usr.sbin/rpki-client/parser.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/usr.sbin/rpki-client/extern.h b/usr.sbin/rpki-client/extern.h index a96e6f4d755..7b52516a783 100644 --- a/usr.sbin/rpki-client/extern.h +++ b/usr.sbin/rpki-client/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.109 2022/01/19 15:50:31 claudio Exp $ */ +/* $OpenBSD: extern.h,v 1.110 2022/01/20 09:24:08 claudio Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -419,7 +419,6 @@ void mft_buffer(struct ibuf *, const struct mft *); void mft_free(struct mft *); struct mft *mft_parse(X509 **, const char *, const unsigned char *, size_t); -int mft_check(const char *, struct mft *); struct mft *mft_read(struct ibuf *); void roa_buffer(struct ibuf *, const struct roa *); diff --git a/usr.sbin/rpki-client/parser.c b/usr.sbin/rpki-client/parser.c index 5c4f7428549..2c351383a2f 100644 --- a/usr.sbin/rpki-client/parser.c +++ b/usr.sbin/rpki-client/parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parser.c,v 1.45 2022/01/19 15:50:31 claudio Exp $ */ +/* $OpenBSD: parser.c,v 1.46 2022/01/20 09:24:08 claudio Exp $ */ /* * Copyright (c) 2019 Claudio Jeker <claudio@openbsd.org> * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> @@ -298,8 +298,8 @@ proc_parser_roa(char *file, const unsigned char *der, size_t len) * Check all files and their hashes in a MFT structure. * Return zero on failure, non-zero on success. */ -int -mft_check(const char *fn, struct mft *p) +static int +proc_parser_mft_check(const char *fn, struct mft *p) { size_t i; int fd, try, rc = 1; @@ -374,7 +374,7 @@ proc_parser_mft(char *file, const unsigned char *der, size_t len, err(1, NULL); if (!mft->stale) - if (!mft_check(file, mft)) { + if (!proc_parser_mft_check(file, mft)) { mft_free(mft); return NULL; } |