From: pcarana <pc.moreno2099@gmail.com>
Date: Mon, 13 Jul 2020 18:00:08 +0000 (-0500)
Subject: Add HTTPS URIs to TALs, update ARIN download URI
X-Git-Tag: v1.4.0~25
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=bb643d01443f4ecdb96752643bf657a07551f0bd;p=thirdparty%2FFORT-validator.git

Add HTTPS URIs to TALs, update ARIN download URI
---

diff --git a/examples/tal/afrinic.tal b/examples/tal/afrinic.tal
index fc7639f3..e61c4829 100644
--- a/examples/tal/afrinic.tal
+++ b/examples/tal/afrinic.tal
@@ -1,3 +1,4 @@
+https://rpki.afrinic.net/repository/AfriNIC.cer
 rsync://rpki.afrinic.net/repository/AfriNIC.cer
 
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxsAqAhWIO+ON2Ef9oRDM
diff --git a/examples/tal/apnic.tal b/examples/tal/apnic.tal
index fc781ee2..57cd9125 100644
--- a/examples/tal/apnic.tal
+++ b/examples/tal/apnic.tal
@@ -1,3 +1,4 @@
+https://tal.apnic.net/apnic.cer
 rsync://rpki.apnic.net/repository/apnic-rpki-root-iana-origin.cer
 
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx9RWSL61YAAYumEiU8z8
diff --git a/examples/tal/ripe.tal b/examples/tal/ripe.tal
index acdb1731..80002d97 100644
--- a/examples/tal/ripe.tal
+++ b/examples/tal/ripe.tal
@@ -1,3 +1,4 @@
+https://rpki.ripe.net/ta/ripe-ncc-ta.cer
 rsync://rpki.ripe.net/ta/ripe-ncc-ta.cer
 
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0URYSGqUz2myBsOzeW1j
diff --git a/fort_setup.sh b/fort_setup.sh
index 23e3f70f..2b4453a1 100755
--- a/fort_setup.sh
+++ b/fort_setup.sh
@@ -92,7 +92,7 @@ GITHUB_TALS="https://raw.githubusercontent.com/NICMx/FORT-validator/master/examp
 ACCEPT="no"
 REPO_DIR="/var/cache/fort/repository"
 CONF_FILE="${CONF_DIR}/fort-config.json"
-ARIN_TAL="https://www.arin.net/resources/manage/rpki/arin-rfc7730.tal"
+ARIN_TAL="https://www.arin.net/resources/manage/rpki/arin.tal"
 
 # Agree ARIN RPA. Exit on denial or unknown response, download otherwise.
 echo "Please download and read ARIN Relying Party Agreement (RPA) from https://www.arin.net/resources/manage/rpki/rpa.pdf"