From 8210c72b2e5cf2b69d26fd3ef72a2618eaf509a4 Mon Sep 17 00:00:00 2001 From: job Date: Thu, 18 Aug 2022 15:20:27 +0000 Subject: [PATCH] Remove dangling ASPA references until we land real support OK tb@ --- usr.sbin/rpki-client/extern.h | 3 +-- usr.sbin/rpki-client/mft.c | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/usr.sbin/rpki-client/extern.h b/usr.sbin/rpki-client/extern.h index 531d88360b7..93a714dddb2 100644 --- a/usr.sbin/rpki-client/extern.h +++ b/usr.sbin/rpki-client/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.148 2022/08/17 11:57:46 job Exp $ */ +/* $OpenBSD: extern.h,v 1.149 2022/08/18 15:20:27 job Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * @@ -178,7 +178,6 @@ enum rtype { RTYPE_CER, RTYPE_CRL, RTYPE_GBR, - RTYPE_ASPA, RTYPE_REPO, RTYPE_FILE, RTYPE_RSC, diff --git a/usr.sbin/rpki-client/mft.c b/usr.sbin/rpki-client/mft.c index deca26d965e..64477b10eb4 100644 --- a/usr.sbin/rpki-client/mft.c +++ b/usr.sbin/rpki-client/mft.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mft.c,v 1.72 2022/06/10 10:41:09 tb Exp $ */ +/* $OpenBSD: mft.c,v 1.73 2022/08/18 15:20:27 job Exp $ */ /* * Copyright (c) 2022 Theo Buehler * Copyright (c) 2019 Kristaps Dzonsons @@ -164,8 +164,6 @@ rtype_from_file_extension(const char *fn) return RTYPE_ROA; if (strcasecmp(fn + sz - 4, ".gbr") == 0) return RTYPE_GBR; - if (strcasecmp(fn + sz - 4, ".asa") == 0) - return RTYPE_ASPA; if (strcasecmp(fn + sz - 4, ".sig") == 0) return RTYPE_RSC; @@ -193,7 +191,7 @@ valid_mft_filename(const char *fn, size_t len) } /* - * Check that the file is an ASPA, CER, CRL, GBR or a ROA. + * Check that the file is an CER, CRL, GBR or a ROA. * Returns corresponding rtype or RTYPE_INVALID on error. */ static enum rtype @@ -203,7 +201,6 @@ rtype_from_mftfile(const char *fn) type = rtype_from_file_extension(fn); switch (type) { - case RTYPE_ASPA: case RTYPE_CER: case RTYPE_CRL: case RTYPE_GBR: -- 2.20.1