Sync & permit ASPA objects to appear on Manifests

OK tb@ claudio@

diff --git a/usr.sbin/rpki-client/extern.h b/usr.sbin/rpki-client/extern.h
index b17595d..da707a8 100644 (file)
--- a/usr.sbin/rpki-client/extern.h
+++ b/usr.sbin/rpki-client/extern.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: extern.h,v 1.121 2022/02/14 14:46:16 job Exp $ */
+/*     $OpenBSD: extern.h,v 1.122 2022/03/31 12:00:00 job Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -160,6 +160,7 @@ enum rtype {
        RTYPE_CER,
        RTYPE_CRL,
        RTYPE_GBR,
+       RTYPE_ASPA,
        RTYPE_REPO,
        RTYPE_FILE,
 };

diff --git a/usr.sbin/rpki-client/mft.c b/usr.sbin/rpki-client/mft.c
index fb00d19..9b83cb1 100644 (file)
--- a/usr.sbin/rpki-client/mft.c
+++ b/usr.sbin/rpki-client/mft.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mft.c,v 1.53 2022/02/10 17:33:28 claudio Exp $ */
+/*     $OpenBSD: mft.c,v 1.54 2022/03/31 12:00:00 job Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -117,6 +117,8 @@ 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;
 
        return RTYPE_INVALID;
 }
@@ -157,6 +159,7 @@ rtype_from_mftfile(const char *fn)
        case RTYPE_CRL:
        case RTYPE_GBR:
        case RTYPE_ROA:
+       case RTYPE_ASPA:
                return type;
        default:
                return RTYPE_INVALID;

diff --git a/usr.sbin/rpki-client/rsync.c b/usr.sbin/rpki-client/rsync.c
index c4e6f91..2fd8116 100644 (file)
--- a/usr.sbin/rpki-client/rsync.c
+++ b/usr.sbin/rpki-client/rsync.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rsync.c,v 1.32 2022/01/13 11:50:29 claudio Exp $ */
+/*     $OpenBSD: rsync.c,v 1.33 2022/03/31 12:00:00 job Exp $ */
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -318,6 +318,7 @@ proc_rsync(char *prog, char *bind_addr, int fd)
                        args[i++] = "--include=*.gbr";
                        args[i++] = "--include=*.mft";
                        args[i++] = "--include=*.roa";
+                       args[i++] = "--include=*.asa";
                        args[i++] = "--exclude=*";
                        if (bind_addr != NULL) {
                                args[i++] = "--address";