Filename cleanup

svn path=/rpkid/Makefile; revision=1531

478 files changed, 3 insertions, 2 deletions

diff --git a/scripts/Makefile b/rpkid/Makefile
index 69f83f30..69f83f30 100644
--- a/scripts/Makefile
+++ b/rpkid/Makefile
diff --git a/rpkid/POW b/rpkid/POW
new file mode 120000
index 00000000..43fccd7b
--- /dev/null
+++ b/rpkid/POW
@@ -0,0 +1 @@
+../pow/buildlib/POW
\ No newline at end of file
diff --git a/scripts/README b/rpkid/README
index 3bb44561..3bb44561 100644
--- a/scripts/README
+++ b/rpkid/README
diff --git a/scripts/apnic-poke-1.sh b/rpkid/apnic-poke-1.sh
index 0bd8ff52..0bd8ff52 100644
--- a/scripts/apnic-poke-1.sh
+++ b/rpkid/apnic-poke-1.sh
diff --git a/scripts/apnic-poke-1.yaml b/rpkid/apnic-poke-1.yaml
index 24b80561..24b80561 100644
--- a/scripts/apnic-poke-1.yaml
+++ b/rpkid/apnic-poke-1.yaml
diff --git a/scripts/apnic-poke-2.sh b/rpkid/apnic-poke-2.sh
index d10c9fa5..d10c9fa5 100644
--- a/scripts/apnic-poke-2.sh
+++ b/rpkid/apnic-poke-2.sh
diff --git a/scripts/apnic-poke-2.yaml b/rpkid/apnic-poke-2.yaml
index 6ba93729..6ba93729 100644
--- a/scripts/apnic-poke-2.yaml
+++ b/rpkid/apnic-poke-2.yaml
diff --git a/scripts/biz-certs-setup.sh b/rpkid/biz-certs-setup.sh
index 26164496..26164496 100644
--- a/scripts/biz-certs-setup.sh
+++ b/rpkid/biz-certs-setup.sh
diff --git a/scripts/biz-certs/08fd5b15.0 b/rpkid/biz-certs/08fd5b15.0
index 4e65bd46..4e65bd46 120000
--- a/scripts/biz-certs/08fd5b15.0
+++ b/rpkid/biz-certs/08fd5b15.0
diff --git a/scripts/biz-certs/0cb21e6a.0 b/rpkid/biz-certs/0cb21e6a.0
index 0bbc896d..0bbc896d 120000
--- a/scripts/biz-certs/0cb21e6a.0
+++ b/rpkid/biz-certs/0cb21e6a.0
diff --git a/scripts/biz-certs/33b6d09e.0 b/rpkid/biz-certs/33b6d09e.0
index 6a20c98c..6a20c98c 120000
--- a/scripts/biz-certs/33b6d09e.0
+++ b/rpkid/biz-certs/33b6d09e.0
diff --git a/scripts/biz-certs/5210f268.0 b/rpkid/biz-certs/5210f268.0
index 2a347add..2a347add 120000
--- a/scripts/biz-certs/5210f268.0
+++ b/rpkid/biz-certs/5210f268.0
diff --git a/scripts/biz-certs/5ebf1062.0 b/rpkid/biz-certs/5ebf1062.0
index 16d11802..16d11802 120000
--- a/scripts/biz-certs/5ebf1062.0
+++ b/rpkid/biz-certs/5ebf1062.0
diff --git a/scripts/biz-certs/60ac264c.0 b/rpkid/biz-certs/60ac264c.0
index 2f3644fd..2f3644fd 120000
--- a/scripts/biz-certs/60ac264c.0
+++ b/rpkid/biz-certs/60ac264c.0
diff --git a/scripts/biz-certs/623ab26c.0 b/rpkid/biz-certs/623ab26c.0
index 95960a41..95960a41 120000
--- a/scripts/biz-certs/623ab26c.0
+++ b/rpkid/biz-certs/623ab26c.0
diff --git a/scripts/biz-certs/6878697a.0 b/rpkid/biz-certs/6878697a.0
index efc1dc95..efc1dc95 120000
--- a/scripts/biz-certs/6878697a.0
+++ b/rpkid/biz-certs/6878697a.0
diff --git a/scripts/biz-certs/71288ec9.0 b/rpkid/biz-certs/71288ec9.0
index b05a359f..b05a359f 120000
--- a/scripts/biz-certs/71288ec9.0
+++ b/rpkid/biz-certs/71288ec9.0
diff --git a/scripts/biz-certs/7449ce31.0 b/rpkid/biz-certs/7449ce31.0
index 30a5b8ce..30a5b8ce 120000
--- a/scripts/biz-certs/7449ce31.0
+++ b/rpkid/biz-certs/7449ce31.0
diff --git a/scripts/biz-certs/7562977b.0 b/rpkid/biz-certs/7562977b.0
index 808e8a92..808e8a92 120000
--- a/scripts/biz-certs/7562977b.0
+++ b/rpkid/biz-certs/7562977b.0
diff --git a/scripts/biz-certs/80e4ab61.0 b/rpkid/biz-certs/80e4ab61.0
index 17d44d15..17d44d15 120000
--- a/scripts/biz-certs/80e4ab61.0
+++ b/rpkid/biz-certs/80e4ab61.0
diff --git a/scripts/biz-certs/826d8d65.0 b/rpkid/biz-certs/826d8d65.0
index 21b78ac1..21b78ac1 120000
--- a/scripts/biz-certs/826d8d65.0
+++ b/rpkid/biz-certs/826d8d65.0
diff --git a/scripts/biz-certs/9844d0ad.0 b/rpkid/biz-certs/9844d0ad.0
index 75a23567..75a23567 120000
--- a/scripts/biz-certs/9844d0ad.0
+++ b/rpkid/biz-certs/9844d0ad.0
diff --git a/scripts/biz-certs/9970e247.0 b/rpkid/biz-certs/9970e247.0
index a40c06f6..a40c06f6 120000
--- a/scripts/biz-certs/9970e247.0
+++ b/rpkid/biz-certs/9970e247.0
diff --git a/scripts/biz-certs/Alice-CA.cer b/rpkid/biz-certs/Alice-CA.cer
index 00aceaa8..00aceaa8 100644
--- a/scripts/biz-certs/Alice-CA.cer
+++ b/rpkid/biz-certs/Alice-CA.cer
diff --git a/scripts/biz-certs/Alice-CA.cnf b/rpkid/biz-certs/Alice-CA.cnf
index b6e1971e..b6e1971e 100644
--- a/scripts/biz-certs/Alice-CA.cnf
+++ b/rpkid/biz-certs/Alice-CA.cnf
diff --git a/scripts/biz-certs/Alice-CA.key b/rpkid/biz-certs/Alice-CA.key
index a5b32f93..a5b32f93 100644
--- a/scripts/biz-certs/Alice-CA.key
+++ b/rpkid/biz-certs/Alice-CA.key
diff --git a/scripts/biz-certs/Alice-CA.req b/rpkid/biz-certs/Alice-CA.req
index 1d6a39e1..1d6a39e1 100644
--- a/scripts/biz-certs/Alice-CA.req
+++ b/rpkid/biz-certs/Alice-CA.req
diff --git a/scripts/biz-certs/Alice-CA.srl b/rpkid/biz-certs/Alice-CA.srl
index a4acb46b..a4acb46b 100644
--- a/scripts/biz-certs/Alice-CA.srl
+++ b/rpkid/biz-certs/Alice-CA.srl
diff --git a/scripts/biz-certs/Alice-EE.cer b/rpkid/biz-certs/Alice-EE.cer
index 7a535623..7a535623 100644
--- a/scripts/biz-certs/Alice-EE.cer
+++ b/rpkid/biz-certs/Alice-EE.cer
diff --git a/scripts/biz-certs/Alice-EE.cnf b/rpkid/biz-certs/Alice-EE.cnf
index bd9c175c..bd9c175c 100644
--- a/scripts/biz-certs/Alice-EE.cnf
+++ b/rpkid/biz-certs/Alice-EE.cnf
diff --git a/scripts/biz-certs/Alice-EE.key b/rpkid/biz-certs/Alice-EE.key
index 709a07a9..709a07a9 100644
--- a/scripts/biz-certs/Alice-EE.key
+++ b/rpkid/biz-certs/Alice-EE.key
diff --git a/scripts/biz-certs/Alice-EE.req b/rpkid/biz-certs/Alice-EE.req
index 9d7388b7..9d7388b7 100644
--- a/scripts/biz-certs/Alice-EE.req
+++ b/rpkid/biz-certs/Alice-EE.req
diff --git a/scripts/biz-certs/Alice-Root.cer b/rpkid/biz-certs/Alice-Root.cer
index 5f08ecd3..5f08ecd3 100644
--- a/scripts/biz-certs/Alice-Root.cer
+++ b/rpkid/biz-certs/Alice-Root.cer
diff --git a/scripts/biz-certs/Alice-Root.cnf b/rpkid/biz-certs/Alice-Root.cnf
index 78089bba..78089bba 100644
--- a/scripts/biz-certs/Alice-Root.cnf
+++ b/rpkid/biz-certs/Alice-Root.cnf
diff --git a/scripts/biz-certs/Alice-Root.key b/rpkid/biz-certs/Alice-Root.key
index 1c417192..1c417192 100644
--- a/scripts/biz-certs/Alice-Root.key
+++ b/rpkid/biz-certs/Alice-Root.key
diff --git a/scripts/biz-certs/Alice-Root.req b/rpkid/biz-certs/Alice-Root.req
index ba90a1b6..ba90a1b6 100644
--- a/scripts/biz-certs/Alice-Root.req
+++ b/rpkid/biz-certs/Alice-Root.req
diff --git a/scripts/biz-certs/Alice-Root.srl b/rpkid/biz-certs/Alice-Root.srl
index 2f14dc02..2f14dc02 100644
--- a/scripts/biz-certs/Alice-Root.srl
+++ b/rpkid/biz-certs/Alice-Root.srl
diff --git a/scripts/biz-certs/Bob-CA.cer b/rpkid/biz-certs/Bob-CA.cer
index 98e21886..98e21886 100644
--- a/scripts/biz-certs/Bob-CA.cer
+++ b/rpkid/biz-certs/Bob-CA.cer
diff --git a/scripts/biz-certs/Bob-CA.cnf b/rpkid/biz-certs/Bob-CA.cnf
index 91dbff0c..91dbff0c 100644
--- a/scripts/biz-certs/Bob-CA.cnf
+++ b/rpkid/biz-certs/Bob-CA.cnf
diff --git a/scripts/biz-certs/Bob-CA.key b/rpkid/biz-certs/Bob-CA.key
index d331ba47..d331ba47 100644
--- a/scripts/biz-certs/Bob-CA.key
+++ b/rpkid/biz-certs/Bob-CA.key
diff --git a/scripts/biz-certs/Bob-CA.req b/rpkid/biz-certs/Bob-CA.req
index ec8cb2b2..ec8cb2b2 100644
--- a/scripts/biz-certs/Bob-CA.req
+++ b/rpkid/biz-certs/Bob-CA.req
diff --git a/scripts/biz-certs/Bob-CA.srl b/rpkid/biz-certs/Bob-CA.srl
index 89899213..89899213 100644
--- a/scripts/biz-certs/Bob-CA.srl
+++ b/rpkid/biz-certs/Bob-CA.srl
diff --git a/scripts/biz-certs/Bob-EE.cer b/rpkid/biz-certs/Bob-EE.cer
index 88411f1b..88411f1b 100644
--- a/scripts/biz-certs/Bob-EE.cer
+++ b/rpkid/biz-certs/Bob-EE.cer
diff --git a/scripts/biz-certs/Bob-EE.cnf b/rpkid/biz-certs/Bob-EE.cnf
index 03a517ec..03a517ec 100644
--- a/scripts/biz-certs/Bob-EE.cnf
+++ b/rpkid/biz-certs/Bob-EE.cnf
diff --git a/scripts/biz-certs/Bob-EE.key b/rpkid/biz-certs/Bob-EE.key
index fe2d8a29..fe2d8a29 100644
--- a/scripts/biz-certs/Bob-EE.key
+++ b/rpkid/biz-certs/Bob-EE.key
diff --git a/scripts/biz-certs/Bob-EE.req b/rpkid/biz-certs/Bob-EE.req
index 497f54be..497f54be 100644
--- a/scripts/biz-certs/Bob-EE.req
+++ b/rpkid/biz-certs/Bob-EE.req
diff --git a/scripts/biz-certs/Bob-Root.cer b/rpkid/biz-certs/Bob-Root.cer
index f7a041ae..f7a041ae 100644
--- a/scripts/biz-certs/Bob-Root.cer
+++ b/rpkid/biz-certs/Bob-Root.cer
diff --git a/scripts/biz-certs/Bob-Root.cnf b/rpkid/biz-certs/Bob-Root.cnf
index d90595fd..d90595fd 100644
--- a/scripts/biz-certs/Bob-Root.cnf
+++ b/rpkid/biz-certs/Bob-Root.cnf
diff --git a/scripts/biz-certs/Bob-Root.key b/rpkid/biz-certs/Bob-Root.key
index bb9a897e..bb9a897e 100644
--- a/scripts/biz-certs/Bob-Root.key
+++ b/rpkid/biz-certs/Bob-Root.key
diff --git a/scripts/biz-certs/Bob-Root.req b/rpkid/biz-certs/Bob-Root.req
index 265ed9ef..265ed9ef 100644
--- a/scripts/biz-certs/Bob-Root.req
+++ b/rpkid/biz-certs/Bob-Root.req
diff --git a/scripts/biz-certs/Bob-Root.srl b/rpkid/biz-certs/Bob-Root.srl
index 22d5b92c..22d5b92c 100644
--- a/scripts/biz-certs/Bob-Root.srl
+++ b/rpkid/biz-certs/Bob-Root.srl
diff --git a/scripts/biz-certs/Carol-CA.cer b/rpkid/biz-certs/Carol-CA.cer
index c8b8416c..c8b8416c 100644
--- a/scripts/biz-certs/Carol-CA.cer
+++ b/rpkid/biz-certs/Carol-CA.cer
diff --git a/scripts/biz-certs/Carol-CA.cnf b/rpkid/biz-certs/Carol-CA.cnf
index 2247466d..2247466d 100644
--- a/scripts/biz-certs/Carol-CA.cnf
+++ b/rpkid/biz-certs/Carol-CA.cnf
diff --git a/scripts/biz-certs/Carol-CA.key b/rpkid/biz-certs/Carol-CA.key
index 3c80b76d..3c80b76d 100644
--- a/scripts/biz-certs/Carol-CA.key
+++ b/rpkid/biz-certs/Carol-CA.key
diff --git a/scripts/biz-certs/Carol-CA.req b/rpkid/biz-certs/Carol-CA.req
index 8e9a99bb..8e9a99bb 100644
--- a/scripts/biz-certs/Carol-CA.req
+++ b/rpkid/biz-certs/Carol-CA.req
diff --git a/scripts/biz-certs/Carol-CA.srl b/rpkid/biz-certs/Carol-CA.srl
index 730b3714..730b3714 100644
--- a/scripts/biz-certs/Carol-CA.srl
+++ b/rpkid/biz-certs/Carol-CA.srl
diff --git a/scripts/biz-certs/Carol-EE.cer b/rpkid/biz-certs/Carol-EE.cer
index c3cef4c3..c3cef4c3 100644
--- a/scripts/biz-certs/Carol-EE.cer
+++ b/rpkid/biz-certs/Carol-EE.cer
diff --git a/scripts/biz-certs/Carol-EE.cnf b/rpkid/biz-certs/Carol-EE.cnf
index 4febbc99..4febbc99 100644
--- a/scripts/biz-certs/Carol-EE.cnf
+++ b/rpkid/biz-certs/Carol-EE.cnf
diff --git a/scripts/biz-certs/Carol-EE.key b/rpkid/biz-certs/Carol-EE.key
index 2d785124..2d785124 100644
--- a/scripts/biz-certs/Carol-EE.key
+++ b/rpkid/biz-certs/Carol-EE.key
diff --git a/scripts/biz-certs/Carol-EE.req b/rpkid/biz-certs/Carol-EE.req
index 5d9fa36d..5d9fa36d 100644
--- a/scripts/biz-certs/Carol-EE.req
+++ b/rpkid/biz-certs/Carol-EE.req
diff --git a/scripts/biz-certs/Carol-Root.cer b/rpkid/biz-certs/Carol-Root.cer
index 307d9976..307d9976 100644
--- a/scripts/biz-certs/Carol-Root.cer
+++ b/rpkid/biz-certs/Carol-Root.cer
diff --git a/scripts/biz-certs/Carol-Root.cnf b/rpkid/biz-certs/Carol-Root.cnf
index 01190973..01190973 100644
--- a/scripts/biz-certs/Carol-Root.cnf
+++ b/rpkid/biz-certs/Carol-Root.cnf
diff --git a/scripts/biz-certs/Carol-Root.key b/rpkid/biz-certs/Carol-Root.key
index 0e41137a..0e41137a 100644
--- a/scripts/biz-certs/Carol-Root.key
+++ b/rpkid/biz-certs/Carol-Root.key
diff --git a/scripts/biz-certs/Carol-Root.req b/rpkid/biz-certs/Carol-Root.req
index 1d911e4d..1d911e4d 100644
--- a/scripts/biz-certs/Carol-Root.req
+++ b/rpkid/biz-certs/Carol-Root.req
diff --git a/scripts/biz-certs/Carol-Root.srl b/rpkid/biz-certs/Carol-Root.srl
index 6dc25038..6dc25038 100644
--- a/scripts/biz-certs/Carol-Root.srl
+++ b/rpkid/biz-certs/Carol-Root.srl
diff --git a/scripts/biz-certs/Dave-CA.cer b/rpkid/biz-certs/Dave-CA.cer
index c055bfa2..c055bfa2 100644
--- a/scripts/biz-certs/Dave-CA.cer
+++ b/rpkid/biz-certs/Dave-CA.cer
diff --git a/scripts/biz-certs/Dave-CA.cnf b/rpkid/biz-certs/Dave-CA.cnf
index 47717a0a..47717a0a 100644
--- a/scripts/biz-certs/Dave-CA.cnf
+++ b/rpkid/biz-certs/Dave-CA.cnf
diff --git a/scripts/biz-certs/Dave-CA.key b/rpkid/biz-certs/Dave-CA.key
index d8264c2c..d8264c2c 100644
--- a/scripts/biz-certs/Dave-CA.key
+++ b/rpkid/biz-certs/Dave-CA.key
diff --git a/scripts/biz-certs/Dave-CA.req b/rpkid/biz-certs/Dave-CA.req
index 8ce0b3ba..8ce0b3ba 100644
--- a/scripts/biz-certs/Dave-CA.req
+++ b/rpkid/biz-certs/Dave-CA.req
diff --git a/scripts/biz-certs/Dave-CA.srl b/rpkid/biz-certs/Dave-CA.srl
index 5cba7d1c..5cba7d1c 100644
--- a/scripts/biz-certs/Dave-CA.srl
+++ b/rpkid/biz-certs/Dave-CA.srl
diff --git a/scripts/biz-certs/Dave-EE.cer b/rpkid/biz-certs/Dave-EE.cer
index 2dea377d..2dea377d 100644
--- a/scripts/biz-certs/Dave-EE.cer
+++ b/rpkid/biz-certs/Dave-EE.cer
diff --git a/scripts/biz-certs/Dave-EE.cnf b/rpkid/biz-certs/Dave-EE.cnf
index 13517fdb..13517fdb 100644
--- a/scripts/biz-certs/Dave-EE.cnf
+++ b/rpkid/biz-certs/Dave-EE.cnf
diff --git a/scripts/biz-certs/Dave-EE.key b/rpkid/biz-certs/Dave-EE.key
index 283db731..283db731 100644
--- a/scripts/biz-certs/Dave-EE.key
+++ b/rpkid/biz-certs/Dave-EE.key
diff --git a/scripts/biz-certs/Dave-EE.req b/rpkid/biz-certs/Dave-EE.req
index f989d254..f989d254 100644
--- a/scripts/biz-certs/Dave-EE.req
+++ b/rpkid/biz-certs/Dave-EE.req
diff --git a/scripts/biz-certs/Dave-Root.cer b/rpkid/biz-certs/Dave-Root.cer
index c746d1d5..c746d1d5 100644
--- a/scripts/biz-certs/Dave-Root.cer
+++ b/rpkid/biz-certs/Dave-Root.cer
diff --git a/scripts/biz-certs/Dave-Root.cnf b/rpkid/biz-certs/Dave-Root.cnf
index 58df8105..58df8105 100644
--- a/scripts/biz-certs/Dave-Root.cnf
+++ b/rpkid/biz-certs/Dave-Root.cnf
diff --git a/scripts/biz-certs/Dave-Root.key b/rpkid/biz-certs/Dave-Root.key
index 4c5b73bf..4c5b73bf 100644
--- a/scripts/biz-certs/Dave-Root.key
+++ b/rpkid/biz-certs/Dave-Root.key
diff --git a/scripts/biz-certs/Dave-Root.req b/rpkid/biz-certs/Dave-Root.req
index e9905363..e9905363 100644
--- a/scripts/biz-certs/Dave-Root.req
+++ b/rpkid/biz-certs/Dave-Root.req
diff --git a/scripts/biz-certs/Dave-Root.srl b/rpkid/biz-certs/Dave-Root.srl
index 6bc6d25f..6bc6d25f 100644
--- a/scripts/biz-certs/Dave-Root.srl
+++ b/rpkid/biz-certs/Dave-Root.srl
diff --git a/scripts/biz-certs/Elena-CA.cer b/rpkid/biz-certs/Elena-CA.cer
index afa23794..afa23794 100644
--- a/scripts/biz-certs/Elena-CA.cer
+++ b/rpkid/biz-certs/Elena-CA.cer
diff --git a/scripts/biz-certs/Elena-CA.cnf b/rpkid/biz-certs/Elena-CA.cnf
index bd8d7d1c..bd8d7d1c 100644
--- a/scripts/biz-certs/Elena-CA.cnf
+++ b/rpkid/biz-certs/Elena-CA.cnf
diff --git a/scripts/biz-certs/Elena-CA.key b/rpkid/biz-certs/Elena-CA.key
index 40a3c768..40a3c768 100644
--- a/scripts/biz-certs/Elena-CA.key
+++ b/rpkid/biz-certs/Elena-CA.key
diff --git a/scripts/biz-certs/Elena-CA.req b/rpkid/biz-certs/Elena-CA.req
index 743fd18d..743fd18d 100644
--- a/scripts/biz-certs/Elena-CA.req
+++ b/rpkid/biz-certs/Elena-CA.req
diff --git a/scripts/biz-certs/Elena-CA.srl b/rpkid/biz-certs/Elena-CA.srl
index b71d9d9d..b71d9d9d 100644
--- a/scripts/biz-certs/Elena-CA.srl
+++ b/rpkid/biz-certs/Elena-CA.srl
diff --git a/scripts/biz-certs/Elena-EE.cer b/rpkid/biz-certs/Elena-EE.cer
index f6ffa506..f6ffa506 100644
--- a/scripts/biz-certs/Elena-EE.cer
+++ b/rpkid/biz-certs/Elena-EE.cer
diff --git a/scripts/biz-certs/Elena-EE.cnf b/rpkid/biz-certs/Elena-EE.cnf
index 126031e9..126031e9 100644
--- a/scripts/biz-certs/Elena-EE.cnf
+++ b/rpkid/biz-certs/Elena-EE.cnf
diff --git a/scripts/biz-certs/Elena-EE.key b/rpkid/biz-certs/Elena-EE.key
index dd05db61..dd05db61 100644
--- a/scripts/biz-certs/Elena-EE.key
+++ b/rpkid/biz-certs/Elena-EE.key
diff --git a/scripts/biz-certs/Elena-EE.req b/rpkid/biz-certs/Elena-EE.req
index 69b845ec..69b845ec 100644
--- a/scripts/biz-certs/Elena-EE.req
+++ b/rpkid/biz-certs/Elena-EE.req
diff --git a/scripts/biz-certs/Elena-Root.cer b/rpkid/biz-certs/Elena-Root.cer
index ef1efa93..ef1efa93 100644
--- a/scripts/biz-certs/Elena-Root.cer
+++ b/rpkid/biz-certs/Elena-Root.cer
diff --git a/scripts/biz-certs/Elena-Root.cnf b/rpkid/biz-certs/Elena-Root.cnf
index 920e7c7d..920e7c7d 100644
--- a/scripts/biz-certs/Elena-Root.cnf
+++ b/rpkid/biz-certs/Elena-Root.cnf
diff --git a/scripts/biz-certs/Elena-Root.key b/rpkid/biz-certs/Elena-Root.key
index 20ce11c7..20ce11c7 100644
--- a/scripts/biz-certs/Elena-Root.key
+++ b/rpkid/biz-certs/Elena-Root.key
diff --git a/scripts/biz-certs/Elena-Root.req b/rpkid/biz-certs/Elena-Root.req
index 6797e57d..6797e57d 100644
--- a/scripts/biz-certs/Elena-Root.req
+++ b/rpkid/biz-certs/Elena-Root.req
diff --git a/scripts/biz-certs/Elena-Root.srl b/rpkid/biz-certs/Elena-Root.srl
index ffc8fb8f..ffc8fb8f 100644
--- a/scripts/biz-certs/Elena-Root.srl
+++ b/rpkid/biz-certs/Elena-Root.srl
diff --git a/scripts/biz-certs/Frank-CA.cer b/rpkid/biz-certs/Frank-CA.cer
index ce4b267e..ce4b267e 100644
--- a/scripts/biz-certs/Frank-CA.cer
+++ b/rpkid/biz-certs/Frank-CA.cer
diff --git a/scripts/biz-certs/Frank-CA.cnf b/rpkid/biz-certs/Frank-CA.cnf
index 97703886..97703886 100644
--- a/scripts/biz-certs/Frank-CA.cnf
+++ b/rpkid/biz-certs/Frank-CA.cnf
diff --git a/scripts/biz-certs/Frank-CA.key b/rpkid/biz-certs/Frank-CA.key
index eecb7253..eecb7253 100644
--- a/scripts/biz-certs/Frank-CA.key
+++ b/rpkid/biz-certs/Frank-CA.key
diff --git a/scripts/biz-certs/Frank-CA.req b/rpkid/biz-certs/Frank-CA.req
index 6946aea2..6946aea2 100644
--- a/scripts/biz-certs/Frank-CA.req
+++ b/rpkid/biz-certs/Frank-CA.req
diff --git a/scripts/biz-certs/Frank-CA.srl b/rpkid/biz-certs/Frank-CA.srl
index 3d68aea7..3d68aea7 100644
--- a/scripts/biz-certs/Frank-CA.srl
+++ b/rpkid/biz-certs/Frank-CA.srl
diff --git a/scripts/biz-certs/Frank-EE.cer b/rpkid/biz-certs/Frank-EE.cer
index b67c4114..b67c4114 100644
--- a/scripts/biz-certs/Frank-EE.cer
+++ b/rpkid/biz-certs/Frank-EE.cer
diff --git a/scripts/biz-certs/Frank-EE.cnf b/rpkid/biz-certs/Frank-EE.cnf
index 68f62d38..68f62d38 100644
--- a/scripts/biz-certs/Frank-EE.cnf
+++ b/rpkid/biz-certs/Frank-EE.cnf
diff --git a/scripts/biz-certs/Frank-EE.key b/rpkid/biz-certs/Frank-EE.key
index 9c8c497d..9c8c497d 100644
--- a/scripts/biz-certs/Frank-EE.key
+++ b/rpkid/biz-certs/Frank-EE.key
diff --git a/scripts/biz-certs/Frank-EE.req b/rpkid/biz-certs/Frank-EE.req
index b7731a9d..b7731a9d 100644
--- a/scripts/biz-certs/Frank-EE.req
+++ b/rpkid/biz-certs/Frank-EE.req
diff --git a/scripts/biz-certs/Frank-Root.cer b/rpkid/biz-certs/Frank-Root.cer
index 0ec9f629..0ec9f629 100644
--- a/scripts/biz-certs/Frank-Root.cer
+++ b/rpkid/biz-certs/Frank-Root.cer
diff --git a/scripts/biz-certs/Frank-Root.cnf b/rpkid/biz-certs/Frank-Root.cnf
index 8993417b..8993417b 100644
--- a/scripts/biz-certs/Frank-Root.cnf
+++ b/rpkid/biz-certs/Frank-Root.cnf
diff --git a/scripts/biz-certs/Frank-Root.key b/rpkid/biz-certs/Frank-Root.key
index ad4700e5..ad4700e5 100644
--- a/scripts/biz-certs/Frank-Root.key
+++ b/rpkid/biz-certs/Frank-Root.key
diff --git a/scripts/biz-certs/Frank-Root.req b/rpkid/biz-certs/Frank-Root.req
index 6dd4cbdd..6dd4cbdd 100644
--- a/scripts/biz-certs/Frank-Root.req
+++ b/rpkid/biz-certs/Frank-Root.req
diff --git a/scripts/biz-certs/Frank-Root.srl b/rpkid/biz-certs/Frank-Root.srl
index 3c868fc0..3c868fc0 100644
--- a/scripts/biz-certs/Frank-Root.srl
+++ b/rpkid/biz-certs/Frank-Root.srl
diff --git a/scripts/biz-certs/Ginny-CA.cer b/rpkid/biz-certs/Ginny-CA.cer
index ba2154ed..ba2154ed 100644
--- a/scripts/biz-certs/Ginny-CA.cer
+++ b/rpkid/biz-certs/Ginny-CA.cer
diff --git a/scripts/biz-certs/Ginny-CA.cnf b/rpkid/biz-certs/Ginny-CA.cnf
index d1846a6c..d1846a6c 100644
--- a/scripts/biz-certs/Ginny-CA.cnf
+++ b/rpkid/biz-certs/Ginny-CA.cnf
diff --git a/scripts/biz-certs/Ginny-CA.key b/rpkid/biz-certs/Ginny-CA.key
index 281a45b8..281a45b8 100644
--- a/scripts/biz-certs/Ginny-CA.key
+++ b/rpkid/biz-certs/Ginny-CA.key
diff --git a/scripts/biz-certs/Ginny-CA.req b/rpkid/biz-certs/Ginny-CA.req
index 11b558f3..11b558f3 100644
--- a/scripts/biz-certs/Ginny-CA.req
+++ b/rpkid/biz-certs/Ginny-CA.req
diff --git a/scripts/biz-certs/Ginny-CA.srl b/rpkid/biz-certs/Ginny-CA.srl
index 75f9d5e0..75f9d5e0 100644
--- a/scripts/biz-certs/Ginny-CA.srl
+++ b/rpkid/biz-certs/Ginny-CA.srl
diff --git a/scripts/biz-certs/Ginny-EE.cer b/rpkid/biz-certs/Ginny-EE.cer
index 5e4bd8b9..5e4bd8b9 100644
--- a/scripts/biz-certs/Ginny-EE.cer
+++ b/rpkid/biz-certs/Ginny-EE.cer
diff --git a/scripts/biz-certs/Ginny-EE.cnf b/rpkid/biz-certs/Ginny-EE.cnf
index 949907cb..949907cb 100644
--- a/scripts/biz-certs/Ginny-EE.cnf
+++ b/rpkid/biz-certs/Ginny-EE.cnf
diff --git a/scripts/biz-certs/Ginny-EE.key b/rpkid/biz-certs/Ginny-EE.key
index 1984ff44..1984ff44 100644
--- a/scripts/biz-certs/Ginny-EE.key
+++ b/rpkid/biz-certs/Ginny-EE.key
diff --git a/scripts/biz-certs/Ginny-EE.req b/rpkid/biz-certs/Ginny-EE.req
index 30a62a71..30a62a71 100644
--- a/scripts/biz-certs/Ginny-EE.req
+++ b/rpkid/biz-certs/Ginny-EE.req
diff --git a/scripts/biz-certs/Ginny-Root.cer b/rpkid/biz-certs/Ginny-Root.cer
index a5d5e386..a5d5e386 100644
--- a/scripts/biz-certs/Ginny-Root.cer
+++ b/rpkid/biz-certs/Ginny-Root.cer
diff --git a/scripts/biz-certs/Ginny-Root.cnf b/rpkid/biz-certs/Ginny-Root.cnf
index 63b600d6..63b600d6 100644
--- a/scripts/biz-certs/Ginny-Root.cnf
+++ b/rpkid/biz-certs/Ginny-Root.cnf
diff --git a/scripts/biz-certs/Ginny-Root.key b/rpkid/biz-certs/Ginny-Root.key
index 710f4817..710f4817 100644
--- a/scripts/biz-certs/Ginny-Root.key
+++ b/rpkid/biz-certs/Ginny-Root.key
diff --git a/scripts/biz-certs/Ginny-Root.req b/rpkid/biz-certs/Ginny-Root.req
index 60d14eca..60d14eca 100644
--- a/scripts/biz-certs/Ginny-Root.req
+++ b/rpkid/biz-certs/Ginny-Root.req
diff --git a/scripts/biz-certs/Ginny-Root.srl b/rpkid/biz-certs/Ginny-Root.srl
index a51501dd..a51501dd 100644
--- a/scripts/biz-certs/Ginny-Root.srl
+++ b/rpkid/biz-certs/Ginny-Root.srl
diff --git a/scripts/biz-certs/Harry-CA.cer b/rpkid/biz-certs/Harry-CA.cer
index 09af3f12..09af3f12 100644
--- a/scripts/biz-certs/Harry-CA.cer
+++ b/rpkid/biz-certs/Harry-CA.cer
diff --git a/scripts/biz-certs/Harry-CA.cnf b/rpkid/biz-certs/Harry-CA.cnf
index b6002949..b6002949 100644
--- a/scripts/biz-certs/Harry-CA.cnf
+++ b/rpkid/biz-certs/Harry-CA.cnf
diff --git a/scripts/biz-certs/Harry-CA.key b/rpkid/biz-certs/Harry-CA.key
index 6bd1d298..6bd1d298 100644
--- a/scripts/biz-certs/Harry-CA.key
+++ b/rpkid/biz-certs/Harry-CA.key
diff --git a/scripts/biz-certs/Harry-CA.req b/rpkid/biz-certs/Harry-CA.req
index 01dfc3bc..01dfc3bc 100644
--- a/scripts/biz-certs/Harry-CA.req
+++ b/rpkid/biz-certs/Harry-CA.req
diff --git a/scripts/biz-certs/Harry-CA.srl b/rpkid/biz-certs/Harry-CA.srl
index 88fc9e2c..88fc9e2c 100644
--- a/scripts/biz-certs/Harry-CA.srl
+++ b/rpkid/biz-certs/Harry-CA.srl
diff --git a/scripts/biz-certs/Harry-EE.cer b/rpkid/biz-certs/Harry-EE.cer
index 85b5ff32..85b5ff32 100644
--- a/scripts/biz-certs/Harry-EE.cer
+++ b/rpkid/biz-certs/Harry-EE.cer
diff --git a/scripts/biz-certs/Harry-EE.cnf b/rpkid/biz-certs/Harry-EE.cnf
index cbfe45c4..cbfe45c4 100644
--- a/scripts/biz-certs/Harry-EE.cnf
+++ b/rpkid/biz-certs/Harry-EE.cnf
diff --git a/scripts/biz-certs/Harry-EE.key b/rpkid/biz-certs/Harry-EE.key
index e33936f8..e33936f8 100644
--- a/scripts/biz-certs/Harry-EE.key
+++ b/rpkid/biz-certs/Harry-EE.key
diff --git a/scripts/biz-certs/Harry-EE.req b/rpkid/biz-certs/Harry-EE.req
index 2d122147..2d122147 100644
--- a/scripts/biz-certs/Harry-EE.req
+++ b/rpkid/biz-certs/Harry-EE.req
diff --git a/scripts/biz-certs/Harry-Root.cer b/rpkid/biz-certs/Harry-Root.cer
index 545028e5..545028e5 100644
--- a/scripts/biz-certs/Harry-Root.cer
+++ b/rpkid/biz-certs/Harry-Root.cer
diff --git a/scripts/biz-certs/Harry-Root.cnf b/rpkid/biz-certs/Harry-Root.cnf
index d6ef8a30..d6ef8a30 100644
--- a/scripts/biz-certs/Harry-Root.cnf
+++ b/rpkid/biz-certs/Harry-Root.cnf
diff --git a/scripts/biz-certs/Harry-Root.key b/rpkid/biz-certs/Harry-Root.key
index a941f9de..a941f9de 100644
--- a/scripts/biz-certs/Harry-Root.key
+++ b/rpkid/biz-certs/Harry-Root.key
diff --git a/scripts/biz-certs/Harry-Root.req b/rpkid/biz-certs/Harry-Root.req
index 4dcf75a8..4dcf75a8 100644
--- a/scripts/biz-certs/Harry-Root.req
+++ b/rpkid/biz-certs/Harry-Root.req
diff --git a/scripts/biz-certs/Harry-Root.srl b/rpkid/biz-certs/Harry-Root.srl
index 5aecd158..5aecd158 100644
--- a/scripts/biz-certs/Harry-Root.srl
+++ b/rpkid/biz-certs/Harry-Root.srl
diff --git a/scripts/biz-certs/a17ff8dd.0 b/rpkid/biz-certs/a17ff8dd.0
index df756426..df756426 120000
--- a/scripts/biz-certs/a17ff8dd.0
+++ b/rpkid/biz-certs/a17ff8dd.0
diff --git a/scripts/biz-certs/b523b0af.0 b/rpkid/biz-certs/b523b0af.0
index 2af1f2c8..2af1f2c8 120000
--- a/scripts/biz-certs/b523b0af.0
+++ b/rpkid/biz-certs/b523b0af.0
diff --git a/scripts/biz-certs/c027faa7.0 b/rpkid/biz-certs/c027faa7.0
index 34794f44..34794f44 120000
--- a/scripts/biz-certs/c027faa7.0
+++ b/rpkid/biz-certs/c027faa7.0
diff --git a/scripts/biz-certs/cf3dacf7.0 b/rpkid/biz-certs/cf3dacf7.0
index e2d0a776..e2d0a776 120000
--- a/scripts/biz-certs/cf3dacf7.0
+++ b/rpkid/biz-certs/cf3dacf7.0
diff --git a/scripts/biz-certs/d9bfc7a9.0 b/rpkid/biz-certs/d9bfc7a9.0
index c3647c1c..c3647c1c 120000
--- a/scripts/biz-certs/d9bfc7a9.0
+++ b/rpkid/biz-certs/d9bfc7a9.0
diff --git a/scripts/biz-certs/dfc82c8e.0 b/rpkid/biz-certs/dfc82c8e.0
index 846947ab..846947ab 120000
--- a/scripts/biz-certs/dfc82c8e.0
+++ b/rpkid/biz-certs/dfc82c8e.0
diff --git a/scripts/biz-certs/f97c9834.0 b/rpkid/biz-certs/f97c9834.0
index e6a1b1aa..e6a1b1aa 120000
--- a/scripts/biz-certs/f97c9834.0
+++ b/rpkid/biz-certs/f97c9834.0
diff --git a/scripts/biz-certs/ff615a1f.0 b/rpkid/biz-certs/ff615a1f.0
index 0d7c9e4a..0d7c9e4a 120000
--- a/scripts/biz-certs/ff615a1f.0
+++ b/rpkid/biz-certs/ff615a1f.0
diff --git a/scripts/biz-certs/ff8832dd.0 b/rpkid/biz-certs/ff8832dd.0
index af1cacc8..af1cacc8 120000
--- a/scripts/biz-certs/ff8832dd.0
+++ b/rpkid/biz-certs/ff8832dd.0
diff --git a/scripts/cronjob.py b/rpkid/cronjob.py
index c21caf05..c21caf05 100644
--- a/scripts/cronjob.py
+++ b/rpkid/cronjob.py
diff --git a/scripts/cronjob.sh b/rpkid/cronjob.sh
index 97438a86..97438a86 100755
--- a/scripts/cronjob.sh
+++ b/rpkid/cronjob.sh
diff --git a/scripts/irbe-cli.py b/rpkid/irbe-cli.py
index b6ce7479..b6ce7479 100755
--- a/scripts/irbe-cli.py
+++ b/rpkid/irbe-cli.py
diff --git a/scripts/irbe-setup.py b/rpkid/irbe-setup.py
index 90ea5113..90ea5113 100644
--- a/scripts/irbe-setup.py
+++ b/rpkid/irbe-setup.py
diff --git a/scripts/irbe-setup.sh b/rpkid/irbe-setup.sh
index 31342aaa..31342aaa 100644
--- a/scripts/irbe-setup.sh
+++ b/rpkid/irbe-setup.sh
diff --git a/scripts/irdbd.py b/rpkid/irdbd.py
index d7ecca2b..d7ecca2b 100755
--- a/scripts/irdbd.py
+++ b/rpkid/irdbd.py
diff --git a/scripts/left-right-protocol-samples.xsl b/rpkid/left-right-protocol-samples.xsl
index da313544..da313544 100644
--- a/scripts/left-right-protocol-samples.xsl
+++ b/rpkid/left-right-protocol-samples.xsl
diff --git a/scripts/left-right-protocol-samples/pdu.001.xml b/rpkid/left-right-protocol-samples/pdu.001.xml
index 7d6b1bd5..7d6b1bd5 100644
--- a/scripts/left-right-protocol-samples/pdu.001.xml
+++ b/rpkid/left-right-protocol-samples/pdu.001.xml
diff --git a/scripts/left-right-protocol-samples/pdu.002.xml b/rpkid/left-right-protocol-samples/pdu.002.xml
index 248adc19..248adc19 100644
--- a/scripts/left-right-protocol-samples/pdu.002.xml
+++ b/rpkid/left-right-protocol-samples/pdu.002.xml
diff --git a/scripts/left-right-protocol-samples/pdu.003.xml b/rpkid/left-right-protocol-samples/pdu.003.xml
index b53bb031..b53bb031 100644
--- a/scripts/left-right-protocol-samples/pdu.003.xml
+++ b/rpkid/left-right-protocol-samples/pdu.003.xml
diff --git a/scripts/left-right-protocol-samples/pdu.004.xml b/rpkid/left-right-protocol-samples/pdu.004.xml
index ae9a2f54..ae9a2f54 100644
--- a/scripts/left-right-protocol-samples/pdu.004.xml
+++ b/rpkid/left-right-protocol-samples/pdu.004.xml
diff --git a/scripts/left-right-protocol-samples/pdu.005.xml b/rpkid/left-right-protocol-samples/pdu.005.xml
index f039e484..f039e484 100644
--- a/scripts/left-right-protocol-samples/pdu.005.xml
+++ b/rpkid/left-right-protocol-samples/pdu.005.xml
diff --git a/scripts/left-right-protocol-samples/pdu.006.xml b/rpkid/left-right-protocol-samples/pdu.006.xml
index 7f51884a..7f51884a 100644
--- a/scripts/left-right-protocol-samples/pdu.006.xml
+++ b/rpkid/left-right-protocol-samples/pdu.006.xml
diff --git a/scripts/left-right-protocol-samples/pdu.007.xml b/rpkid/left-right-protocol-samples/pdu.007.xml
index 19e8d75e..19e8d75e 100644
--- a/scripts/left-right-protocol-samples/pdu.007.xml
+++ b/rpkid/left-right-protocol-samples/pdu.007.xml
diff --git a/scripts/left-right-protocol-samples/pdu.008.xml b/rpkid/left-right-protocol-samples/pdu.008.xml
index ce6ded4a..ce6ded4a 100644
--- a/scripts/left-right-protocol-samples/pdu.008.xml
+++ b/rpkid/left-right-protocol-samples/pdu.008.xml
diff --git a/scripts/left-right-protocol-samples/pdu.009.xml b/rpkid/left-right-protocol-samples/pdu.009.xml
index bc7da935..bc7da935 100644
--- a/scripts/left-right-protocol-samples/pdu.009.xml
+++ b/rpkid/left-right-protocol-samples/pdu.009.xml
diff --git a/scripts/left-right-protocol-samples/pdu.010.xml b/rpkid/left-right-protocol-samples/pdu.010.xml
index 1fd0bb69..1fd0bb69 100644
--- a/scripts/left-right-protocol-samples/pdu.010.xml
+++ b/rpkid/left-right-protocol-samples/pdu.010.xml
diff --git a/scripts/left-right-protocol-samples/pdu.011.xml b/rpkid/left-right-protocol-samples/pdu.011.xml
index 5a061211..5a061211 100644
--- a/scripts/left-right-protocol-samples/pdu.011.xml
+++ b/rpkid/left-right-protocol-samples/pdu.011.xml
diff --git a/scripts/left-right-protocol-samples/pdu.012.xml b/rpkid/left-right-protocol-samples/pdu.012.xml
index cca6c8c7..cca6c8c7 100644
--- a/scripts/left-right-protocol-samples/pdu.012.xml
+++ b/rpkid/left-right-protocol-samples/pdu.012.xml
diff --git a/scripts/left-right-protocol-samples/pdu.013.xml b/rpkid/left-right-protocol-samples/pdu.013.xml
index 3c1c5adc..3c1c5adc 100644
--- a/scripts/left-right-protocol-samples/pdu.013.xml
+++ b/rpkid/left-right-protocol-samples/pdu.013.xml
diff --git a/scripts/left-right-protocol-samples/pdu.014.xml b/rpkid/left-right-protocol-samples/pdu.014.xml
index dbb00bf7..dbb00bf7 100644
--- a/scripts/left-right-protocol-samples/pdu.014.xml
+++ b/rpkid/left-right-protocol-samples/pdu.014.xml
diff --git a/scripts/left-right-protocol-samples/pdu.015.xml b/rpkid/left-right-protocol-samples/pdu.015.xml
index 25137d90..25137d90 100644
--- a/scripts/left-right-protocol-samples/pdu.015.xml
+++ b/rpkid/left-right-protocol-samples/pdu.015.xml
diff --git a/scripts/left-right-protocol-samples/pdu.016.xml b/rpkid/left-right-protocol-samples/pdu.016.xml
index bfa6009a..bfa6009a 100644
--- a/scripts/left-right-protocol-samples/pdu.016.xml
+++ b/rpkid/left-right-protocol-samples/pdu.016.xml
diff --git a/scripts/left-right-protocol-samples/pdu.017.xml b/rpkid/left-right-protocol-samples/pdu.017.xml
index dc882a50..dc882a50 100644
--- a/scripts/left-right-protocol-samples/pdu.017.xml
+++ b/rpkid/left-right-protocol-samples/pdu.017.xml
diff --git a/scripts/left-right-protocol-samples/pdu.018.xml b/rpkid/left-right-protocol-samples/pdu.018.xml
index bfa6009a..bfa6009a 100644
--- a/scripts/left-right-protocol-samples/pdu.018.xml
+++ b/rpkid/left-right-protocol-samples/pdu.018.xml
diff --git a/scripts/left-right-protocol-samples/pdu.019.xml b/rpkid/left-right-protocol-samples/pdu.019.xml
index 62c3e9de..62c3e9de 100644
--- a/scripts/left-right-protocol-samples/pdu.019.xml
+++ b/rpkid/left-right-protocol-samples/pdu.019.xml
diff --git a/scripts/left-right-protocol-samples/pdu.020.xml b/rpkid/left-right-protocol-samples/pdu.020.xml
index 75375dad..75375dad 100644
--- a/scripts/left-right-protocol-samples/pdu.020.xml
+++ b/rpkid/left-right-protocol-samples/pdu.020.xml
diff --git a/scripts/left-right-protocol-samples/pdu.021.xml b/rpkid/left-right-protocol-samples/pdu.021.xml
index 41bc67af..41bc67af 100644
--- a/scripts/left-right-protocol-samples/pdu.021.xml
+++ b/rpkid/left-right-protocol-samples/pdu.021.xml
diff --git a/scripts/left-right-protocol-samples/pdu.022.xml b/rpkid/left-right-protocol-samples/pdu.022.xml
index 8c0a8d7d..8c0a8d7d 100644
--- a/scripts/left-right-protocol-samples/pdu.022.xml
+++ b/rpkid/left-right-protocol-samples/pdu.022.xml
diff --git a/scripts/left-right-protocol-samples/pdu.023.xml b/rpkid/left-right-protocol-samples/pdu.023.xml
index 1f3633c0..1f3633c0 100644
--- a/scripts/left-right-protocol-samples/pdu.023.xml
+++ b/rpkid/left-right-protocol-samples/pdu.023.xml
diff --git a/scripts/left-right-protocol-samples/pdu.024.xml b/rpkid/left-right-protocol-samples/pdu.024.xml
index 902e89ef..902e89ef 100644
--- a/scripts/left-right-protocol-samples/pdu.024.xml
+++ b/rpkid/left-right-protocol-samples/pdu.024.xml
diff --git a/scripts/left-right-protocol-samples/pdu.025.xml b/rpkid/left-right-protocol-samples/pdu.025.xml
index 51e077ba..51e077ba 100644
--- a/scripts/left-right-protocol-samples/pdu.025.xml
+++ b/rpkid/left-right-protocol-samples/pdu.025.xml
diff --git a/scripts/left-right-protocol-samples/pdu.026.xml b/rpkid/left-right-protocol-samples/pdu.026.xml
index 8cddc8d8..8cddc8d8 100644
--- a/scripts/left-right-protocol-samples/pdu.026.xml
+++ b/rpkid/left-right-protocol-samples/pdu.026.xml
diff --git a/scripts/left-right-protocol-samples/pdu.027.xml b/rpkid/left-right-protocol-samples/pdu.027.xml
index 6c417adb..6c417adb 100644
--- a/scripts/left-right-protocol-samples/pdu.027.xml
+++ b/rpkid/left-right-protocol-samples/pdu.027.xml
diff --git a/scripts/left-right-protocol-samples/pdu.028.xml b/rpkid/left-right-protocol-samples/pdu.028.xml
index 1e8f5c95..1e8f5c95 100644
--- a/scripts/left-right-protocol-samples/pdu.028.xml
+++ b/rpkid/left-right-protocol-samples/pdu.028.xml
diff --git a/scripts/left-right-protocol-samples/pdu.029.xml b/rpkid/left-right-protocol-samples/pdu.029.xml
index 2cb9dc8b..2cb9dc8b 100644
--- a/scripts/left-right-protocol-samples/pdu.029.xml
+++ b/rpkid/left-right-protocol-samples/pdu.029.xml
diff --git a/scripts/left-right-protocol-samples/pdu.030.xml b/rpkid/left-right-protocol-samples/pdu.030.xml
index 8e3d4c65..8e3d4c65 100644
--- a/scripts/left-right-protocol-samples/pdu.030.xml
+++ b/rpkid/left-right-protocol-samples/pdu.030.xml
diff --git a/scripts/left-right-protocol-samples/pdu.031.xml b/rpkid/left-right-protocol-samples/pdu.031.xml
index 4871b271..4871b271 100644
--- a/scripts/left-right-protocol-samples/pdu.031.xml
+++ b/rpkid/left-right-protocol-samples/pdu.031.xml
diff --git a/scripts/left-right-protocol-samples/pdu.032.xml b/rpkid/left-right-protocol-samples/pdu.032.xml
index f5b3dbe9..f5b3dbe9 100644
--- a/scripts/left-right-protocol-samples/pdu.032.xml
+++ b/rpkid/left-right-protocol-samples/pdu.032.xml
diff --git a/scripts/left-right-protocol-samples/pdu.033.xml b/rpkid/left-right-protocol-samples/pdu.033.xml
index 37bac784..37bac784 100644
--- a/scripts/left-right-protocol-samples/pdu.033.xml
+++ b/rpkid/left-right-protocol-samples/pdu.033.xml
diff --git a/scripts/left-right-protocol-samples/pdu.034.xml b/rpkid/left-right-protocol-samples/pdu.034.xml
index f3332bb6..f3332bb6 100644
--- a/scripts/left-right-protocol-samples/pdu.034.xml
+++ b/rpkid/left-right-protocol-samples/pdu.034.xml
diff --git a/scripts/left-right-protocol-samples/pdu.035.xml b/rpkid/left-right-protocol-samples/pdu.035.xml
index 1fa3192c..1fa3192c 100644
--- a/scripts/left-right-protocol-samples/pdu.035.xml
+++ b/rpkid/left-right-protocol-samples/pdu.035.xml
diff --git a/scripts/left-right-protocol-samples/pdu.036.xml b/rpkid/left-right-protocol-samples/pdu.036.xml
index 4c2576e1..4c2576e1 100644
--- a/scripts/left-right-protocol-samples/pdu.036.xml
+++ b/rpkid/left-right-protocol-samples/pdu.036.xml
diff --git a/scripts/left-right-protocol-samples/pdu.037.xml b/rpkid/left-right-protocol-samples/pdu.037.xml
index fcfe3199..fcfe3199 100644
--- a/scripts/left-right-protocol-samples/pdu.037.xml
+++ b/rpkid/left-right-protocol-samples/pdu.037.xml
diff --git a/scripts/left-right-protocol-samples/pdu.038.xml b/rpkid/left-right-protocol-samples/pdu.038.xml
index 42d203a4..42d203a4 100644
--- a/scripts/left-right-protocol-samples/pdu.038.xml
+++ b/rpkid/left-right-protocol-samples/pdu.038.xml
diff --git a/scripts/left-right-protocol-samples/pdu.039.xml b/rpkid/left-right-protocol-samples/pdu.039.xml
index dc4fb285..dc4fb285 100644
--- a/scripts/left-right-protocol-samples/pdu.039.xml
+++ b/rpkid/left-right-protocol-samples/pdu.039.xml
diff --git a/scripts/left-right-protocol-samples/pdu.040.xml b/rpkid/left-right-protocol-samples/pdu.040.xml
index 82f28511..82f28511 100644
--- a/scripts/left-right-protocol-samples/pdu.040.xml
+++ b/rpkid/left-right-protocol-samples/pdu.040.xml
diff --git a/scripts/left-right-protocol-samples/pdu.041.xml b/rpkid/left-right-protocol-samples/pdu.041.xml
index 40cccf4d..40cccf4d 100644
--- a/scripts/left-right-protocol-samples/pdu.041.xml
+++ b/rpkid/left-right-protocol-samples/pdu.041.xml
diff --git a/scripts/left-right-protocol-samples/pdu.042.xml b/rpkid/left-right-protocol-samples/pdu.042.xml
index e7398c7f..e7398c7f 100644
--- a/scripts/left-right-protocol-samples/pdu.042.xml
+++ b/rpkid/left-right-protocol-samples/pdu.042.xml
diff --git a/scripts/left-right-protocol-samples/pdu.043.xml b/rpkid/left-right-protocol-samples/pdu.043.xml
index e8f391a5..e8f391a5 100644
--- a/scripts/left-right-protocol-samples/pdu.043.xml
+++ b/rpkid/left-right-protocol-samples/pdu.043.xml
diff --git a/scripts/left-right-protocol-samples/pdu.044.xml b/rpkid/left-right-protocol-samples/pdu.044.xml
index d7506e3d..d7506e3d 100644
--- a/scripts/left-right-protocol-samples/pdu.044.xml
+++ b/rpkid/left-right-protocol-samples/pdu.044.xml
diff --git a/scripts/left-right-protocol-samples/pdu.045.xml b/rpkid/left-right-protocol-samples/pdu.045.xml
index 78866dad..78866dad 100644
--- a/scripts/left-right-protocol-samples/pdu.045.xml
+++ b/rpkid/left-right-protocol-samples/pdu.045.xml
diff --git a/scripts/left-right-protocol-samples/pdu.046.xml b/rpkid/left-right-protocol-samples/pdu.046.xml
index ad7e42a4..ad7e42a4 100644
--- a/scripts/left-right-protocol-samples/pdu.046.xml
+++ b/rpkid/left-right-protocol-samples/pdu.046.xml
diff --git a/scripts/left-right-protocol-samples/pdu.047.xml b/rpkid/left-right-protocol-samples/pdu.047.xml
index 5ca17d89..5ca17d89 100644
--- a/scripts/left-right-protocol-samples/pdu.047.xml
+++ b/rpkid/left-right-protocol-samples/pdu.047.xml
diff --git a/scripts/left-right-protocol-samples/pdu.048.xml b/rpkid/left-right-protocol-samples/pdu.048.xml
index ff92dc33..ff92dc33 100644
--- a/scripts/left-right-protocol-samples/pdu.048.xml
+++ b/rpkid/left-right-protocol-samples/pdu.048.xml
diff --git a/scripts/left-right-protocol-samples/pdu.049.xml b/rpkid/left-right-protocol-samples/pdu.049.xml
index b89ad078..b89ad078 100644
--- a/scripts/left-right-protocol-samples/pdu.049.xml
+++ b/rpkid/left-right-protocol-samples/pdu.049.xml
diff --git a/scripts/left-right-protocol-samples/pdu.050.xml b/rpkid/left-right-protocol-samples/pdu.050.xml
index 92f1ce11..92f1ce11 100644
--- a/scripts/left-right-protocol-samples/pdu.050.xml
+++ b/rpkid/left-right-protocol-samples/pdu.050.xml
diff --git a/scripts/left-right-protocol-samples/pdu.051.xml b/rpkid/left-right-protocol-samples/pdu.051.xml
index afbbc82a..afbbc82a 100644
--- a/scripts/left-right-protocol-samples/pdu.051.xml
+++ b/rpkid/left-right-protocol-samples/pdu.051.xml
diff --git a/scripts/left-right-protocol-samples/pdu.052.xml b/rpkid/left-right-protocol-samples/pdu.052.xml
index 87ab3b1d..87ab3b1d 100644
--- a/scripts/left-right-protocol-samples/pdu.052.xml
+++ b/rpkid/left-right-protocol-samples/pdu.052.xml
diff --git a/scripts/left-right-protocol-samples/pdu.053.xml b/rpkid/left-right-protocol-samples/pdu.053.xml
index a36dc495..a36dc495 100644
--- a/scripts/left-right-protocol-samples/pdu.053.xml
+++ b/rpkid/left-right-protocol-samples/pdu.053.xml
diff --git a/scripts/left-right-protocol-samples/pdu.054.xml b/rpkid/left-right-protocol-samples/pdu.054.xml
index 263b189c..263b189c 100644
--- a/scripts/left-right-protocol-samples/pdu.054.xml
+++ b/rpkid/left-right-protocol-samples/pdu.054.xml
diff --git a/scripts/left-right-protocol-samples/pdu.055.xml b/rpkid/left-right-protocol-samples/pdu.055.xml
index 44a6af0b..44a6af0b 100644
--- a/scripts/left-right-protocol-samples/pdu.055.xml
+++ b/rpkid/left-right-protocol-samples/pdu.055.xml
diff --git a/scripts/left-right-protocol-samples/pdu.056.xml b/rpkid/left-right-protocol-samples/pdu.056.xml
index 554cf859..554cf859 100644
--- a/scripts/left-right-protocol-samples/pdu.056.xml
+++ b/rpkid/left-right-protocol-samples/pdu.056.xml
diff --git a/scripts/left-right-protocol-samples/pdu.057.xml b/rpkid/left-right-protocol-samples/pdu.057.xml
index 3eaa4d01..3eaa4d01 100644
--- a/scripts/left-right-protocol-samples/pdu.057.xml
+++ b/rpkid/left-right-protocol-samples/pdu.057.xml
diff --git a/scripts/left-right-protocol-samples/pdu.058.xml b/rpkid/left-right-protocol-samples/pdu.058.xml
index d4d72210..d4d72210 100644
--- a/scripts/left-right-protocol-samples/pdu.058.xml
+++ b/rpkid/left-right-protocol-samples/pdu.058.xml
diff --git a/scripts/left-right-protocol-samples/pdu.059.xml b/rpkid/left-right-protocol-samples/pdu.059.xml
index 1d352b83..1d352b83 100644
--- a/scripts/left-right-protocol-samples/pdu.059.xml
+++ b/rpkid/left-right-protocol-samples/pdu.059.xml
diff --git a/scripts/left-right-protocol-samples/pdu.060.xml b/rpkid/left-right-protocol-samples/pdu.060.xml
index 5e651518..5e651518 100644
--- a/scripts/left-right-protocol-samples/pdu.060.xml
+++ b/rpkid/left-right-protocol-samples/pdu.060.xml
diff --git a/scripts/left-right-protocol-samples/pdu.061.xml b/rpkid/left-right-protocol-samples/pdu.061.xml
index 05c6ef32..05c6ef32 100644
--- a/scripts/left-right-protocol-samples/pdu.061.xml
+++ b/rpkid/left-right-protocol-samples/pdu.061.xml
diff --git a/scripts/left-right-protocol-samples/pdu.062.xml b/rpkid/left-right-protocol-samples/pdu.062.xml
index 5d218eb1..5d218eb1 100644
--- a/scripts/left-right-protocol-samples/pdu.062.xml
+++ b/rpkid/left-right-protocol-samples/pdu.062.xml
diff --git a/scripts/left-right-protocol-samples/pdu.063.xml b/rpkid/left-right-protocol-samples/pdu.063.xml
index 6b9f5cb2..6b9f5cb2 100644
--- a/scripts/left-right-protocol-samples/pdu.063.xml
+++ b/rpkid/left-right-protocol-samples/pdu.063.xml
diff --git a/scripts/left-right-schema.rnc b/rpkid/left-right-schema.rnc
index 44ae964f..44ae964f 100644
--- a/scripts/left-right-schema.rnc
+++ b/rpkid/left-right-schema.rnc
diff --git a/scripts/left-right-schema.rng b/rpkid/left-right-schema.rng
index e0917fa9..e0917fa9 100644
--- a/scripts/left-right-schema.rng
+++ b/rpkid/left-right-schema.rng
diff --git a/scripts/make-relaxng.py b/rpkid/make-relaxng.py
index 8011893a..8011893a 100644
--- a/scripts/make-relaxng.py
+++ b/rpkid/make-relaxng.py
diff --git a/scripts/resource-cert-samples.py b/rpkid/resource-cert-samples.py
index 987734cc..987734cc 100644
--- a/scripts/resource-cert-samples.py
+++ b/rpkid/resource-cert-samples.py
diff --git a/scripts/resource-cert-samples/.stamp b/rpkid/resource-cert-samples/.stamp
index e69de29b..e69de29b 100644
--- a/scripts/resource-cert-samples/.stamp
+++ b/rpkid/resource-cert-samples/.stamp
diff --git a/scripts/resource-cert-samples/ISP1.cer b/rpkid/resource-cert-samples/ISP1.cer
index db526ea5..db526ea5 100644
--- a/scripts/resource-cert-samples/ISP1.cer
+++ b/rpkid/resource-cert-samples/ISP1.cer
diff --git a/scripts/resource-cert-samples/ISP1.cnf b/rpkid/resource-cert-samples/ISP1.cnf
index b43440bf..b43440bf 100644
--- a/scripts/resource-cert-samples/ISP1.cnf
+++ b/rpkid/resource-cert-samples/ISP1.cnf
diff --git a/scripts/resource-cert-samples/ISP1.key b/rpkid/resource-cert-samples/ISP1.key
index 515efd60..515efd60 100644
--- a/scripts/resource-cert-samples/ISP1.key
+++ b/rpkid/resource-cert-samples/ISP1.key
diff --git a/scripts/resource-cert-samples/ISP1.req b/rpkid/resource-cert-samples/ISP1.req
index eebdcca1..eebdcca1 100644
--- a/scripts/resource-cert-samples/ISP1.req
+++ b/rpkid/resource-cert-samples/ISP1.req
diff --git a/scripts/resource-cert-samples/ISP1/index b/rpkid/resource-cert-samples/ISP1/index
index e69de29b..e69de29b 100644
--- a/scripts/resource-cert-samples/ISP1/index
+++ b/rpkid/resource-cert-samples/ISP1/index
diff --git a/scripts/resource-cert-samples/ISP1/serial b/rpkid/resource-cert-samples/ISP1/serial
index 8a0f05e1..8a0f05e1 100644
--- a/scripts/resource-cert-samples/ISP1/serial
+++ b/rpkid/resource-cert-samples/ISP1/serial
diff --git a/scripts/resource-cert-samples/ISP2.cer b/rpkid/resource-cert-samples/ISP2.cer
index e6fdd880..e6fdd880 100644
--- a/scripts/resource-cert-samples/ISP2.cer
+++ b/rpkid/resource-cert-samples/ISP2.cer
diff --git a/scripts/resource-cert-samples/ISP2.cnf b/rpkid/resource-cert-samples/ISP2.cnf
index befdf77b..befdf77b 100644
--- a/scripts/resource-cert-samples/ISP2.cnf
+++ b/rpkid/resource-cert-samples/ISP2.cnf
diff --git a/scripts/resource-cert-samples/ISP2.key b/rpkid/resource-cert-samples/ISP2.key
index fdff214b..fdff214b 100644
--- a/scripts/resource-cert-samples/ISP2.key
+++ b/rpkid/resource-cert-samples/ISP2.key
diff --git a/scripts/resource-cert-samples/ISP2.req b/rpkid/resource-cert-samples/ISP2.req
index 63ee5838..63ee5838 100644
--- a/scripts/resource-cert-samples/ISP2.req
+++ b/rpkid/resource-cert-samples/ISP2.req
diff --git a/scripts/resource-cert-samples/ISP2/index b/rpkid/resource-cert-samples/ISP2/index
index e69de29b..e69de29b 100644
--- a/scripts/resource-cert-samples/ISP2/index
+++ b/rpkid/resource-cert-samples/ISP2/index
diff --git a/scripts/resource-cert-samples/ISP2/serial b/rpkid/resource-cert-samples/ISP2/serial
index 8a0f05e1..8a0f05e1 100644
--- a/scripts/resource-cert-samples/ISP2/serial
+++ b/rpkid/resource-cert-samples/ISP2/serial
diff --git a/scripts/resource-cert-samples/ISP3.cer b/rpkid/resource-cert-samples/ISP3.cer
index e8e63c2a..e8e63c2a 100644
--- a/scripts/resource-cert-samples/ISP3.cer
+++ b/rpkid/resource-cert-samples/ISP3.cer
diff --git a/scripts/resource-cert-samples/ISP3.cnf b/rpkid/resource-cert-samples/ISP3.cnf
index ded3be5d..ded3be5d 100644
--- a/scripts/resource-cert-samples/ISP3.cnf
+++ b/rpkid/resource-cert-samples/ISP3.cnf
diff --git a/scripts/resource-cert-samples/ISP3.key b/rpkid/resource-cert-samples/ISP3.key
index ad66c7a0..ad66c7a0 100644
--- a/scripts/resource-cert-samples/ISP3.key
+++ b/rpkid/resource-cert-samples/ISP3.key
diff --git a/scripts/resource-cert-samples/ISP3.req b/rpkid/resource-cert-samples/ISP3.req
index 778b5d87..778b5d87 100644
--- a/scripts/resource-cert-samples/ISP3.req
+++ b/rpkid/resource-cert-samples/ISP3.req
diff --git a/scripts/resource-cert-samples/ISP3/index b/rpkid/resource-cert-samples/ISP3/index
index e69de29b..e69de29b 100644
--- a/scripts/resource-cert-samples/ISP3/index
+++ b/rpkid/resource-cert-samples/ISP3/index
diff --git a/scripts/resource-cert-samples/ISP3/serial b/rpkid/resource-cert-samples/ISP3/serial
index 8a0f05e1..8a0f05e1 100644
--- a/scripts/resource-cert-samples/ISP3/serial
+++ b/rpkid/resource-cert-samples/ISP3/serial
diff --git a/scripts/resource-cert-samples/ISP4.cer b/rpkid/resource-cert-samples/ISP4.cer
index b8a5574d..b8a5574d 100644
--- a/scripts/resource-cert-samples/ISP4.cer
+++ b/rpkid/resource-cert-samples/ISP4.cer
diff --git a/scripts/resource-cert-samples/ISP4.cnf b/rpkid/resource-cert-samples/ISP4.cnf
index f9effea4..f9effea4 100644
--- a/scripts/resource-cert-samples/ISP4.cnf
+++ b/rpkid/resource-cert-samples/ISP4.cnf
diff --git a/scripts/resource-cert-samples/ISP4.key b/rpkid/resource-cert-samples/ISP4.key
index 20370dc9..20370dc9 100644
--- a/scripts/resource-cert-samples/ISP4.key
+++ b/rpkid/resource-cert-samples/ISP4.key
diff --git a/scripts/resource-cert-samples/ISP4.req b/rpkid/resource-cert-samples/ISP4.req
index 5c9d865c..5c9d865c 100644
--- a/scripts/resource-cert-samples/ISP4.req
+++ b/rpkid/resource-cert-samples/ISP4.req
diff --git a/scripts/resource-cert-samples/ISP4/index b/rpkid/resource-cert-samples/ISP4/index
index e69de29b..e69de29b 100644
--- a/scripts/resource-cert-samples/ISP4/index
+++ b/rpkid/resource-cert-samples/ISP4/index
diff --git a/scripts/resource-cert-samples/ISP4/serial b/rpkid/resource-cert-samples/ISP4/serial
index 8a0f05e1..8a0f05e1 100644
--- a/scripts/resource-cert-samples/ISP4/serial
+++ b/rpkid/resource-cert-samples/ISP4/serial
diff --git a/scripts/resource-cert-samples/ISP5a.cer b/rpkid/resource-cert-samples/ISP5a.cer
index 787aacd7..787aacd7 100644
--- a/scripts/resource-cert-samples/ISP5a.cer
+++ b/rpkid/resource-cert-samples/ISP5a.cer
diff --git a/scripts/resource-cert-samples/ISP5a.cnf b/rpkid/resource-cert-samples/ISP5a.cnf
index fa470452..fa470452 100644
--- a/scripts/resource-cert-samples/ISP5a.cnf
+++ b/rpkid/resource-cert-samples/ISP5a.cnf
diff --git a/scripts/resource-cert-samples/ISP5a.key b/rpkid/resource-cert-samples/ISP5a.key
index 0bec780e..0bec780e 100644
--- a/scripts/resource-cert-samples/ISP5a.key
+++ b/rpkid/resource-cert-samples/ISP5a.key
diff --git a/scripts/resource-cert-samples/ISP5a.req b/rpkid/resource-cert-samples/ISP5a.req
index 66bc9022..66bc9022 100644
--- a/scripts/resource-cert-samples/ISP5a.req
+++ b/rpkid/resource-cert-samples/ISP5a.req
diff --git a/scripts/resource-cert-samples/ISP5a/index b/rpkid/resource-cert-samples/ISP5a/index
index e69de29b..e69de29b 100644
--- a/scripts/resource-cert-samples/ISP5a/index
+++ b/rpkid/resource-cert-samples/ISP5a/index
diff --git a/scripts/resource-cert-samples/ISP5a/serial b/rpkid/resource-cert-samples/ISP5a/serial
index 8a0f05e1..8a0f05e1 100644
--- a/scripts/resource-cert-samples/ISP5a/serial
+++ b/rpkid/resource-cert-samples/ISP5a/serial
diff --git a/scripts/resource-cert-samples/ISP5b.cer b/rpkid/resource-cert-samples/ISP5b.cer
index 8f133ac8..8f133ac8 100644
--- a/scripts/resource-cert-samples/ISP5b.cer
+++ b/rpkid/resource-cert-samples/ISP5b.cer
diff --git a/scripts/resource-cert-samples/ISP5b.cnf b/rpkid/resource-cert-samples/ISP5b.cnf
index c7127044..c7127044 100644
--- a/scripts/resource-cert-samples/ISP5b.cnf
+++ b/rpkid/resource-cert-samples/ISP5b.cnf
diff --git a/scripts/resource-cert-samples/ISP5b.key b/rpkid/resource-cert-samples/ISP5b.key
index 60313862..60313862 100644
--- a/scripts/resource-cert-samples/ISP5b.key
+++ b/rpkid/resource-cert-samples/ISP5b.key
diff --git a/scripts/resource-cert-samples/ISP5b.req b/rpkid/resource-cert-samples/ISP5b.req
index 7ec17a74..7ec17a74 100644
--- a/scripts/resource-cert-samples/ISP5b.req
+++ b/rpkid/resource-cert-samples/ISP5b.req
diff --git a/scripts/resource-cert-samples/ISP5b/index b/rpkid/resource-cert-samples/ISP5b/index
index e69de29b..e69de29b 100644
--- a/scripts/resource-cert-samples/ISP5b/index
+++ b/rpkid/resource-cert-samples/ISP5b/index
diff --git a/scripts/resource-cert-samples/ISP5b/serial b/rpkid/resource-cert-samples/ISP5b/serial
index 8a0f05e1..8a0f05e1 100644
--- a/scripts/resource-cert-samples/ISP5b/serial
+++ b/rpkid/resource-cert-samples/ISP5b/serial
diff --git a/scripts/resource-cert-samples/ISP5c.cer b/rpkid/resource-cert-samples/ISP5c.cer
index 969f45e5..969f45e5 100644
--- a/scripts/resource-cert-samples/ISP5c.cer
+++ b/rpkid/resource-cert-samples/ISP5c.cer
diff --git a/scripts/resource-cert-samples/ISP5c.cnf b/rpkid/resource-cert-samples/ISP5c.cnf
index cc689a77..cc689a77 100644
--- a/scripts/resource-cert-samples/ISP5c.cnf
+++ b/rpkid/resource-cert-samples/ISP5c.cnf
diff --git a/scripts/resource-cert-samples/ISP5c.key b/rpkid/resource-cert-samples/ISP5c.key
index dc7595d0..dc7595d0 100644
--- a/scripts/resource-cert-samples/ISP5c.key
+++ b/rpkid/resource-cert-samples/ISP5c.key
diff --git a/scripts/resource-cert-samples/ISP5c.req b/rpkid/resource-cert-samples/ISP5c.req
index fe5a3802..fe5a3802 100644
--- a/scripts/resource-cert-samples/ISP5c.req
+++ b/rpkid/resource-cert-samples/ISP5c.req
diff --git a/scripts/resource-cert-samples/ISP5c/index b/rpkid/resource-cert-samples/ISP5c/index
index e69de29b..e69de29b 100644
--- a/scripts/resource-cert-samples/ISP5c/index
+++ b/rpkid/resource-cert-samples/ISP5c/index
diff --git a/scripts/resource-cert-samples/ISP5c/serial b/rpkid/resource-cert-samples/ISP5c/serial
index 8a0f05e1..8a0f05e1 100644
--- a/scripts/resource-cert-samples/ISP5c/serial
+++ b/rpkid/resource-cert-samples/ISP5c/serial
diff --git a/scripts/resource-cert-samples/LIR1.cer b/rpkid/resource-cert-samples/LIR1.cer
index 348c6275..348c6275 100644
--- a/scripts/resource-cert-samples/LIR1.cer
+++ b/rpkid/resource-cert-samples/LIR1.cer
diff --git a/scripts/resource-cert-samples/LIR1.cnf b/rpkid/resource-cert-samples/LIR1.cnf
index 7e2fa61f..7e2fa61f 100644
--- a/scripts/resource-cert-samples/LIR1.cnf
+++ b/rpkid/resource-cert-samples/LIR1.cnf
diff --git a/scripts/resource-cert-samples/LIR1.key b/rpkid/resource-cert-samples/LIR1.key
index 0f79c031..0f79c031 100644
--- a/scripts/resource-cert-samples/LIR1.key
+++ b/rpkid/resource-cert-samples/LIR1.key
diff --git a/scripts/resource-cert-samples/LIR1.req b/rpkid/resource-cert-samples/LIR1.req
index d1390df5..d1390df5 100644
--- a/scripts/resource-cert-samples/LIR1.req
+++ b/rpkid/resource-cert-samples/LIR1.req
diff --git a/scripts/resource-cert-samples/LIR1/01.pem b/rpkid/resource-cert-samples/LIR1/01.pem
index 29733e89..29733e89 100644
--- a/scripts/resource-cert-samples/LIR1/01.pem
+++ b/rpkid/resource-cert-samples/LIR1/01.pem
diff --git a/scripts/resource-cert-samples/LIR1/02.pem b/rpkid/resource-cert-samples/LIR1/02.pem
index 0bcefb6f..0bcefb6f 100644
--- a/scripts/resource-cert-samples/LIR1/02.pem
+++ b/rpkid/resource-cert-samples/LIR1/02.pem
diff --git a/scripts/resource-cert-samples/LIR1/03.pem b/rpkid/resource-cert-samples/LIR1/03.pem
index e6b6ac76..e6b6ac76 100644
--- a/scripts/resource-cert-samples/LIR1/03.pem
+++ b/rpkid/resource-cert-samples/LIR1/03.pem
diff --git a/scripts/resource-cert-samples/LIR1/04.pem b/rpkid/resource-cert-samples/LIR1/04.pem
index 193985fc..193985fc 100644
--- a/scripts/resource-cert-samples/LIR1/04.pem
+++ b/rpkid/resource-cert-samples/LIR1/04.pem
diff --git a/scripts/resource-cert-samples/LIR1/05.pem b/rpkid/resource-cert-samples/LIR1/05.pem
index d39a4c28..d39a4c28 100644
--- a/scripts/resource-cert-samples/LIR1/05.pem
+++ b/rpkid/resource-cert-samples/LIR1/05.pem
diff --git a/scripts/resource-cert-samples/LIR1/06.pem b/rpkid/resource-cert-samples/LIR1/06.pem
index c03635c3..c03635c3 100644
--- a/scripts/resource-cert-samples/LIR1/06.pem
+++ b/rpkid/resource-cert-samples/LIR1/06.pem
diff --git a/scripts/resource-cert-samples/LIR1/07.pem b/rpkid/resource-cert-samples/LIR1/07.pem
index a8742d9b..a8742d9b 100644
--- a/scripts/resource-cert-samples/LIR1/07.pem
+++ b/rpkid/resource-cert-samples/LIR1/07.pem
diff --git a/scripts/resource-cert-samples/LIR1/08.pem b/rpkid/resource-cert-samples/LIR1/08.pem
index 7f2b5154..7f2b5154 100644
--- a/scripts/resource-cert-samples/LIR1/08.pem
+++ b/rpkid/resource-cert-samples/LIR1/08.pem
diff --git a/scripts/resource-cert-samples/LIR1/09.pem b/rpkid/resource-cert-samples/LIR1/09.pem
index 0a5c3837..0a5c3837 100644
--- a/scripts/resource-cert-samples/LIR1/09.pem
+++ b/rpkid/resource-cert-samples/LIR1/09.pem
diff --git a/scripts/resource-cert-samples/LIR1/0A.pem b/rpkid/resource-cert-samples/LIR1/0A.pem
index 86da6423..86da6423 100644
--- a/scripts/resource-cert-samples/LIR1/0A.pem
+++ b/rpkid/resource-cert-samples/LIR1/0A.pem
diff --git a/scripts/resource-cert-samples/LIR1/0B.pem b/rpkid/resource-cert-samples/LIR1/0B.pem
index f078c91f..f078c91f 100644
--- a/scripts/resource-cert-samples/LIR1/0B.pem
+++ b/rpkid/resource-cert-samples/LIR1/0B.pem
diff --git a/scripts/resource-cert-samples/LIR1/0C.pem b/rpkid/resource-cert-samples/LIR1/0C.pem
index f10e0062..f10e0062 100644
--- a/scripts/resource-cert-samples/LIR1/0C.pem
+++ b/rpkid/resource-cert-samples/LIR1/0C.pem
diff --git a/scripts/resource-cert-samples/LIR1/0D.pem b/rpkid/resource-cert-samples/LIR1/0D.pem
index cc8d1185..cc8d1185 100644
--- a/scripts/resource-cert-samples/LIR1/0D.pem
+++ b/rpkid/resource-cert-samples/LIR1/0D.pem
diff --git a/scripts/resource-cert-samples/LIR1/0E.pem b/rpkid/resource-cert-samples/LIR1/0E.pem
index 08cab1ec..08cab1ec 100644
--- a/scripts/resource-cert-samples/LIR1/0E.pem
+++ b/rpkid/resource-cert-samples/LIR1/0E.pem
diff --git a/scripts/resource-cert-samples/LIR1/0F.pem b/rpkid/resource-cert-samples/LIR1/0F.pem
index 8fc7b413..8fc7b413 100644
--- a/scripts/resource-cert-samples/LIR1/0F.pem
+++ b/rpkid/resource-cert-samples/LIR1/0F.pem
diff --git a/scripts/resource-cert-samples/LIR1/10.pem b/rpkid/resource-cert-samples/LIR1/10.pem
index 6c572f7c..6c572f7c 100644
--- a/scripts/resource-cert-samples/LIR1/10.pem
+++ b/rpkid/resource-cert-samples/LIR1/10.pem
diff --git a/scripts/resource-cert-samples/LIR1/11.pem b/rpkid/resource-cert-samples/LIR1/11.pem
index b9659189..b9659189 100644
--- a/scripts/resource-cert-samples/LIR1/11.pem
+++ b/rpkid/resource-cert-samples/LIR1/11.pem
diff --git a/scripts/resource-cert-samples/LIR1/12.pem b/rpkid/resource-cert-samples/LIR1/12.pem
index 88877bb3..88877bb3 100644
--- a/scripts/resource-cert-samples/LIR1/12.pem
+++ b/rpkid/resource-cert-samples/LIR1/12.pem
diff --git a/scripts/resource-cert-samples/LIR1/13.pem b/rpkid/resource-cert-samples/LIR1/13.pem
index ca17b5f4..ca17b5f4 100644
--- a/scripts/resource-cert-samples/LIR1/13.pem
+++ b/rpkid/resource-cert-samples/LIR1/13.pem
diff --git a/scripts/resource-cert-samples/LIR1/14.pem b/rpkid/resource-cert-samples/LIR1/14.pem
index 9121acc8..9121acc8 100644
--- a/scripts/resource-cert-samples/LIR1/14.pem
+++ b/rpkid/resource-cert-samples/LIR1/14.pem
diff --git a/scripts/resource-cert-samples/LIR1/15.pem b/rpkid/resource-cert-samples/LIR1/15.pem
index 4ff96ef1..4ff96ef1 100644
--- a/scripts/resource-cert-samples/LIR1/15.pem
+++ b/rpkid/resource-cert-samples/LIR1/15.pem
diff --git a/scripts/resource-cert-samples/LIR1/16.pem b/rpkid/resource-cert-samples/LIR1/16.pem
index beb187b4..beb187b4 100644
--- a/scripts/resource-cert-samples/LIR1/16.pem
+++ b/rpkid/resource-cert-samples/LIR1/16.pem
diff --git a/scripts/resource-cert-samples/LIR1/17.pem b/rpkid/resource-cert-samples/LIR1/17.pem
index 1d6affa1..1d6affa1 100644
--- a/scripts/resource-cert-samples/LIR1/17.pem
+++ b/rpkid/resource-cert-samples/LIR1/17.pem
diff --git a/scripts/resource-cert-samples/LIR1/18.pem b/rpkid/resource-cert-samples/LIR1/18.pem
index c74d669a..c74d669a 100644
--- a/scripts/resource-cert-samples/LIR1/18.pem
+++ b/rpkid/resource-cert-samples/LIR1/18.pem
diff --git a/scripts/resource-cert-samples/LIR1/19.pem b/rpkid/resource-cert-samples/LIR1/19.pem
index e6fdd880..e6fdd880 100644
--- a/scripts/resource-cert-samples/LIR1/19.pem
+++ b/rpkid/resource-cert-samples/LIR1/19.pem
diff --git a/scripts/resource-cert-samples/LIR1/1A.pem b/rpkid/resource-cert-samples/LIR1/1A.pem
index db526ea5..db526ea5 100644
--- a/scripts/resource-cert-samples/LIR1/1A.pem
+++ b/rpkid/resource-cert-samples/LIR1/1A.pem
diff --git a/scripts/resource-cert-samples/LIR1/index b/rpkid/resource-cert-samples/LIR1/index
index 69a21e9d..69a21e9d 100644
--- a/scripts/resource-cert-samples/LIR1/index
+++ b/rpkid/resource-cert-samples/LIR1/index
diff --git a/scripts/resource-cert-samples/LIR1/index.attr b/rpkid/resource-cert-samples/LIR1/index.attr
index 3a7e39e6..3a7e39e6 100644
--- a/scripts/resource-cert-samples/LIR1/index.attr
+++ b/rpkid/resource-cert-samples/LIR1/index.attr
diff --git a/scripts/resource-cert-samples/LIR1/index.attr.old b/rpkid/resource-cert-samples/LIR1/index.attr.old
index 3a7e39e6..3a7e39e6 100644
--- a/scripts/resource-cert-samples/LIR1/index.attr.old
+++ b/rpkid/resource-cert-samples/LIR1/index.attr.old
diff --git a/scripts/resource-cert-samples/LIR1/index.old b/rpkid/resource-cert-samples/LIR1/index.old
index c484ba08..c484ba08 100644
--- a/scripts/resource-cert-samples/LIR1/index.old
+++ b/rpkid/resource-cert-samples/LIR1/index.old
diff --git a/scripts/resource-cert-samples/LIR1/serial b/rpkid/resource-cert-samples/LIR1/serial
index 8787ed81..8787ed81 100644
--- a/scripts/resource-cert-samples/LIR1/serial
+++ b/rpkid/resource-cert-samples/LIR1/serial
diff --git a/scripts/resource-cert-samples/LIR1/serial.old b/rpkid/resource-cert-samples/LIR1/serial.old
index 268de3f3..268de3f3 100644
--- a/scripts/resource-cert-samples/LIR1/serial.old
+++ b/rpkid/resource-cert-samples/LIR1/serial.old
diff --git a/scripts/resource-cert-samples/LIR2.cer b/rpkid/resource-cert-samples/LIR2.cer
index dcc97dd1..dcc97dd1 100644
--- a/scripts/resource-cert-samples/LIR2.cer
+++ b/rpkid/resource-cert-samples/LIR2.cer
diff --git a/scripts/resource-cert-samples/LIR2.cnf b/rpkid/resource-cert-samples/LIR2.cnf
index 7e691e6d..7e691e6d 100644
--- a/scripts/resource-cert-samples/LIR2.cnf
+++ b/rpkid/resource-cert-samples/LIR2.cnf
diff --git a/scripts/resource-cert-samples/LIR2.key b/rpkid/resource-cert-samples/LIR2.key
index 4259796f..4259796f 100644
--- a/scripts/resource-cert-samples/LIR2.key
+++ b/rpkid/resource-cert-samples/LIR2.key
diff --git a/scripts/resource-cert-samples/LIR2.req b/rpkid/resource-cert-samples/LIR2.req
index 96d673be..96d673be 100644
--- a/scripts/resource-cert-samples/LIR2.req
+++ b/rpkid/resource-cert-samples/LIR2.req
diff --git a/scripts/resource-cert-samples/LIR2/01.pem b/rpkid/resource-cert-samples/LIR2/01.pem
index 832d72fb..832d72fb 100644
--- a/scripts/resource-cert-samples/LIR2/01.pem
+++ b/rpkid/resource-cert-samples/LIR2/01.pem
diff --git a/scripts/resource-cert-samples/LIR2/02.pem b/rpkid/resource-cert-samples/LIR2/02.pem
index 055a369b..055a369b 100644
--- a/scripts/resource-cert-samples/LIR2/02.pem
+++ b/rpkid/resource-cert-samples/LIR2/02.pem
diff --git a/scripts/resource-cert-samples/LIR2/03.pem b/rpkid/resource-cert-samples/LIR2/03.pem
index 380a3354..380a3354 100644
--- a/scripts/resource-cert-samples/LIR2/03.pem
+++ b/rpkid/resource-cert-samples/LIR2/03.pem
diff --git a/scripts/resource-cert-samples/LIR2/04.pem b/rpkid/resource-cert-samples/LIR2/04.pem
index 55678af1..55678af1 100644
--- a/scripts/resource-cert-samples/LIR2/04.pem
+++ b/rpkid/resource-cert-samples/LIR2/04.pem
diff --git a/scripts/resource-cert-samples/LIR2/05.pem b/rpkid/resource-cert-samples/LIR2/05.pem
index 21fc68de..21fc68de 100644
--- a/scripts/resource-cert-samples/LIR2/05.pem
+++ b/rpkid/resource-cert-samples/LIR2/05.pem
diff --git a/scripts/resource-cert-samples/LIR2/06.pem b/rpkid/resource-cert-samples/LIR2/06.pem
index cdd0108c..cdd0108c 100644
--- a/scripts/resource-cert-samples/LIR2/06.pem
+++ b/rpkid/resource-cert-samples/LIR2/06.pem
diff --git a/scripts/resource-cert-samples/LIR2/07.pem b/rpkid/resource-cert-samples/LIR2/07.pem
index 00cf79e5..00cf79e5 100644
--- a/scripts/resource-cert-samples/LIR2/07.pem
+++ b/rpkid/resource-cert-samples/LIR2/07.pem
diff --git a/scripts/resource-cert-samples/LIR2/08.pem b/rpkid/resource-cert-samples/LIR2/08.pem
index 0d2eebd5..0d2eebd5 100644
--- a/scripts/resource-cert-samples/LIR2/08.pem
+++ b/rpkid/resource-cert-samples/LIR2/08.pem
diff --git a/scripts/resource-cert-samples/LIR2/09.pem b/rpkid/resource-cert-samples/LIR2/09.pem
index b117c94d..b117c94d 100644
--- a/scripts/resource-cert-samples/LIR2/09.pem
+++ b/rpkid/resource-cert-samples/LIR2/09.pem
diff --git a/scripts/resource-cert-samples/LIR2/0A.pem b/rpkid/resource-cert-samples/LIR2/0A.pem
index c8f4890e..c8f4890e 100644
--- a/scripts/resource-cert-samples/LIR2/0A.pem
+++ b/rpkid/resource-cert-samples/LIR2/0A.pem
diff --git a/scripts/resource-cert-samples/LIR2/0B.pem b/rpkid/resource-cert-samples/LIR2/0B.pem
index d4720f0d..d4720f0d 100644
--- a/scripts/resource-cert-samples/LIR2/0B.pem
+++ b/rpkid/resource-cert-samples/LIR2/0B.pem
diff --git a/scripts/resource-cert-samples/LIR2/0C.pem b/rpkid/resource-cert-samples/LIR2/0C.pem
index 42755368..42755368 100644
--- a/scripts/resource-cert-samples/LIR2/0C.pem
+++ b/rpkid/resource-cert-samples/LIR2/0C.pem
diff --git a/scripts/resource-cert-samples/LIR2/0D.pem b/rpkid/resource-cert-samples/LIR2/0D.pem
index a3e8fbab..a3e8fbab 100644
--- a/scripts/resource-cert-samples/LIR2/0D.pem
+++ b/rpkid/resource-cert-samples/LIR2/0D.pem
diff --git a/scripts/resource-cert-samples/LIR2/0E.pem b/rpkid/resource-cert-samples/LIR2/0E.pem
index 05f06437..05f06437 100644
--- a/scripts/resource-cert-samples/LIR2/0E.pem
+++ b/rpkid/resource-cert-samples/LIR2/0E.pem
diff --git a/scripts/resource-cert-samples/LIR2/0F.pem b/rpkid/resource-cert-samples/LIR2/0F.pem
index 0509dec8..0509dec8 100644
--- a/scripts/resource-cert-samples/LIR2/0F.pem
+++ b/rpkid/resource-cert-samples/LIR2/0F.pem
diff --git a/scripts/resource-cert-samples/LIR2/10.pem b/rpkid/resource-cert-samples/LIR2/10.pem
index a1ca8f31..a1ca8f31 100644
--- a/scripts/resource-cert-samples/LIR2/10.pem
+++ b/rpkid/resource-cert-samples/LIR2/10.pem
diff --git a/scripts/resource-cert-samples/LIR2/11.pem b/rpkid/resource-cert-samples/LIR2/11.pem
index 44471417..44471417 100644
--- a/scripts/resource-cert-samples/LIR2/11.pem
+++ b/rpkid/resource-cert-samples/LIR2/11.pem
diff --git a/scripts/resource-cert-samples/LIR2/12.pem b/rpkid/resource-cert-samples/LIR2/12.pem
index 91e549e7..91e549e7 100644
--- a/scripts/resource-cert-samples/LIR2/12.pem
+++ b/rpkid/resource-cert-samples/LIR2/12.pem
diff --git a/scripts/resource-cert-samples/LIR2/13.pem b/rpkid/resource-cert-samples/LIR2/13.pem
index 415517d5..415517d5 100644
--- a/scripts/resource-cert-samples/LIR2/13.pem
+++ b/rpkid/resource-cert-samples/LIR2/13.pem
diff --git a/scripts/resource-cert-samples/LIR2/14.pem b/rpkid/resource-cert-samples/LIR2/14.pem
index c31add0d..c31add0d 100644
--- a/scripts/resource-cert-samples/LIR2/14.pem
+++ b/rpkid/resource-cert-samples/LIR2/14.pem
diff --git a/scripts/resource-cert-samples/LIR2/15.pem b/rpkid/resource-cert-samples/LIR2/15.pem
index 8b2c9de2..8b2c9de2 100644
--- a/scripts/resource-cert-samples/LIR2/15.pem
+++ b/rpkid/resource-cert-samples/LIR2/15.pem
diff --git a/scripts/resource-cert-samples/LIR2/16.pem b/rpkid/resource-cert-samples/LIR2/16.pem
index 45d8df97..45d8df97 100644
--- a/scripts/resource-cert-samples/LIR2/16.pem
+++ b/rpkid/resource-cert-samples/LIR2/16.pem
diff --git a/scripts/resource-cert-samples/LIR2/17.pem b/rpkid/resource-cert-samples/LIR2/17.pem
index 881741df..881741df 100644
--- a/scripts/resource-cert-samples/LIR2/17.pem
+++ b/rpkid/resource-cert-samples/LIR2/17.pem
diff --git a/scripts/resource-cert-samples/LIR2/18.pem b/rpkid/resource-cert-samples/LIR2/18.pem
index d3d0cfac..d3d0cfac 100644
--- a/scripts/resource-cert-samples/LIR2/18.pem
+++ b/rpkid/resource-cert-samples/LIR2/18.pem
diff --git a/scripts/resource-cert-samples/LIR2/19.pem b/rpkid/resource-cert-samples/LIR2/19.pem
index b8a5574d..b8a5574d 100644
--- a/scripts/resource-cert-samples/LIR2/19.pem
+++ b/rpkid/resource-cert-samples/LIR2/19.pem
diff --git a/scripts/resource-cert-samples/LIR2/1A.pem b/rpkid/resource-cert-samples/LIR2/1A.pem
index e8e63c2a..e8e63c2a 100644
--- a/scripts/resource-cert-samples/LIR2/1A.pem
+++ b/rpkid/resource-cert-samples/LIR2/1A.pem
diff --git a/scripts/resource-cert-samples/LIR2/index b/rpkid/resource-cert-samples/LIR2/index
index 50320ebe..50320ebe 100644
--- a/scripts/resource-cert-samples/LIR2/index
+++ b/rpkid/resource-cert-samples/LIR2/index
diff --git a/scripts/resource-cert-samples/LIR2/index.attr b/rpkid/resource-cert-samples/LIR2/index.attr
index 3a7e39e6..3a7e39e6 100644
--- a/scripts/resource-cert-samples/LIR2/index.attr
+++ b/rpkid/resource-cert-samples/LIR2/index.attr
diff --git a/scripts/resource-cert-samples/LIR2/index.attr.old b/rpkid/resource-cert-samples/LIR2/index.attr.old
index 3a7e39e6..3a7e39e6 100644
--- a/scripts/resource-cert-samples/LIR2/index.attr.old
+++ b/rpkid/resource-cert-samples/LIR2/index.attr.old
diff --git a/scripts/resource-cert-samples/LIR2/index.old b/rpkid/resource-cert-samples/LIR2/index.old
index 219f32cb..219f32cb 100644
--- a/scripts/resource-cert-samples/LIR2/index.old
+++ b/rpkid/resource-cert-samples/LIR2/index.old
diff --git a/scripts/resource-cert-samples/LIR2/serial b/rpkid/resource-cert-samples/LIR2/serial
index 8787ed81..8787ed81 100644
--- a/scripts/resource-cert-samples/LIR2/serial
+++ b/rpkid/resource-cert-samples/LIR2/serial
diff --git a/scripts/resource-cert-samples/LIR2/serial.old b/rpkid/resource-cert-samples/LIR2/serial.old
index 268de3f3..268de3f3 100644
--- a/scripts/resource-cert-samples/LIR2/serial.old
+++ b/rpkid/resource-cert-samples/LIR2/serial.old
diff --git a/scripts/resource-cert-samples/LIR3.cer b/rpkid/resource-cert-samples/LIR3.cer
index c466f22e..c466f22e 100644
--- a/scripts/resource-cert-samples/LIR3.cer
+++ b/rpkid/resource-cert-samples/LIR3.cer
diff --git a/scripts/resource-cert-samples/LIR3.cnf b/rpkid/resource-cert-samples/LIR3.cnf
index 0f65ce12..0f65ce12 100644
--- a/scripts/resource-cert-samples/LIR3.cnf
+++ b/rpkid/resource-cert-samples/LIR3.cnf
diff --git a/scripts/resource-cert-samples/LIR3.key b/rpkid/resource-cert-samples/LIR3.key
index d4d89f21..d4d89f21 100644
--- a/scripts/resource-cert-samples/LIR3.key
+++ b/rpkid/resource-cert-samples/LIR3.key
diff --git a/scripts/resource-cert-samples/LIR3.req b/rpkid/resource-cert-samples/LIR3.req
index e22e9dd3..e22e9dd3 100644
--- a/scripts/resource-cert-samples/LIR3.req
+++ b/rpkid/resource-cert-samples/LIR3.req
diff --git a/scripts/resource-cert-samples/LIR3/01.pem b/rpkid/resource-cert-samples/LIR3/01.pem
index 5f7a0a59..5f7a0a59 100644
--- a/scripts/resource-cert-samples/LIR3/01.pem
+++ b/rpkid/resource-cert-samples/LIR3/01.pem
diff --git a/scripts/resource-cert-samples/LIR3/02.pem b/rpkid/resource-cert-samples/LIR3/02.pem
index 47299c75..47299c75 100644
--- a/scripts/resource-cert-samples/LIR3/02.pem
+++ b/rpkid/resource-cert-samples/LIR3/02.pem
diff --git a/scripts/resource-cert-samples/LIR3/03.pem b/rpkid/resource-cert-samples/LIR3/03.pem
index 50780320..50780320 100644
--- a/scripts/resource-cert-samples/LIR3/03.pem
+++ b/rpkid/resource-cert-samples/LIR3/03.pem
diff --git a/scripts/resource-cert-samples/LIR3/04.pem b/rpkid/resource-cert-samples/LIR3/04.pem
index 2f339d8c..2f339d8c 100644
--- a/scripts/resource-cert-samples/LIR3/04.pem
+++ b/rpkid/resource-cert-samples/LIR3/04.pem
diff --git a/scripts/resource-cert-samples/LIR3/05.pem b/rpkid/resource-cert-samples/LIR3/05.pem
index b3efd764..b3efd764 100644
--- a/scripts/resource-cert-samples/LIR3/05.pem
+++ b/rpkid/resource-cert-samples/LIR3/05.pem
diff --git a/scripts/resource-cert-samples/LIR3/06.pem b/rpkid/resource-cert-samples/LIR3/06.pem
index cbf5d122..cbf5d122 100644
--- a/scripts/resource-cert-samples/LIR3/06.pem
+++ b/rpkid/resource-cert-samples/LIR3/06.pem
diff --git a/scripts/resource-cert-samples/LIR3/07.pem b/rpkid/resource-cert-samples/LIR3/07.pem
index 96c90b92..96c90b92 100644
--- a/scripts/resource-cert-samples/LIR3/07.pem
+++ b/rpkid/resource-cert-samples/LIR3/07.pem
diff --git a/scripts/resource-cert-samples/LIR3/08.pem b/rpkid/resource-cert-samples/LIR3/08.pem
index eda14481..eda14481 100644
--- a/scripts/resource-cert-samples/LIR3/08.pem
+++ b/rpkid/resource-cert-samples/LIR3/08.pem
diff --git a/scripts/resource-cert-samples/LIR3/09.pem b/rpkid/resource-cert-samples/LIR3/09.pem
index 280892fd..280892fd 100644
--- a/scripts/resource-cert-samples/LIR3/09.pem
+++ b/rpkid/resource-cert-samples/LIR3/09.pem
diff --git a/scripts/resource-cert-samples/LIR3/0A.pem b/rpkid/resource-cert-samples/LIR3/0A.pem
index e34e0d82..e34e0d82 100644
--- a/scripts/resource-cert-samples/LIR3/0A.pem
+++ b/rpkid/resource-cert-samples/LIR3/0A.pem
diff --git a/scripts/resource-cert-samples/LIR3/0B.pem b/rpkid/resource-cert-samples/LIR3/0B.pem
index 78d2f693..78d2f693 100644
--- a/scripts/resource-cert-samples/LIR3/0B.pem
+++ b/rpkid/resource-cert-samples/LIR3/0B.pem
diff --git a/scripts/resource-cert-samples/LIR3/0C.pem b/rpkid/resource-cert-samples/LIR3/0C.pem
index e3a801b4..e3a801b4 100644
--- a/scripts/resource-cert-samples/LIR3/0C.pem
+++ b/rpkid/resource-cert-samples/LIR3/0C.pem
diff --git a/scripts/resource-cert-samples/LIR3/0D.pem b/rpkid/resource-cert-samples/LIR3/0D.pem
index 6634de32..6634de32 100644
--- a/scripts/resource-cert-samples/LIR3/0D.pem
+++ b/rpkid/resource-cert-samples/LIR3/0D.pem
diff --git a/scripts/resource-cert-samples/LIR3/0E.pem b/rpkid/resource-cert-samples/LIR3/0E.pem
index a6a893b1..a6a893b1 100644
--- a/scripts/resource-cert-samples/LIR3/0E.pem
+++ b/rpkid/resource-cert-samples/LIR3/0E.pem
diff --git a/scripts/resource-cert-samples/LIR3/0F.pem b/rpkid/resource-cert-samples/LIR3/0F.pem
index cca0bb04..cca0bb04 100644
--- a/scripts/resource-cert-samples/LIR3/0F.pem
+++ b/rpkid/resource-cert-samples/LIR3/0F.pem
diff --git a/scripts/resource-cert-samples/LIR3/10.pem b/rpkid/resource-cert-samples/LIR3/10.pem
index 16656abb..16656abb 100644
--- a/scripts/resource-cert-samples/LIR3/10.pem
+++ b/rpkid/resource-cert-samples/LIR3/10.pem
diff --git a/scripts/resource-cert-samples/LIR3/11.pem b/rpkid/resource-cert-samples/LIR3/11.pem
index 7342b3c4..7342b3c4 100644
--- a/scripts/resource-cert-samples/LIR3/11.pem
+++ b/rpkid/resource-cert-samples/LIR3/11.pem
diff --git a/scripts/resource-cert-samples/LIR3/12.pem b/rpkid/resource-cert-samples/LIR3/12.pem
index 2ca7eef4..2ca7eef4 100644
--- a/scripts/resource-cert-samples/LIR3/12.pem
+++ b/rpkid/resource-cert-samples/LIR3/12.pem
diff --git a/scripts/resource-cert-samples/LIR3/13.pem b/rpkid/resource-cert-samples/LIR3/13.pem
index 3fea16ec..3fea16ec 100644
--- a/scripts/resource-cert-samples/LIR3/13.pem
+++ b/rpkid/resource-cert-samples/LIR3/13.pem
diff --git a/scripts/resource-cert-samples/LIR3/14.pem b/rpkid/resource-cert-samples/LIR3/14.pem
index 6173347f..6173347f 100644
--- a/scripts/resource-cert-samples/LIR3/14.pem
+++ b/rpkid/resource-cert-samples/LIR3/14.pem
diff --git a/scripts/resource-cert-samples/LIR3/15.pem b/rpkid/resource-cert-samples/LIR3/15.pem
index 53d5d71f..53d5d71f 100644
--- a/scripts/resource-cert-samples/LIR3/15.pem
+++ b/rpkid/resource-cert-samples/LIR3/15.pem
diff --git a/scripts/resource-cert-samples/LIR3/16.pem b/rpkid/resource-cert-samples/LIR3/16.pem
index a35e6d8c..a35e6d8c 100644
--- a/scripts/resource-cert-samples/LIR3/16.pem
+++ b/rpkid/resource-cert-samples/LIR3/16.pem
diff --git a/scripts/resource-cert-samples/LIR3/17.pem b/rpkid/resource-cert-samples/LIR3/17.pem
index b4d63508..b4d63508 100644
--- a/scripts/resource-cert-samples/LIR3/17.pem
+++ b/rpkid/resource-cert-samples/LIR3/17.pem
diff --git a/scripts/resource-cert-samples/LIR3/18.pem b/rpkid/resource-cert-samples/LIR3/18.pem
index d264ae2f..d264ae2f 100644
--- a/scripts/resource-cert-samples/LIR3/18.pem
+++ b/rpkid/resource-cert-samples/LIR3/18.pem
diff --git a/scripts/resource-cert-samples/LIR3/19.pem b/rpkid/resource-cert-samples/LIR3/19.pem
index 969f45e5..969f45e5 100644
--- a/scripts/resource-cert-samples/LIR3/19.pem
+++ b/rpkid/resource-cert-samples/LIR3/19.pem
diff --git a/scripts/resource-cert-samples/LIR3/1A.pem b/rpkid/resource-cert-samples/LIR3/1A.pem
index 8f133ac8..8f133ac8 100644
--- a/scripts/resource-cert-samples/LIR3/1A.pem
+++ b/rpkid/resource-cert-samples/LIR3/1A.pem
diff --git a/scripts/resource-cert-samples/LIR3/1B.pem b/rpkid/resource-cert-samples/LIR3/1B.pem
index 787aacd7..787aacd7 100644
--- a/scripts/resource-cert-samples/LIR3/1B.pem
+++ b/rpkid/resource-cert-samples/LIR3/1B.pem
diff --git a/scripts/resource-cert-samples/LIR3/index b/rpkid/resource-cert-samples/LIR3/index
index c03799ef..c03799ef 100644
--- a/scripts/resource-cert-samples/LIR3/index
+++ b/rpkid/resource-cert-samples/LIR3/index
diff --git a/scripts/resource-cert-samples/LIR3/index.attr b/rpkid/resource-cert-samples/LIR3/index.attr
index 3a7e39e6..3a7e39e6 100644
--- a/scripts/resource-cert-samples/LIR3/index.attr
+++ b/rpkid/resource-cert-samples/LIR3/index.attr
diff --git a/scripts/resource-cert-samples/LIR3/index.attr.old b/rpkid/resource-cert-samples/LIR3/index.attr.old
index 3a7e39e6..3a7e39e6 100644
--- a/scripts/resource-cert-samples/LIR3/index.attr.old
+++ b/rpkid/resource-cert-samples/LIR3/index.attr.old
diff --git a/scripts/resource-cert-samples/LIR3/index.old b/rpkid/resource-cert-samples/LIR3/index.old
index 82ed2ae6..82ed2ae6 100644
--- a/scripts/resource-cert-samples/LIR3/index.old
+++ b/rpkid/resource-cert-samples/LIR3/index.old
diff --git a/scripts/resource-cert-samples/LIR3/serial b/rpkid/resource-cert-samples/LIR3/serial
index cc9c0531..cc9c0531 100644
--- a/scripts/resource-cert-samples/LIR3/serial
+++ b/rpkid/resource-cert-samples/LIR3/serial
diff --git a/scripts/resource-cert-samples/LIR3/serial.old b/rpkid/resource-cert-samples/LIR3/serial.old
index 8787ed81..8787ed81 100644
--- a/scripts/resource-cert-samples/LIR3/serial.old
+++ b/rpkid/resource-cert-samples/LIR3/serial.old
diff --git a/scripts/resource-cert-samples/Makefile b/rpkid/resource-cert-samples/Makefile
index 90c85ac0..90c85ac0 100644
--- a/scripts/resource-cert-samples/Makefile
+++ b/rpkid/resource-cert-samples/Makefile
diff --git a/scripts/resource-cert-samples/RIR.cer b/rpkid/resource-cert-samples/RIR.cer
index d7154c7c..d7154c7c 100644
--- a/scripts/resource-cert-samples/RIR.cer
+++ b/rpkid/resource-cert-samples/RIR.cer
diff --git a/scripts/resource-cert-samples/RIR.cnf b/rpkid/resource-cert-samples/RIR.cnf
index b70b41e8..b70b41e8 100644
--- a/scripts/resource-cert-samples/RIR.cnf
+++ b/rpkid/resource-cert-samples/RIR.cnf
diff --git a/scripts/resource-cert-samples/RIR.key b/rpkid/resource-cert-samples/RIR.key
index 5721f051..5721f051 100644
--- a/scripts/resource-cert-samples/RIR.key
+++ b/rpkid/resource-cert-samples/RIR.key
diff --git a/scripts/resource-cert-samples/RIR.req b/rpkid/resource-cert-samples/RIR.req
index d86020df..d86020df 100644
--- a/scripts/resource-cert-samples/RIR.req
+++ b/rpkid/resource-cert-samples/RIR.req
diff --git a/scripts/resource-cert-samples/RIR/01.pem b/rpkid/resource-cert-samples/RIR/01.pem
index 07ee97f6..07ee97f6 100644
--- a/scripts/resource-cert-samples/RIR/01.pem
+++ b/rpkid/resource-cert-samples/RIR/01.pem
diff --git a/scripts/resource-cert-samples/RIR/02.pem b/rpkid/resource-cert-samples/RIR/02.pem
index b9922644..b9922644 100644
--- a/scripts/resource-cert-samples/RIR/02.pem
+++ b/rpkid/resource-cert-samples/RIR/02.pem
diff --git a/scripts/resource-cert-samples/RIR/03.pem b/rpkid/resource-cert-samples/RIR/03.pem
index 3b7fe4ac..3b7fe4ac 100644
--- a/scripts/resource-cert-samples/RIR/03.pem
+++ b/rpkid/resource-cert-samples/RIR/03.pem
diff --git a/scripts/resource-cert-samples/RIR/04.pem b/rpkid/resource-cert-samples/RIR/04.pem
index 29900503..29900503 100644
--- a/scripts/resource-cert-samples/RIR/04.pem
+++ b/rpkid/resource-cert-samples/RIR/04.pem
diff --git a/scripts/resource-cert-samples/RIR/05.pem b/rpkid/resource-cert-samples/RIR/05.pem
index 3e86b43b..3e86b43b 100644
--- a/scripts/resource-cert-samples/RIR/05.pem
+++ b/rpkid/resource-cert-samples/RIR/05.pem
diff --git a/scripts/resource-cert-samples/RIR/06.pem b/rpkid/resource-cert-samples/RIR/06.pem
index 3a8ea7f2..3a8ea7f2 100644
--- a/scripts/resource-cert-samples/RIR/06.pem
+++ b/rpkid/resource-cert-samples/RIR/06.pem
diff --git a/scripts/resource-cert-samples/RIR/07.pem b/rpkid/resource-cert-samples/RIR/07.pem
index 3d305e50..3d305e50 100644
--- a/scripts/resource-cert-samples/RIR/07.pem
+++ b/rpkid/resource-cert-samples/RIR/07.pem
diff --git a/scripts/resource-cert-samples/RIR/08.pem b/rpkid/resource-cert-samples/RIR/08.pem
index 056b591f..056b591f 100644
--- a/scripts/resource-cert-samples/RIR/08.pem
+++ b/rpkid/resource-cert-samples/RIR/08.pem
diff --git a/scripts/resource-cert-samples/RIR/09.pem b/rpkid/resource-cert-samples/RIR/09.pem
index b490cd62..b490cd62 100644
--- a/scripts/resource-cert-samples/RIR/09.pem
+++ b/rpkid/resource-cert-samples/RIR/09.pem
diff --git a/scripts/resource-cert-samples/RIR/0A.pem b/rpkid/resource-cert-samples/RIR/0A.pem
index 433dc6c9..433dc6c9 100644
--- a/scripts/resource-cert-samples/RIR/0A.pem
+++ b/rpkid/resource-cert-samples/RIR/0A.pem
diff --git a/scripts/resource-cert-samples/RIR/0B.pem b/rpkid/resource-cert-samples/RIR/0B.pem
index 0d858937..0d858937 100644
--- a/scripts/resource-cert-samples/RIR/0B.pem
+++ b/rpkid/resource-cert-samples/RIR/0B.pem
diff --git a/scripts/resource-cert-samples/RIR/0C.pem b/rpkid/resource-cert-samples/RIR/0C.pem
index 0e7d6905..0e7d6905 100644
--- a/scripts/resource-cert-samples/RIR/0C.pem
+++ b/rpkid/resource-cert-samples/RIR/0C.pem
diff --git a/scripts/resource-cert-samples/RIR/0D.pem b/rpkid/resource-cert-samples/RIR/0D.pem
index 86579fdb..86579fdb 100644
--- a/scripts/resource-cert-samples/RIR/0D.pem
+++ b/rpkid/resource-cert-samples/RIR/0D.pem
diff --git a/scripts/resource-cert-samples/RIR/0E.pem b/rpkid/resource-cert-samples/RIR/0E.pem
index 54acaf38..54acaf38 100644
--- a/scripts/resource-cert-samples/RIR/0E.pem
+++ b/rpkid/resource-cert-samples/RIR/0E.pem
diff --git a/scripts/resource-cert-samples/RIR/0F.pem b/rpkid/resource-cert-samples/RIR/0F.pem
index 1094cb06..1094cb06 100644
--- a/scripts/resource-cert-samples/RIR/0F.pem
+++ b/rpkid/resource-cert-samples/RIR/0F.pem
diff --git a/scripts/resource-cert-samples/RIR/10.pem b/rpkid/resource-cert-samples/RIR/10.pem
index 64f73b83..64f73b83 100644
--- a/scripts/resource-cert-samples/RIR/10.pem
+++ b/rpkid/resource-cert-samples/RIR/10.pem
diff --git a/scripts/resource-cert-samples/RIR/11.pem b/rpkid/resource-cert-samples/RIR/11.pem
index f8e33d59..f8e33d59 100644
--- a/scripts/resource-cert-samples/RIR/11.pem
+++ b/rpkid/resource-cert-samples/RIR/11.pem
diff --git a/scripts/resource-cert-samples/RIR/12.pem b/rpkid/resource-cert-samples/RIR/12.pem
index 71bb1954..71bb1954 100644
--- a/scripts/resource-cert-samples/RIR/12.pem
+++ b/rpkid/resource-cert-samples/RIR/12.pem
diff --git a/scripts/resource-cert-samples/RIR/13.pem b/rpkid/resource-cert-samples/RIR/13.pem
index 3b1e67f4..3b1e67f4 100644
--- a/scripts/resource-cert-samples/RIR/13.pem
+++ b/rpkid/resource-cert-samples/RIR/13.pem
diff --git a/scripts/resource-cert-samples/RIR/14.pem b/rpkid/resource-cert-samples/RIR/14.pem
index 430d3895..430d3895 100644
--- a/scripts/resource-cert-samples/RIR/14.pem
+++ b/rpkid/resource-cert-samples/RIR/14.pem
diff --git a/scripts/resource-cert-samples/RIR/15.pem b/rpkid/resource-cert-samples/RIR/15.pem
index 625589ac..625589ac 100644
--- a/scripts/resource-cert-samples/RIR/15.pem
+++ b/rpkid/resource-cert-samples/RIR/15.pem
diff --git a/scripts/resource-cert-samples/RIR/16.pem b/rpkid/resource-cert-samples/RIR/16.pem
index ebfd1e7b..ebfd1e7b 100644
--- a/scripts/resource-cert-samples/RIR/16.pem
+++ b/rpkid/resource-cert-samples/RIR/16.pem
diff --git a/scripts/resource-cert-samples/RIR/17.pem b/rpkid/resource-cert-samples/RIR/17.pem
index 08089ed2..08089ed2 100644
--- a/scripts/resource-cert-samples/RIR/17.pem
+++ b/rpkid/resource-cert-samples/RIR/17.pem
diff --git a/scripts/resource-cert-samples/RIR/18.pem b/rpkid/resource-cert-samples/RIR/18.pem
index 61f31504..61f31504 100644
--- a/scripts/resource-cert-samples/RIR/18.pem
+++ b/rpkid/resource-cert-samples/RIR/18.pem
diff --git a/scripts/resource-cert-samples/RIR/19.pem b/rpkid/resource-cert-samples/RIR/19.pem
index e258d4d7..e258d4d7 100644
--- a/scripts/resource-cert-samples/RIR/19.pem
+++ b/rpkid/resource-cert-samples/RIR/19.pem
diff --git a/scripts/resource-cert-samples/RIR/1A.pem b/rpkid/resource-cert-samples/RIR/1A.pem
index 9b92b771..9b92b771 100644
--- a/scripts/resource-cert-samples/RIR/1A.pem
+++ b/rpkid/resource-cert-samples/RIR/1A.pem
diff --git a/scripts/resource-cert-samples/RIR/1B.pem b/rpkid/resource-cert-samples/RIR/1B.pem
index 300059d2..300059d2 100644
--- a/scripts/resource-cert-samples/RIR/1B.pem
+++ b/rpkid/resource-cert-samples/RIR/1B.pem
diff --git a/scripts/resource-cert-samples/RIR/1C.pem b/rpkid/resource-cert-samples/RIR/1C.pem
index 786dc6b4..786dc6b4 100644
--- a/scripts/resource-cert-samples/RIR/1C.pem
+++ b/rpkid/resource-cert-samples/RIR/1C.pem
diff --git a/scripts/resource-cert-samples/RIR/1D.pem b/rpkid/resource-cert-samples/RIR/1D.pem
index ef7eb793..ef7eb793 100644
--- a/scripts/resource-cert-samples/RIR/1D.pem
+++ b/rpkid/resource-cert-samples/RIR/1D.pem
diff --git a/scripts/resource-cert-samples/RIR/1E.pem b/rpkid/resource-cert-samples/RIR/1E.pem
index 93d846b8..93d846b8 100644
--- a/scripts/resource-cert-samples/RIR/1E.pem
+++ b/rpkid/resource-cert-samples/RIR/1E.pem
diff --git a/scripts/resource-cert-samples/RIR/1F.pem b/rpkid/resource-cert-samples/RIR/1F.pem
index 9dd25967..9dd25967 100644
--- a/scripts/resource-cert-samples/RIR/1F.pem
+++ b/rpkid/resource-cert-samples/RIR/1F.pem
diff --git a/scripts/resource-cert-samples/RIR/20.pem b/rpkid/resource-cert-samples/RIR/20.pem
index fe5d4fc2..fe5d4fc2 100644
--- a/scripts/resource-cert-samples/RIR/20.pem
+++ b/rpkid/resource-cert-samples/RIR/20.pem
diff --git a/scripts/resource-cert-samples/RIR/21.pem b/rpkid/resource-cert-samples/RIR/21.pem
index 0465b7a4..0465b7a4 100644
--- a/scripts/resource-cert-samples/RIR/21.pem
+++ b/rpkid/resource-cert-samples/RIR/21.pem
diff --git a/scripts/resource-cert-samples/RIR/22.pem b/rpkid/resource-cert-samples/RIR/22.pem
index f46564dd..f46564dd 100644
--- a/scripts/resource-cert-samples/RIR/22.pem
+++ b/rpkid/resource-cert-samples/RIR/22.pem
diff --git a/scripts/resource-cert-samples/RIR/23.pem b/rpkid/resource-cert-samples/RIR/23.pem
index 62954cf1..62954cf1 100644
--- a/scripts/resource-cert-samples/RIR/23.pem
+++ b/rpkid/resource-cert-samples/RIR/23.pem
diff --git a/scripts/resource-cert-samples/RIR/24.pem b/rpkid/resource-cert-samples/RIR/24.pem
index 419b192d..419b192d 100644
--- a/scripts/resource-cert-samples/RIR/24.pem
+++ b/rpkid/resource-cert-samples/RIR/24.pem
diff --git a/scripts/resource-cert-samples/RIR/25.pem b/rpkid/resource-cert-samples/RIR/25.pem
index 06ca26ad..06ca26ad 100644
--- a/scripts/resource-cert-samples/RIR/25.pem
+++ b/rpkid/resource-cert-samples/RIR/25.pem
diff --git a/scripts/resource-cert-samples/RIR/26.pem b/rpkid/resource-cert-samples/RIR/26.pem
index 77486c96..77486c96 100644
--- a/scripts/resource-cert-samples/RIR/26.pem
+++ b/rpkid/resource-cert-samples/RIR/26.pem
diff --git a/scripts/resource-cert-samples/RIR/27.pem b/rpkid/resource-cert-samples/RIR/27.pem
index 899f8afe..899f8afe 100644
--- a/scripts/resource-cert-samples/RIR/27.pem
+++ b/rpkid/resource-cert-samples/RIR/27.pem
diff --git a/scripts/resource-cert-samples/RIR/28.pem b/rpkid/resource-cert-samples/RIR/28.pem
index 5bf407ac..5bf407ac 100644
--- a/scripts/resource-cert-samples/RIR/28.pem
+++ b/rpkid/resource-cert-samples/RIR/28.pem
diff --git a/scripts/resource-cert-samples/RIR/29.pem b/rpkid/resource-cert-samples/RIR/29.pem
index aaed0d68..aaed0d68 100644
--- a/scripts/resource-cert-samples/RIR/29.pem
+++ b/rpkid/resource-cert-samples/RIR/29.pem
diff --git a/scripts/resource-cert-samples/RIR/2A.pem b/rpkid/resource-cert-samples/RIR/2A.pem
index 7f7116ad..7f7116ad 100644
--- a/scripts/resource-cert-samples/RIR/2A.pem
+++ b/rpkid/resource-cert-samples/RIR/2A.pem
diff --git a/scripts/resource-cert-samples/RIR/2B.pem b/rpkid/resource-cert-samples/RIR/2B.pem
index 7d69f853..7d69f853 100644
--- a/scripts/resource-cert-samples/RIR/2B.pem
+++ b/rpkid/resource-cert-samples/RIR/2B.pem
diff --git a/scripts/resource-cert-samples/RIR/2C.pem b/rpkid/resource-cert-samples/RIR/2C.pem
index b32d729e..b32d729e 100644
--- a/scripts/resource-cert-samples/RIR/2C.pem
+++ b/rpkid/resource-cert-samples/RIR/2C.pem
diff --git a/scripts/resource-cert-samples/RIR/2D.pem b/rpkid/resource-cert-samples/RIR/2D.pem
index 61bb37a9..61bb37a9 100644
--- a/scripts/resource-cert-samples/RIR/2D.pem
+++ b/rpkid/resource-cert-samples/RIR/2D.pem
diff --git a/scripts/resource-cert-samples/RIR/2E.pem b/rpkid/resource-cert-samples/RIR/2E.pem
index 272d774d..272d774d 100644
--- a/scripts/resource-cert-samples/RIR/2E.pem
+++ b/rpkid/resource-cert-samples/RIR/2E.pem
diff --git a/scripts/resource-cert-samples/RIR/2F.pem b/rpkid/resource-cert-samples/RIR/2F.pem
index d7154c7c..d7154c7c 100644
--- a/scripts/resource-cert-samples/RIR/2F.pem
+++ b/rpkid/resource-cert-samples/RIR/2F.pem
diff --git a/scripts/resource-cert-samples/RIR/30.pem b/rpkid/resource-cert-samples/RIR/30.pem
index c466f22e..c466f22e 100644
--- a/scripts/resource-cert-samples/RIR/30.pem
+++ b/rpkid/resource-cert-samples/RIR/30.pem
diff --git a/scripts/resource-cert-samples/RIR/31.pem b/rpkid/resource-cert-samples/RIR/31.pem
index dcc97dd1..dcc97dd1 100644
--- a/scripts/resource-cert-samples/RIR/31.pem
+++ b/rpkid/resource-cert-samples/RIR/31.pem
diff --git a/scripts/resource-cert-samples/RIR/32.pem b/rpkid/resource-cert-samples/RIR/32.pem
index 348c6275..348c6275 100644
--- a/scripts/resource-cert-samples/RIR/32.pem
+++ b/rpkid/resource-cert-samples/RIR/32.pem
diff --git a/scripts/resource-cert-samples/RIR/index b/rpkid/resource-cert-samples/RIR/index
index 66733b3b..66733b3b 100644
--- a/scripts/resource-cert-samples/RIR/index
+++ b/rpkid/resource-cert-samples/RIR/index
diff --git a/scripts/resource-cert-samples/RIR/index.attr b/rpkid/resource-cert-samples/RIR/index.attr
index 3a7e39e6..3a7e39e6 100644
--- a/scripts/resource-cert-samples/RIR/index.attr
+++ b/rpkid/resource-cert-samples/RIR/index.attr
diff --git a/scripts/resource-cert-samples/RIR/index.attr.old b/rpkid/resource-cert-samples/RIR/index.attr.old
index 3a7e39e6..3a7e39e6 100644
--- a/scripts/resource-cert-samples/RIR/index.attr.old
+++ b/rpkid/resource-cert-samples/RIR/index.attr.old
diff --git a/scripts/resource-cert-samples/RIR/index.old b/rpkid/resource-cert-samples/RIR/index.old
index e5d3f927..e5d3f927 100644
--- a/scripts/resource-cert-samples/RIR/index.old
+++ b/rpkid/resource-cert-samples/RIR/index.old
diff --git a/scripts/resource-cert-samples/RIR/serial b/rpkid/resource-cert-samples/RIR/serial
index bb95160c..bb95160c 100644
--- a/scripts/resource-cert-samples/RIR/serial
+++ b/rpkid/resource-cert-samples/RIR/serial
diff --git a/scripts/resource-cert-samples/RIR/serial.old b/rpkid/resource-cert-samples/RIR/serial.old
index f5c89552..f5c89552 100644
--- a/scripts/resource-cert-samples/RIR/serial.old
+++ b/rpkid/resource-cert-samples/RIR/serial.old
diff --git a/scripts/rootd.cer b/rpkid/rootd.cer
index 205fee80..205fee80 100644
--- a/scripts/rootd.cer
+++ b/rpkid/rootd.cer
diff --git a/scripts/rootd.cnf b/rpkid/rootd.cnf
index 1e400c04..1e400c04 100644
--- a/scripts/rootd.cnf
+++ b/rpkid/rootd.cnf
diff --git a/scripts/rootd.key b/rpkid/rootd.key
index d97fc64d..d97fc64d 100644
--- a/scripts/rootd.key
+++ b/rpkid/rootd.key
diff --git a/scripts/rootd.py b/rpkid/rootd.py
index 212e6469..212e6469 100755
--- a/scripts/rootd.py
+++ b/rpkid/rootd.py
diff --git a/scripts/rootd.sh b/rpkid/rootd.sh
index 50f2e90f..50f2e90f 100644
--- a/scripts/rootd.sh
+++ b/rpkid/rootd.sh
diff --git a/scripts/rootd.yaml b/rpkid/rootd.yaml
index 2ee5dcd4..2ee5dcd4 100644
--- a/scripts/rootd.yaml
+++ b/rpkid/rootd.yaml
diff --git a/scripts/rpki/Doxyfile b/rpkid/rpki/Doxyfile
index 276c0967..276c0967 100644
--- a/scripts/rpki/Doxyfile
+++ b/rpkid/rpki/Doxyfile
diff --git a/scripts/rpki/__init__.py b/rpkid/rpki/__init__.py
index 690c7f9c..610edbb3 100644
--- a/scripts/rpki/__init__.py
+++ b/rpkid/rpki/__init__.py
@@ -30,7 +30,7 @@
 ##
 ## The documentation you're reading is generated automatically by
 ## Doxygen from comments and documentation in
-## <a href="http://viewvc.hactrn.net/subvert-rpki.hactrn.net/scripts/rpki/">the code</a>.
+## <a href="http://viewvc.hactrn.net/subvert-rpki.hactrn.net/rpkid/rpki/">the code</a>.
 ##
 ## This work is funded by <a href="http://www.arin.net/">ARIN</a>, in
 ## collaboration with the other RIRs.  If you're interested in this
diff --git a/scripts/rpki/cms.py b/rpkid/rpki/cms.py
index 7b4916dc..7b4916dc 100644
--- a/scripts/rpki/cms.py
+++ b/rpkid/rpki/cms.py
diff --git a/scripts/rpki/config.py b/rpkid/rpki/config.py
index 54540bbc..54540bbc 100644
--- a/scripts/rpki/config.py
+++ b/rpkid/rpki/config.py
diff --git a/scripts/rpki/exceptions.py b/rpkid/rpki/exceptions.py
index c1475680..c1475680 100644
--- a/scripts/rpki/exceptions.py
+++ b/rpkid/rpki/exceptions.py
diff --git a/scripts/rpki/https.py b/rpkid/rpki/https.py
index bca5a8b1..bca5a8b1 100644
--- a/scripts/rpki/https.py
+++ b/rpkid/rpki/https.py
diff --git a/scripts/rpki/ipaddrs.py b/rpkid/rpki/ipaddrs.py
index 4de2f428..4de2f428 100644
--- a/scripts/rpki/ipaddrs.py
+++ b/rpkid/rpki/ipaddrs.py
diff --git a/scripts/rpki/left_right.py b/rpkid/rpki/left_right.py
index 8a5e3433..8a5e3433 100644
--- a/scripts/rpki/left_right.py
+++ b/rpkid/rpki/left_right.py
diff --git a/scripts/rpki/log.py b/rpkid/rpki/log.py
index 1f85f667..1f85f667 100644
--- a/scripts/rpki/log.py
+++ b/rpkid/rpki/log.py
diff --git a/scripts/rpki/manifest.py b/rpkid/rpki/manifest.py
index c219cc8f..c219cc8f 100644
--- a/scripts/rpki/manifest.py
+++ b/rpkid/rpki/manifest.py
diff --git a/scripts/rpki/oids.py b/rpkid/rpki/oids.py
index 4e08aef7..4e08aef7 100644
--- a/scripts/rpki/oids.py
+++ b/rpkid/rpki/oids.py
diff --git a/scripts/rpki/pkcs10.py b/rpkid/rpki/pkcs10.py
index 9ed38470..9ed38470 100644
--- a/scripts/rpki/pkcs10.py
+++ b/rpkid/rpki/pkcs10.py
diff --git a/scripts/rpki/relaxng.py b/rpkid/rpki/relaxng.py
index b045b1c6..b045b1c6 100644
--- a/scripts/rpki/relaxng.py
+++ b/rpkid/rpki/relaxng.py
diff --git a/scripts/rpki/resource_set.py b/rpkid/rpki/resource_set.py
index 8497dad5..8497dad5 100644
--- a/scripts/rpki/resource_set.py
+++ b/rpkid/rpki/resource_set.py
diff --git a/scripts/rpki/roa.py b/rpkid/rpki/roa.py
index 15d1c6eb..15d1c6eb 100644
--- a/scripts/rpki/roa.py
+++ b/rpkid/rpki/roa.py
diff --git a/scripts/rpki/sax_utils.py b/rpkid/rpki/sax_utils.py
index a472bee9..a472bee9 100644
--- a/scripts/rpki/sax_utils.py
+++ b/rpkid/rpki/sax_utils.py
diff --git a/scripts/rpki/sql.py b/rpkid/rpki/sql.py
index 022e4dd5..022e4dd5 100644
--- a/scripts/rpki/sql.py
+++ b/rpkid/rpki/sql.py
diff --git a/scripts/rpki/sundial.py b/rpkid/rpki/sundial.py
index a1ffde62..a1ffde62 100644
--- a/scripts/rpki/sundial.py
+++ b/rpkid/rpki/sundial.py
diff --git a/scripts/rpki/up_down.py b/rpkid/rpki/up_down.py
index f902d86c..f902d86c 100644
--- a/scripts/rpki/up_down.py
+++ b/rpkid/rpki/up_down.py
diff --git a/scripts/rpki/x509.py b/rpkid/rpki/x509.py
index c029e5f3..c029e5f3 100644
--- a/scripts/rpki/x509.py
+++ b/rpkid/rpki/x509.py
diff --git a/scripts/rpkid.py b/rpkid/rpkid.py
index 5779753b..5779753b 100755
--- a/scripts/rpkid.py
+++ b/rpkid/rpkid.py
diff --git a/scripts/test-pow-tls.py b/rpkid/test-pow-tls.py
index 99e412f0..99e412f0 100644
--- a/scripts/test-pow-tls.py
+++ b/rpkid/test-pow-tls.py
diff --git a/scripts/testbed.1.yaml b/rpkid/testbed.1.yaml
index acee42e2..acee42e2 100644
--- a/scripts/testbed.1.yaml
+++ b/rpkid/testbed.1.yaml
diff --git a/scripts/testbed.2.yaml b/rpkid/testbed.2.yaml
index 9b154579..9b154579 100644
--- a/scripts/testbed.2.yaml
+++ b/rpkid/testbed.2.yaml
diff --git a/scripts/testbed.py b/rpkid/testbed.py
index 67c1f30d..97a66a2b 100644
--- a/scripts/testbed.py
+++ b/rpkid/testbed.py
@@ -106,7 +106,7 @@ prog_openssl   = cfg.get("prog_openssl",   "../../openssl/openssl/apps/openssl")
 prog_rsyncd    = cfg.get("prog_rsyncd",    "rsync")
 prog_rcynic    = cfg.get("prog_rcynic",    "../../rcynic/rcynic")
 
-rcynic_stats   = cfg.get("rcynic_stats",   "xsltproc ../../rcynic/rcynic.xsl %s.xml | w3m -T text/html -dump | awk 'NR > 1'" % rcynic_name)
+rcynic_stats   = cfg.get("rcynic_stats",   "xsltproc --param refresh 0 ../../rcynic/rcynic.xsl %s.xml | w3m -T text/html -dump" % rcynic_name)
 
 rpki_sql_file  = cfg.get("rpki_sql_file",  "../docs/rpki-db-schema.sql")
 irdb_sql_file  = cfg.get("irdb_sql_file",  "../docs/sample-irdb.sql")
diff --git a/scripts/testbed.sql b/rpkid/testbed.sql
index c8cb90b0..c8cb90b0 100644
--- a/scripts/testbed.sql
+++ b/rpkid/testbed.sql
diff --git a/scripts/testpoke.py b/rpkid/testpoke.py
index 3d23751b..3d23751b 100644
--- a/scripts/testpoke.py
+++ b/rpkid/testpoke.py
diff --git a/scripts/testpoke.sh b/rpkid/testpoke.sh
index 6e6a0b74..6e6a0b74 100644
--- a/scripts/testpoke.sh
+++ b/rpkid/testpoke.sh
diff --git a/scripts/testpoke.yaml b/rpkid/testpoke.yaml
index 22e2d35f..22e2d35f 100644
--- a/scripts/testpoke.yaml
+++ b/rpkid/testpoke.yaml
diff --git a/scripts/up-down-protocol-samples/Makefile b/rpkid/up-down-protocol-samples/Makefile
index 10ee791a..10ee791a 100644
--- a/scripts/up-down-protocol-samples/Makefile
+++ b/rpkid/up-down-protocol-samples/Makefile
diff --git a/scripts/up-down-protocol-samples/error_response.xml b/rpkid/up-down-protocol-samples/error_response.xml
index 83af6649..83af6649 100644
--- a/scripts/up-down-protocol-samples/error_response.xml
+++ b/rpkid/up-down-protocol-samples/error_response.xml
diff --git a/scripts/up-down-protocol-samples/issue1.xml b/rpkid/up-down-protocol-samples/issue1.xml
index 4b8366f9..4b8366f9 100644
--- a/scripts/up-down-protocol-samples/issue1.xml
+++ b/rpkid/up-down-protocol-samples/issue1.xml
diff --git a/scripts/up-down-protocol-samples/issue2.xml b/rpkid/up-down-protocol-samples/issue2.xml
index a991cbcd..a991cbcd 100644
--- a/scripts/up-down-protocol-samples/issue2.xml
+++ b/rpkid/up-down-protocol-samples/issue2.xml
diff --git a/scripts/up-down-protocol-samples/issue_response.xml b/rpkid/up-down-protocol-samples/issue_response.xml
index 39f6b954..39f6b954 100644
--- a/scripts/up-down-protocol-samples/issue_response.xml
+++ b/rpkid/up-down-protocol-samples/issue_response.xml
diff --git a/scripts/up-down-protocol-samples/list.xml b/rpkid/up-down-protocol-samples/list.xml
index 01a803f3..01a803f3 100644
--- a/scripts/up-down-protocol-samples/list.xml
+++ b/rpkid/up-down-protocol-samples/list.xml
diff --git a/scripts/up-down-protocol-samples/list_response.xml b/rpkid/up-down-protocol-samples/list_response.xml
index 9e368f5a..9e368f5a 100644
--- a/scripts/up-down-protocol-samples/list_response.xml
+++ b/rpkid/up-down-protocol-samples/list_response.xml
diff --git a/scripts/up-down-protocol-samples/revoke.xml b/rpkid/up-down-protocol-samples/revoke.xml
index eb4b3efb..eb4b3efb 100644
--- a/scripts/up-down-protocol-samples/revoke.xml
+++ b/rpkid/up-down-protocol-samples/revoke.xml
diff --git a/scripts/up-down-protocol-samples/revoke_response.xml b/rpkid/up-down-protocol-samples/revoke_response.xml
index 9f4ebacc..9f4ebacc 100644
--- a/scripts/up-down-protocol-samples/revoke_response.xml
+++ b/rpkid/up-down-protocol-samples/revoke_response.xml
diff --git a/scripts/up-down-schema.rnc b/rpkid/up-down-schema.rnc
index 10736576..10736576 100644
--- a/scripts/up-down-schema.rnc
+++ b/rpkid/up-down-schema.rnc
diff --git a/scripts/up-down-schema.rng b/rpkid/up-down-schema.rng
index 1c6cd854..1c6cd854 100644
--- a/scripts/up-down-schema.rng
+++ b/rpkid/up-down-schema.rng
diff --git a/scripts/xml-parse-test.py b/rpkid/xml-parse-test.py
index bde7d167..bde7d167 100755
--- a/scripts/xml-parse-test.py
+++ b/rpkid/xml-parse-test.py