Change all occurance of ".mnf" to ".mft" because:

a) no software should care and
b) it's less work to change my code to match the revisionist text in the
   current draft than it would be to argue about what the one true
   filename extension for manifests should be.

svn path=/rpkid/rootd.py; revision=3545

5 files changed, 6 insertions, 6 deletions

diff --git a/rpkid/rootd.py b/rpkid/rootd.py
index ac38d76d..18e29d6d 100644
--- a/rpkid/rootd.py
+++ b/rpkid/rootd.py
@@ -299,7 +299,7 @@ rpki_root_key           = rpki.x509.RSA( Auto_file = cfg.get("rpki-root-key"))
 rpki_root_cert_file     = cfg.get("rpki-root-cert")
 rpki_root_cert_uri      = cfg.get("rpki-root-cert-uri", rpki_base_uri + "Root.cer")
 
-rpki_root_manifest      = cfg.get("rpki-root-manifest", "Root.mnf")
+rpki_root_manifest      = cfg.get("rpki-root-manifest", "Root.mft")
 rpki_root_crl           = cfg.get("rpki-root-crl",      "Root.crl")
 rpki_subject_cert       = cfg.get("rpki-subject-cert",  "Child.cer")
 rpki_subject_pkcs10     = cfg.get("rpki-subject-pkcs10", "Child.pkcs10")
diff --git a/rpkid/rpki/__doc__.py.in b/rpkid/rpki/__doc__.py.in
index 7b2b280b..257c30b0 100644
--- a/rpkid/rpki/__doc__.py.in
+++ b/rpkid/rpki/__doc__.py.in
@@ -1385,7 +1385,7 @@
 #
 # @par @c rpki-root-manifest:
 #                      Name of file to which rootd should save its
-#                      RPKI manifest.  Default is "Root.mnf".
+#                      RPKI manifest.  Default is "Root.mft".
 #
 # @par @c rpki-subject-pkcs10:
 #                      Name of file that rootd should use when saving
diff --git a/rpkid/rpki/rpki_engine.py b/rpkid/rpki/rpki_engine.py
index ba7f1cf7..2247787f 100644
--- a/rpkid/rpki/rpki_engine.py
+++ b/rpkid/rpki/rpki_engine.py
@@ -586,7 +586,7 @@ class ca_detail_obj(rpki.sql.sql_persistent):
 
   def manifest_uri(self, ca):
     """Return publication URI for this ca_detail's manifest."""
-    return ca.sia_uri + self.public_key.gSKI() + ".mnf"
+    return ca.sia_uri + self.public_key.gSKI() + ".mft"
 
   def activate(self, ca, cert, uri, callback, errback, predecessor = None):
     """
diff --git a/rpkid/tests/smoketest.py b/rpkid/tests/smoketest.py
index 2c461a09..7700a432 100644
--- a/rpkid/tests/smoketest.py
+++ b/rpkid/tests/smoketest.py
@@ -1392,7 +1392,7 @@ rpki-subject-pkcs10     = %(rootd_name)s.subject.pkcs10
 rpki-subject-lifetime   = %(lifetime)s
 
 rpki-root-crl           = Bandicoot.crl
-rpki-root-manifest      = Bandicoot.mnf
+rpki-root-manifest      = Bandicoot.mft
 
 rpki-class-name         = Wombat
 rpki-subject-cert       = Wombat.cer
@@ -1418,7 +1418,7 @@ authorityKeyIdentifier  = keyid:always
 basicConstraints        = critical,CA:true
 subjectKeyIdentifier    = hash
 keyUsage                = critical,keyCertSign,cRLSign
-subjectInfoAccess       = 1.3.6.1.5.5.7.48.5;URI:%(rootd_sia)s,1.3.6.1.5.5.7.48.10;URI:%(rootd_sia)sBandicoot.mnf
+subjectInfoAccess       = 1.3.6.1.5.5.7.48.5;URI:%(rootd_sia)s,1.3.6.1.5.5.7.48.10;URI:%(rootd_sia)sBandicoot.mft
 sbgp-autonomousSysNum   = critical,AS:0-4294967295
 sbgp-ipAddrBlock        = critical,IPv4:0.0.0.0/0,IPv6:0::/0
 certificatePolicies     = critical, @rpki_certificate_policy
diff --git a/rpkid/tests/testpoke.py b/rpkid/tests/testpoke.py
index 0e9c06cd..1d7610ac 100644
--- a/rpkid/tests/testpoke.py
+++ b/rpkid/tests/testpoke.py
@@ -137,7 +137,7 @@ def do_issue():
   q_pdu = rpki.up_down.issue_pdu()
   req_key = get_PEM("cert-request-key", rpki.x509.RSA, yaml_req) or cms_key
   sia = ((rpki.oids.name2oid["id-ad-caRepository"], ("uri", yaml_req["sia"][0])),
-         (rpki.oids.name2oid["id-ad-rpkiManifest"], ("uri", yaml_req["sia"][0] + req_key.gSKI() + ".mnf")))
+         (rpki.oids.name2oid["id-ad-rpkiManifest"], ("uri", yaml_req["sia"][0] + req_key.gSKI() + ".mft")))
   q_pdu.class_name = yaml_req["class"]
   q_pdu.pkcs10 = rpki.x509.PKCS10.create_ca(req_key, sia)
   query_up_down(q_pdu)