OpenSSL 0.9.8f -> 0.9.8g

svn path=/openssl/Makefile; revision=1191
author: Rob Austein <sra@hactrn.net> 2007-10-29 16:08:39 +0000
committer: Rob Austein <sra@hactrn.net> 2007-10-29 16:08:39 +0000
commit: ad6d9a46ba9a14d6cd5560ee78ba4cc1ad770ff6 (patch)
tree: 208b82f25f3c56e3b6fc3388bb92a4eaa824601f
parent: 0487907ac58a6f2f84177434091743879733304e (diff)
53 files changed, 1411 insertions, 368 deletions
diff --git a/openssl/Makefile b/openssl/Makefile
index 25bf8553..06214fdc 100644
--- a/openssl/Makefile
+++ b/openssl/Makefile
@@ -1,6 +1,6 @@
 # $Id$
 
-VERSION = 0.9.8f
+VERSION = 0.9.8g
 
 all: openssl-${VERSION}/Makefile
 	cd openssl-${VERSION}; make $@
diff --git a/openssl/openssl-0.9.8f.tar.gz b/openssl/openssl-0.9.8f.tar.gz
deleted file mode 100644
index 97ba9012..00000000
--- a/openssl/openssl-0.9.8f.tar.gz
+++ /dev/null
diff --git a/openssl/openssl-0.9.8g.tar.gz b/openssl/openssl-0.9.8g.tar.gz
new file mode 100644
index 00000000..14ac1761
--- /dev/null
+++ b/openssl/openssl-0.9.8g.tar.gz
diff --git a/pow/Makefile b/pow/Makefile
index 96e37de3..1d55552a 100644
--- a/pow/Makefile
+++ b/pow/Makefile
@@ -16,10 +16,11 @@ all: ${STAMP}
 
 ${STAMP}: ${SOURCES}
 	cd POW-${VERSION}; python setup.py build
+	ln -sf POW-${VERSION}/build/lib.* buildlib
 	touch $@
 
 clean:
-	rm -rf POW-${VERSION}/build
+	rm -rf POW-${VERSION}/build buildlib
 
 install:
 	@echo Not attempting to install modified POW, if you want that, do it yourself
diff --git a/pow/POW-0.7/setup.py b/pow/POW-0.7/setup.py
index 37b7ba61..240a1a31 100644
--- a/pow/POW-0.7/setup.py
+++ b/pow/POW-0.7/setup.py
@@ -13,7 +13,7 @@ oidinfo.dumpobjs('lib/_objects.py')
 print 'writing oid module'
 oidinfo.dumpoids('lib/_oids.py')
 
-library_dirs = [ "../../openssl/openssl-0.9.8f" ]
+library_dirs = [ "../../openssl/openssl-0.9.8g" ]
 include_dirs = [ library_dirs[0] + "/include" ]
 libraries    = [ "ssl", "crypto" ]
 
diff --git a/rcynic/Makefile b/rcynic/Makefile
index a8768583..38d99f05 100644
--- a/rcynic/Makefile
+++ b/rcynic/Makefile
@@ -1,6 +1,6 @@
 # $Id$
 
-OPENSSL_DIR = ../openssl/openssl-0.9.8f
+OPENSSL_DIR = ../openssl/openssl-0.9.8g
 
 CFLAGS = -g -I${OPENSSL_DIR}/include -Wall -Werror -Wshadow -Wmissing-prototypes -Wmissing-declarations
 LDFLAGS = -static
diff --git a/scripts/POW b/scripts/POW
index 46090043..43fccd7b 120000
--- a/scripts/POW
+++ b/scripts/POW
@@ -1 +1 @@
-../pow/POW-0.7/build/lib.freebsd-6.2-STABLE-i386-2.5/POW
-\ No newline at end of file
+../pow/buildlib/POW
+\ No newline at end of file
diff --git a/scripts/check-hashes.sh b/scripts/check-hashes.sh
index d689cded..1647df0c 100644
--- a/scripts/check-hashes.sh
+++ b/scripts/check-hashes.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -
 # $Id$
 
-: ${openssl=/u/sra/isc/route-pki/subvert-rpki.hactrn.net/openssl/openssl-0.9.8f/apps/openssl}
+: ${openssl=/u/sra/isc/route-pki/subvert-rpki.hactrn.net/openssl/openssl-0.9.8g/apps/openssl}
 : ${switches='-verbose -crl_check_all -policy_check -explicit_policy -policy 1.3.6.1.5.5.7.14.2 -x509_strict'}
 : ${hashtree=hashed}
 
diff --git a/scripts/gen-verify-test.pl b/scripts/gen-verify-test.pl
index a8868b1d..3b74c037 100644
--- a/scripts/gen-verify-test.pl
+++ b/scripts/gen-verify-test.pl
@@ -5,7 +5,7 @@ eval 'exec perl -w -S $0 ${1+"$@"}'
 
 use strict;
 
-my $openssl = "/u/sra/isc/route-pki/subvert-rpki.hactrn.net/openssl/openssl-0.9.8f/apps/openssl";
+my $openssl = "/u/sra/isc/route-pki/subvert-rpki.hactrn.net/openssl/openssl-0.9.8g/apps/openssl";
 
 my $verify_options = "-verbose -crl_check_all -policy_check -explicit_policy -policy 1.3.6.1.5.5.7.14.2 -x509_strict";
 
diff --git a/scripts/generate-testrepo.pl b/scripts/generate-testrepo.pl
index 0daa896c..69210bc2 100644
--- a/scripts/generate-testrepo.pl
+++ b/scripts/generate-testrepo.pl
@@ -9,7 +9,7 @@ my %parent;
 my @ordering;
 my %hashes;
 
-my $openssl	= "../../openssl/openssl-0.9.8f/apps/openssl";
+my $openssl	= "../../openssl/openssl-0.9.8g/apps/openssl";
 my $subdir	= "apacheca";
 my $passwd	= "fnord";
 my $keybits	= 2048;
diff --git a/scripts/generate-testrepo.py b/scripts/generate-testrepo.py
index caaa855d..37d2f8d8 100644
--- a/scripts/generate-testrepo.py
+++ b/scripts/generate-testrepo.py
@@ -14,7 +14,7 @@ makefile to drive everything.
 import rpki.resource_set, os
 
 subdir  = "resource-cert-samples"
-openssl = "../../openssl/openssl-0.9.8f/apps/openssl"
+openssl = "../../openssl/openssl-0.9.8g/apps/openssl"
 keybits = 2048
 
 def main():
diff --git a/scripts/make-hashes.pl b/scripts/make-hashes.pl
index 5bb22c3c..3fb2ac2e 100644
--- a/scripts/make-hashes.pl
+++ b/scripts/make-hashes.pl
@@ -3,7 +3,7 @@
 
 use strict;
 
-my $openssl = "/u/sra/isc/route-pki/subvert-rpki.hactrn.net/openssl/openssl-0.9.8f/apps/openssl";
+my $openssl = "/u/sra/isc/route-pki/subvert-rpki.hactrn.net/openssl/openssl-0.9.8g/apps/openssl";
 my $dir     = "hashed";
 
 my @cmds;
diff --git a/scripts/resource-cert-samples/ISP1.cer b/scripts/resource-cert-samples/ISP1.cer
index beb187b4..c74d669a 100644
--- a/scripts/resource-cert-samples/ISP1.cer
+++ b/scripts/resource-cert-samples/ISP1.cer
@@ -1,12 +1,12 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 22 (0x16)
+        Serial Number: 24 (0x18)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=TEST ENTITY LIR1
         Validity
-            Not Before: Oct 19 19:06:08 2007 GMT
-            Not After : Oct 18 19:06:08 2008 GMT
+            Not Before: Oct 29 16:03:52 2007 GMT
+            Not After : Oct 28 16:03:52 2008 GMT
         Subject: CN=TEST ENTITY ISP1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -53,24 +53,24 @@ Certificate:
                   192.0.2.1-192.0.2.33
 
     Signature Algorithm: sha256WithRSAEncryption
-        54:69:df:3c:bc:66:16:55:27:c3:11:85:7e:3b:f8:49:09:68:
-        ea:ad:50:0d:e2:a8:b1:9e:bc:eb:ca:9f:80:7b:6e:5d:c5:65:
-        23:6c:c8:70:9d:b3:f1:2f:c4:a9:2f:2e:aa:43:39:fe:3f:f8:
-        45:e1:db:b2:5b:a8:83:31:73:11:43:ae:88:a7:bf:17:9e:28:
-        2f:f7:97:8b:eb:39:2b:7b:c1:4d:57:79:fb:e8:d1:18:43:3e:
-        9d:3d:6a:c5:10:51:21:cd:f0:0d:ef:68:5a:85:0c:7b:1c:36:
-        93:a0:4c:7f:82:8e:90:ef:77:5d:41:4c:71:9f:72:1a:fc:bc:
-        22:c3:8f:2a:48:1e:98:bd:a6:cf:6c:a5:8c:c4:fd:0d:2a:6c:
-        3c:f5:6c:ab:e0:04:ed:02:26:f6:fb:0c:a8:4f:12:27:f6:26:
-        9b:e3:a3:37:0c:f7:ac:a9:aa:40:07:e1:08:67:d6:46:25:2a:
-        00:03:c2:a7:78:1f:d8:90:f7:27:6e:97:ce:ef:0c:23:e5:3c:
-        41:02:3c:1e:d9:ce:8b:6f:b6:f3:8d:9f:01:20:57:cf:fb:02:
-        ee:b6:c1:d8:8e:72:37:c6:db:7c:ae:a2:9d:e1:44:b8:58:26:
-        95:30:d1:dc:b2:6a:47:c1:2e:70:86:c5:db:6e:ca:ec:8f:cc:
-        9b:10:17:22
+        04:44:50:5a:c4:68:fd:0c:7a:51:99:27:80:ae:0a:ea:ca:62:
+        4d:34:65:ec:c0:1b:16:59:fe:41:76:fa:06:06:be:4f:37:26:
+        ec:75:de:53:c7:c6:dd:27:bb:72:ab:4f:0f:6b:a9:3c:19:23:
+        76:9f:bd:63:c8:f4:1b:f6:a4:bd:da:84:7d:8d:c4:96:58:5a:
+        09:8f:e0:6c:ac:70:68:12:c5:74:db:c9:46:40:1e:20:d3:b8:
+        19:8c:18:27:8a:9d:a4:47:2e:ed:29:a3:38:d9:0b:f2:fe:d9:
+        22:80:2c:2c:92:9d:54:42:7e:68:ad:32:d0:4d:ad:f4:2f:d2:
+        80:1c:9b:ac:13:68:a7:0a:fa:41:c4:f3:1c:02:da:f8:cb:d5:
+        5e:62:a6:16:56:81:ce:82:ec:37:56:c2:59:9a:41:f2:c1:22:
+        3f:63:ee:a6:ca:23:e9:60:62:07:84:2c:73:21:5a:16:8f:6f:
+        06:7c:b0:c7:bb:66:f0:a8:75:6f:36:26:24:2b:7a:0e:a1:9a:
+        11:28:6f:53:1f:76:fb:60:9d:9f:84:97:1f:cd:76:c6:de:c8:
+        f8:f9:66:a8:d0:79:31:2c:39:7f:e5:f6:76:36:ba:1e:6e:ea:
+        31:02:86:60:75:8d:f7:d4:c7:35:f3:5e:8a:b5:18:31:46:30:
+        7f:e0:33:d7
 -----BEGIN CERTIFICATE-----
-MIIDxzCCAq+gAwIBAgIBFjANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
-IEVOVElUWSBMSVIxMB4XDTA3MTAxOTE5MDYwOFoXDTA4MTAxODE5MDYwOFowGzEZ
+MIIDxzCCAq+gAwIBAgIBGDANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
+IEVOVElUWSBMSVIxMB4XDTA3MTAyOTE2MDM1MloXDTA4MTAyODE2MDM1MlowGzEZ
 MBcGA1UEAxMQVEVTVCBFTlRJVFkgSVNQMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBAOuAVHp0S+SBFdAlLV4hvkfmMavi/nlVSLc2VT3cEYhbtza+07vX
 Fo34S/TFvTTEjixnl+YnEEDFNvS2bLkpgi52sCnqQ5rRMN4FocFUfBdnHfwp3YBT
@@ -83,11 +83,11 @@ PICRzj/9C9232KaMlCAHGXT6hv/Ll8P2pOcCAwEAAaOCARQwggEQMA8GA1UdEwEB
 YmF0cy1yLXVzLmhhY3Rybi5uZXQvSVNQMS8wRAYIKwYBBQUHAQEEODA2MDQGCCsG
 AQUFBzAChihyc3luYzovL3dvbWJhdHMtci11cy5oYWN0cm4ubmV0L0xJUjEuY2Vy
 MBoGCCsGAQUFBwEIAQH/BAswCaAHMAUCAwD8FTApBggrBgEFBQcBBwEB/wQaMBgw
-FgQCAAEwEDAOAwUAwAACAQMFAcAAAiAwDQYJKoZIhvcNAQELBQADggEBAFRp3zy8
-ZhZVJ8MRhX47+EkJaOqtUA3iqLGevOvKn4B7bl3FZSNsyHCds/EvxKkvLqpDOf4/
-+EXh27JbqIMxcxFDroinvxeeKC/3l4vrOSt7wU1Xefvo0RhDPp09asUQUSHN8A3v
-aFqFDHscNpOgTH+CjpDvd11BTHGfchr8vCLDjypIHpi9ps9spYzE/Q0qbDz1bKvg
-BO0CJvb7DKhPEif2JpvjozcM96ypqkAH4Qhn1kYlKgADwqd4H9iQ9ydul87vDCPl
-PEECPB7ZzotvtvONnwEgV8/7Au62wdiOcjfG23yuop3hRLhYJpUw0dyyakfBLnCG
-xdtuyuyPzJsQFyI=
+FgQCAAEwEDAOAwUAwAACAQMFAcAAAiAwDQYJKoZIhvcNAQELBQADggEBAAREUFrE
+aP0MelGZJ4CuCurKYk00ZezAGxZZ/kF2+gYGvk83Jux13lPHxt0nu3KrTw9rqTwZ
+I3afvWPI9Bv2pL3ahH2NxJZYWgmP4GyscGgSxXTbyUZAHiDTuBmMGCeKnaRHLu0p
+ozjZC/L+2SKALCySnVRCfmitMtBNrfQv0oAcm6wTaKcK+kHE8xwC2vjL1V5iphZW
+gc6C7DdWwlmaQfLBIj9j7qbKI+lgYgeELHMhWhaPbwZ8sMe7ZvCodW82JiQreg6h
+mhEob1MfdvtgnZ+Elx/NdsbeyPj5ZqjQeTEsOX/l9nY2uh5u6jEChmB1jffUxzXz
+Xoq1GDFGMH/gM9c=
 -----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/ISP2.cer b/scripts/resource-cert-samples/ISP2.cer
index 4ff96ef1..1d6affa1 100644
--- a/scripts/resource-cert-samples/ISP2.cer
+++ b/scripts/resource-cert-samples/ISP2.cer
@@ -1,12 +1,12 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 21 (0x15)
+        Serial Number: 23 (0x17)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=TEST ENTITY LIR1
         Validity
-            Not Before: Oct 19 19:06:07 2007 GMT
-            Not After : Oct 18 19:06:07 2008 GMT
+            Not Before: Oct 29 16:03:52 2007 GMT
+            Not After : Oct 28 16:03:52 2008 GMT
         Subject: CN=TEST ENTITY ISP2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -49,24 +49,24 @@ Certificate:
                   192.0.2.44-192.0.2.100
 
     Signature Algorithm: sha256WithRSAEncryption
-        5b:99:30:44:06:73:ab:e3:9b:92:9d:76:e1:4b:ac:71:0e:10:
-        d5:e9:1c:40:3a:c3:92:ae:b0:71:5e:0d:32:f6:4e:81:c6:37:
-        d3:19:ea:15:0e:12:6f:e6:65:0d:2c:cd:8c:41:b5:1f:bb:79:
-        dc:2a:ab:fe:7a:43:2b:97:45:d2:54:66:67:f2:3b:6a:3c:68:
-        e4:7c:d5:1d:83:47:2c:a0:91:71:29:a7:c1:6a:4a:44:1c:7a:
-        42:6f:ab:1f:af:3e:b5:89:52:e1:8c:9e:d5:55:e6:b1:f0:db:
-        7c:5d:51:bc:87:41:61:2f:e6:72:33:43:d2:8e:83:16:26:d0:
-        1d:c4:21:2c:18:a5:7b:d3:3d:7d:fb:70:c2:6e:ec:1c:9b:a4:
-        b4:59:3a:bd:fa:65:a9:3f:ae:73:28:a4:25:df:80:cd:14:61:
-        63:05:49:31:5d:3c:b3:f9:ff:ec:07:6a:28:c1:43:e9:bc:37:
-        08:ee:af:d6:41:cf:9f:63:a0:2b:63:e3:a5:84:83:74:23:19:
-        b4:ac:36:bb:91:cd:ec:9d:c4:66:8a:f8:11:e8:d4:c3:f7:eb:
-        28:c2:95:5e:9c:7f:b5:03:14:c0:db:ce:ca:fc:b5:85:16:80:
-        36:94:fc:ab:af:d3:6f:a4:de:db:13:51:95:5d:c2:49:5a:14:
-        8d:27:55:e2
+        26:19:f6:80:86:41:d6:c1:4f:73:58:9c:58:e4:79:9a:2e:9b:
+        d6:ab:1e:1e:e4:75:62:bb:7b:7e:e7:a1:fa:ea:81:83:f2:e3:
+        c8:e0:c2:fa:a1:5c:42:e9:f4:e0:41:2e:fa:3c:64:23:2f:d1:
+        77:52:59:2d:a5:1e:fe:6e:fa:32:a4:1e:07:cd:d7:f9:f7:b7:
+        c3:95:62:a0:c8:88:33:76:2f:9e:e5:75:d6:8e:18:20:ef:4f:
+        0a:b3:33:39:14:04:1d:87:42:ba:8f:f9:14:b0:48:c8:e3:4e:
+        41:d9:25:f5:95:58:23:03:4c:3a:ab:60:7e:1e:3c:e1:77:d7:
+        a4:a8:14:04:d0:5e:68:89:42:5d:3c:ee:d1:f7:3c:3a:e5:18:
+        0d:95:77:5f:fe:24:f8:dd:3d:0b:9d:df:56:3f:ff:ff:3b:aa:
+        d2:50:cf:34:17:d5:bb:09:50:72:ed:83:85:4f:a9:07:fe:ec:
+        82:36:74:61:79:b7:54:37:0a:10:dc:fc:69:17:d5:31:89:63:
+        f6:e2:45:2a:b1:8f:b2:58:23:8e:5b:25:1f:c0:42:c6:76:67:
+        eb:85:62:cb:94:c0:d2:5f:1a:1a:c6:cb:46:c3:e8:2f:6b:e4:
+        62:f2:ab:4c:0d:f5:aa:8c:32:10:b2:cd:a7:23:2c:a6:3d:b2:
+        3b:8e:6f:f4
 -----BEGIN CERTIFICATE-----
-MIIDqTCCApGgAwIBAgIBFTANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
-IEVOVElUWSBMSVIxMB4XDTA3MTAxOTE5MDYwN1oXDTA4MTAxODE5MDYwN1owGzEZ
+MIIDqTCCApGgAwIBAgIBFzANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
+IEVOVElUWSBMSVIxMB4XDTA3MTAyOTE2MDM1MloXDTA4MTAyODE2MDM1MlowGzEZ
 MBcGA1UEAxMQVEVTVCBFTlRJVFkgSVNQMjCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBANB338Qhrxtaa6inKNdDyJttJdiNf5Er45X9kmCsFBLXI2iFSw7b
 K+Y44EjbGDePQMCQWA4/CWdfjj8EdQZgkkLz5EUENZVd6SJCLPZcpn15jOEIGXw1
@@ -79,10 +79,10 @@ BAMCAQYwQQYIKwYBBQUHAQsENTAzMDEGCCsGAQUFBzAFhiVyc3luYzovL3dvbWJh
 dHMtci11cy5oYWN0cm4ubmV0L0lTUDIvMEQGCCsGAQUFBwEBBDgwNjA0BggrBgEF
 BQcwAoYocnN5bmM6Ly93b21iYXRzLXItdXMuaGFjdHJuLm5ldC9MSVIxLmNlcjAp
 BggrBgEFBQcBBwEB/wQaMBgwFgQCAAEwEDAOAwUCwAACLAMFAMAAAmQwDQYJKoZI
-hvcNAQELBQADggEBAFuZMEQGc6vjm5KdduFLrHEOENXpHEA6w5KusHFeDTL2ToHG
-N9MZ6hUOEm/mZQ0szYxBtR+7edwqq/56QyuXRdJUZmfyO2o8aOR81R2DRyygkXEp
-p8FqSkQcekJvqx+vPrWJUuGMntVV5rHw23xdUbyHQWEv5nIzQ9KOgxYm0B3EISwY
-pXvTPX37cMJu7BybpLRZOr36Zak/rnMopCXfgM0UYWMFSTFdPLP5/+wHaijBQ+m8
-Nwjur9ZBz59joCtj46WEg3QjGbSsNruRzeydxGaK+BHo1MP36yjClV6cf7UDFMDb
-zsr8tYUWgDaU/Kuv02+k3tsTUZVdwklaFI0nVeI=
+hvcNAQELBQADggEBACYZ9oCGQdbBT3NYnFjkeZoum9arHh7kdWK7e37nofrqgYPy
+48jgwvqhXELp9OBBLvo8ZCMv0XdSWS2lHv5u+jKkHgfN1/n3t8OVYqDIiDN2L57l
+ddaOGCDvTwqzMzkUBB2HQrqP+RSwSMjjTkHZJfWVWCMDTDqrYH4ePOF316SoFATQ
+XmiJQl087tH3PDrlGA2Vd1/+JPjdPQud31Y///87qtJQzzQX1bsJUHLtg4VPqQf+
+7II2dGF5t1Q3ChDc/GkX1TGJY/biRSqxj7JYI45bJR/AQsZ2Z+uFYsuUwNJfGhrG
+y0bD6C9r5GLyq0wN9aqMMhCyzacjLKY9sjuOb/Q=
 -----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/ISP3.cer b/scripts/resource-cert-samples/ISP3.cer
index 45d8df97..d3d0cfac 100644
--- a/scripts/resource-cert-samples/ISP3.cer
+++ b/scripts/resource-cert-samples/ISP3.cer
@@ -1,12 +1,12 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 22 (0x16)
+        Serial Number: 24 (0x18)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=TEST ENTITY LIR2
         Validity
-            Not Before: Oct 19 19:06:07 2007 GMT
-            Not After : Oct 18 19:06:07 2008 GMT
+            Not Before: Oct 29 16:03:52 2007 GMT
+            Not After : Oct 28 16:03:52 2008 GMT
         Subject: CN=TEST ENTITY ISP3
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -49,24 +49,24 @@ Certificate:
                   2001:db8:0:0:0:0:0:44-2001:db8:0:0:0:0:0:100
 
     Signature Algorithm: sha256WithRSAEncryption
-        c9:f3:8e:d8:05:88:2d:19:ef:5d:2a:09:16:52:73:01:fa:86:
-        22:a6:ec:1c:27:02:13:5c:0e:25:8f:0a:8b:da:a9:d3:5b:68:
-        db:54:0f:6b:28:47:3e:cf:16:e8:15:d1:01:eb:c0:f3:30:f5:
-        8b:62:3c:29:97:be:29:45:2d:60:36:04:eb:cc:38:24:8f:eb:
-        2c:5b:e9:c0:36:ff:a9:22:b3:6b:f5:fb:e9:a9:69:71:c5:f2:
-        41:64:a4:2f:1f:b4:ad:56:01:c3:d9:02:c6:b8:88:de:fb:9a:
-        fd:31:95:47:87:ba:97:7c:3c:0c:7d:ad:31:3f:0f:67:66:b7:
-        c3:15:46:7c:7b:2c:8d:3d:82:2b:6f:85:91:97:9d:9c:4e:f1:
-        0d:92:d6:5e:48:ed:d6:94:f5:e5:ad:17:09:38:af:97:1f:0d:
-        af:b3:f1:f1:88:37:83:05:c0:1b:d7:32:5d:4a:9e:ae:ae:05:
-        db:a5:51:e2:20:a3:88:29:73:ac:9d:31:f0:20:79:5f:e1:95:
-        cb:79:68:bf:36:16:61:71:db:05:57:92:d1:cc:f4:6d:99:a8:
-        8b:14:8f:40:03:0b:91:7e:68:42:3a:ab:fd:de:1c:4b:3c:33:
-        0e:2f:89:be:67:28:a8:e5:47:cd:c5:dc:26:1b:d2:fe:22:7b:
-        7c:75:7f:9b
+        1f:e4:62:d3:16:47:b1:20:de:bd:de:98:ec:ec:0e:8f:89:3e:
+        61:c7:4c:40:6f:4c:41:e8:f6:e7:b1:c1:f3:09:5a:6d:e6:53:
+        62:fd:44:de:d5:42:01:73:d6:5c:ca:39:dc:97:8d:2c:29:83:
+        4a:a3:09:dd:dc:44:9b:12:6e:d7:be:93:e0:2e:d2:a4:6f:16:
+        1c:4a:e7:fc:3d:d9:5a:59:95:2f:6c:54:a5:cb:25:82:9b:4f:
+        ed:3e:24:13:5b:38:69:37:dc:f2:58:1b:c9:b0:74:a7:12:36:
+        b4:23:b7:db:63:bb:ff:3e:bd:82:e2:b4:bf:1c:13:22:2a:b8:
+        5a:cc:f2:4c:55:e0:48:36:fe:07:62:b7:8a:3a:4e:51:19:7c:
+        0d:1b:19:0c:83:28:45:e4:c1:9b:b7:bd:4a:9c:eb:f4:90:87:
+        83:39:7c:b2:cf:4d:78:2a:2b:b4:e7:4f:ee:63:54:13:5a:ac:
+        1e:82:c0:e4:3d:7d:a3:40:6d:a0:22:64:25:e8:af:5d:e9:f6:
+        85:1a:a7:98:e0:77:f4:94:03:3c:84:62:e0:f1:be:f5:e4:53:
+        aa:0c:b9:24:19:b4:92:e1:05:4b:eb:16:ab:3c:3d:cc:60:c2:
+        ce:69:d5:66:4a:29:12:72:3e:85:f7:06:97:f3:b4:ba:26:5a:
+        d1:f5:2c:a8
 -----BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBFjANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
-IEVOVElUWSBMSVIyMB4XDTA3MTAxOTE5MDYwN1oXDTA4MTAxODE5MDYwN1owGzEZ
+MIIDwzCCAqugAwIBAgIBGDANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
+IEVOVElUWSBMSVIyMB4XDTA3MTAyOTE2MDM1MloXDTA4MTAyODE2MDM1MlowGzEZ
 MBcGA1UEAxMQVEVTVCBFTlRJVFkgSVNQMzCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBANEkdcFEKRKa/owdHgGqBeofR6sajc/SQqExfZw+ZnLOLN8BFxVA
 QJTRrm3Xyv1S2exf8GQwo0JwoaFvBS0Q7rEFZT/ywXiEzB1m7jVSx66ZdrFjTcEu
@@ -79,11 +79,11 @@ hwX5Uqg2YWLekGghg7uMg0evu4I+RCiXKwKogQQFFs2/754C+VRmKiiZeSu1GRDU
 YmF0cy1yLXVzLmhhY3Rybi5uZXQvSVNQMy8wRAYIKwYBBQUHAQEEODA2MDQGCCsG
 AQUFBzAChihyc3luYzovL3dvbWJhdHMtci11cy5oYWN0cm4ubmV0L0xJUjIuY2Vy
 MEEGCCsGAQUFBwEHAQH/BDIwMDAuBAIAAjAoMCYDEQIgAQ24AAAAAAAAAAAAAABE
-AxEAIAENuAAAAAAAAAAAAAABADANBgkqhkiG9w0BAQsFAAOCAQEAyfOO2AWILRnv
-XSoJFlJzAfqGIqbsHCcCE1wOJY8Ki9qp01to21QPayhHPs8W6BXRAevA8zD1i2I8
-KZe+KUUtYDYE68w4JI/rLFvpwDb/qSKza/X76alpccXyQWSkLx+0rVYBw9kCxriI
-3vua/TGVR4e6l3w8DH2tMT8PZ2a3wxVGfHssjT2CK2+FkZednE7xDZLWXkjt1pT1
-5a0XCTivlx8Nr7Px8Yg3gwXAG9cyXUqerq4F26VR4iCjiClzrJ0x8CB5X+GVy3lo
-vzYWYXHbBVeS0cz0bZmoixSPQAMLkX5oQjqr/d4cSzwzDi+JvmcoqOVHzcXcJhvS
-/iJ7fHV/mw==
+AxEAIAENuAAAAAAAAAAAAAABADANBgkqhkiG9w0BAQsFAAOCAQEAH+Ri0xZHsSDe
+vd6Y7OwOj4k+YcdMQG9MQej257HB8wlabeZTYv1E3tVCAXPWXMo53JeNLCmDSqMJ
+3dxEmxJu176T4C7SpG8WHErn/D3ZWlmVL2xUpcslgptP7T4kE1s4aTfc8lgbybB0
+pxI2tCO322O7/z69guK0vxwTIiq4WszyTFXgSDb+B2K3ijpOURl8DRsZDIMoReTB
+m7e9Spzr9JCHgzl8ss9NeCortOdP7mNUE1qsHoLA5D19o0BtoCJkJeivXen2hRqn
+mOB39JQDPIRi4PG+9eRTqgy5JBm0kuEFS+sWqzw9zGDCzmnVZkopEnI+hfcGl/O0
+uiZa0fUsqA==
 -----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/ISP4.cer b/scripts/resource-cert-samples/ISP4.cer
index 8b2c9de2..881741df 100644
--- a/scripts/resource-cert-samples/ISP4.cer
+++ b/scripts/resource-cert-samples/ISP4.cer
@@ -1,12 +1,12 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 21 (0x15)
+        Serial Number: 23 (0x17)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=TEST ENTITY LIR2
         Validity
-            Not Before: Oct 19 19:06:07 2007 GMT
-            Not After : Oct 18 19:06:07 2008 GMT
+            Not Before: Oct 29 16:03:52 2007 GMT
+            Not After : Oct 28 16:03:52 2008 GMT
         Subject: CN=TEST ENTITY ISP4
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -53,24 +53,24 @@ Certificate:
                   2001:db8:0:0:0:10:0:44/128
 
     Signature Algorithm: sha256WithRSAEncryption
-        d5:47:18:ec:04:c6:96:47:1d:cc:78:2c:ca:f4:89:7a:bb:9f:
-        92:b3:3a:f0:64:2e:36:34:25:98:0d:d7:74:95:5b:2a:9d:ee:
-        00:42:52:17:35:c9:66:b4:7c:8c:15:84:1a:35:ee:e7:9e:21:
-        93:6e:ab:67:a1:e3:7d:66:51:47:14:cb:13:f9:ae:e3:0e:75:
-        c6:ec:34:1d:97:85:7f:a2:c0:e0:f5:c7:d6:e4:ce:67:97:46:
-        9c:72:2d:32:27:d3:05:c9:5e:d4:67:81:c9:7c:0a:e5:16:4f:
-        37:6d:c2:e0:2b:a1:e9:de:ce:e9:05:28:3c:98:6b:51:0b:1f:
-        d7:27:98:3e:90:8a:79:24:29:72:d6:0d:f7:db:78:16:53:bd:
-        94:b6:04:40:37:a7:bc:ca:38:d4:eb:9a:5f:de:45:8d:1d:c7:
-        5f:58:a6:95:eb:77:1a:b1:66:cb:f6:cc:a2:f2:34:2c:db:b2:
-        d4:71:6e:08:9e:ad:58:40:13:13:5d:2e:5d:5a:5a:f0:38:1c:
-        51:fa:ba:2d:9c:cb:6b:3c:86:bf:b6:73:53:83:66:a0:97:f6:
-        37:9d:37:f4:9e:82:0f:f8:be:2c:a6:28:a9:04:fa:70:bb:f8:
-        d3:6a:1a:2c:c0:c7:97:6b:d6:8a:9c:f4:50:7b:0e:26:6a:a4:
-        05:e2:b1:0f
+        16:93:aa:d0:4e:99:13:31:ad:92:a7:ed:88:46:05:31:3e:ea:
+        46:16:93:44:64:30:98:c3:20:62:b6:f4:05:e8:f5:ca:2d:46:
+        65:6b:d0:47:24:cf:aa:95:56:6c:61:22:ce:38:8a:3c:33:6e:
+        ef:2e:f6:f0:6f:35:47:7e:bb:c9:97:be:da:87:38:9c:dd:d4:
+        2f:b1:0a:43:c0:60:65:92:aa:c1:a7:6b:4a:b0:bd:65:e8:89:
+        f1:20:0e:02:f5:31:79:aa:32:9e:fb:e2:c6:0f:43:58:e5:3b:
+        41:10:8c:8b:2b:64:0b:10:68:6e:a5:f1:b2:8c:38:be:b5:5b:
+        82:df:af:17:58:ff:fc:37:ee:fe:9b:37:53:2c:d7:90:01:d3:
+        c5:38:8b:5f:85:bd:02:3e:00:1f:e1:e4:75:19:ad:e2:d3:5f:
+        eb:48:32:e6:82:79:fc:36:cf:9e:dc:aa:13:f4:36:69:87:e0:
+        f3:4e:d1:21:2d:f6:04:d1:c0:37:55:5e:2f:58:b3:65:49:ed:
+        24:96:33:9a:fe:d9:ba:a8:61:ab:45:2f:95:8d:39:33:17:15:
+        c1:bf:26:01:79:40:43:1b:50:40:0d:98:39:5a:d5:2b:af:9f:
+        fd:8a:5d:b6:20:01:c6:0f:03:00:d5:39:75:f7:24:62:9c:bf:
+        6b:a5:f8:a8
 -----BEGIN CERTIFICATE-----
-MIIDyjCCArKgAwIBAgIBFTANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
-IEVOVElUWSBMSVIyMB4XDTA3MTAxOTE5MDYwN1oXDTA4MTAxODE5MDYwN1owGzEZ
+MIIDyjCCArKgAwIBAgIBFzANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
+IEVOVElUWSBMSVIyMB4XDTA3MTAyOTE2MDM1MloXDTA4MTAyODE2MDM1MlowGzEZ
 MBcGA1UEAxMQVEVTVCBFTlRJVFkgSVNQNDCCASIwDQYJKoZIhvcNAQEBBQADggEP
 ADCCAQoCggEBALMFrfsG20mBrd9QBOAY6PH0g+YmS578LRzf4itXOEjrxBOj/WzF
 4hzVOv1m1/8u/0q3WsX0GbGNnqhJTjsgRtoI3rCccV53qRTiTCAO/8Ug+vNtOwvO
@@ -83,11 +83,11 @@ bddxqYxNI9JDrtf45WkrrhOGEyc4ckhw+B8CAwEAAaOCARcwggETMA8GA1UdEwEB
 YmF0cy1yLXVzLmhhY3Rybi5uZXQvSVNQNC8wRAYIKwYBBQUHAQEEODA2MDQGCCsG
 AQUFBzAChihyc3luYzovL3dvbWJhdHMtci11cy5oYWN0cm4ubmV0L0xJUjIuY2Vy
 MBoGCCsGAQUFBwEIAQH/BAswCaAHMAUCAwD8IDAsBggrBgEFBQcBBwEB/wQdMBsw
-GQQCAAIwEwMRACABDbgAAAAAAAAAEAAAAEQwDQYJKoZIhvcNAQELBQADggEBANVH
-GOwExpZHHcx4LMr0iXq7n5KzOvBkLjY0JZgN13SVWyqd7gBCUhc1yWa0fIwVhBo1
-7ueeIZNuq2eh431mUUcUyxP5ruMOdcbsNB2XhX+iwOD1x9bkzmeXRpxyLTIn0wXJ
-XtRngcl8CuUWTzdtwuAroenezukFKDyYa1ELH9cnmD6QinkkKXLWDffbeBZTvZS2
-BEA3p7zKONTrml/eRY0dx19YppXrdxqxZsv2zKLyNCzbstRxbgierVhAExNdLl1a
-WvA4HFH6ui2cy2s8hr+2c1ODZqCX9jedN/Segg/4viymKKkE+nC7+NNqGizAx5dr
-1oqc9FB7DiZqpAXisQ8=
+GQQCAAIwEwMRACABDbgAAAAAAAAAEAAAAEQwDQYJKoZIhvcNAQELBQADggEBABaT
+qtBOmRMxrZKn7YhGBTE+6kYWk0RkMJjDIGK29AXo9cotRmVr0Eckz6qVVmxhIs44
+ijwzbu8u9vBvNUd+u8mXvtqHOJzd1C+xCkPAYGWSqsGna0qwvWXoifEgDgL1MXmq
+Mp774sYPQ1jlO0EQjIsrZAsQaG6l8bKMOL61W4LfrxdY//w37v6bN1Ms15AB08U4
+i1+FvQI+AB/h5HUZreLTX+tIMuaCefw2z57cqhP0NmmH4PNO0SEt9gTRwDdVXi9Y
+s2VJ7SSWM5r+2bqoYatFL5WNOTMXFcG/JgF5QEMbUEANmDla1Suvn/2KXbYgAcYP
+AwDVOXX3JGKcv2ul+Kg=
 -----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/ISP5a.cer b/scripts/resource-cert-samples/ISP5a.cer
index 53d5d71f..d264ae2f 100644
--- a/scripts/resource-cert-samples/ISP5a.cer
+++ b/scripts/resource-cert-samples/ISP5a.cer
@@ -1,12 +1,12 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 21 (0x15)
+        Serial Number: 24 (0x18)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=TEST ENTITY LIR3
         Validity
-            Not Before: Oct 19 19:06:07 2007 GMT
-            Not After : Oct 18 19:06:07 2008 GMT
+            Not Before: Oct 29 16:03:52 2007 GMT
+            Not After : Oct 28 16:03:52 2008 GMT
         Subject: CN=TEST ENTITY ISP5a
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -51,24 +51,24 @@ Certificate:
                   2001:db8:0:0:0:0:a00::/120
 
     Signature Algorithm: sha256WithRSAEncryption
-        88:85:75:52:a4:57:62:32:86:d7:72:f8:f5:a2:ea:4c:a9:a7:
-        09:c7:a8:b0:12:0e:e1:69:d2:99:de:46:59:52:d8:ef:9e:3f:
-        45:8e:b4:03:cf:64:e1:db:f0:57:37:e8:f3:23:d2:7e:f4:6a:
-        74:64:3a:7a:3b:e1:e6:bb:0d:f0:1d:12:e3:1a:59:c3:b5:6f:
-        29:b7:80:3c:c2:76:2a:b2:be:09:3a:95:99:5a:82:05:b4:10:
-        70:f0:29:2f:96:27:0c:c4:83:e6:df:e0:ce:37:ad:32:0a:0b:
-        a8:38:4b:a8:50:e9:17:61:c6:fb:bc:41:54:8b:fc:e4:a7:e9:
-        69:03:23:90:2c:bd:3f:e5:74:13:91:89:77:df:88:cb:4c:58:
-        af:be:7e:af:e7:2c:e2:28:64:e6:5f:f3:09:a0:21:89:12:85:
-        89:50:a2:ff:d6:88:c0:9f:25:5b:40:b1:b2:6f:6c:bb:d3:32:
-        b9:24:9c:70:bb:94:be:63:a2:da:fb:a8:2c:8b:ff:83:00:8b:
-        8d:cb:8f:cc:6d:b8:05:ba:0d:b3:67:05:ff:f6:40:2d:bb:7d:
-        c5:0d:df:6d:42:d4:79:11:2c:12:34:55:8a:63:4b:50:e4:95:
-        92:86:36:b8:a6:24:15:33:40:7f:c7:32:b9:de:fc:fd:eb:60:
-        eb:81:3d:e2
+        31:60:cb:59:95:02:29:ad:2e:2d:92:c4:e9:61:2b:e7:a2:bc:
+        39:70:7b:b0:62:af:56:08:81:c5:50:7f:ec:4e:d4:ff:7f:4a:
+        c7:34:4c:d5:dd:dc:dd:92:64:f7:5f:7b:ab:3c:9d:9d:15:b8:
+        c4:73:31:eb:c6:2d:af:0c:1f:a9:05:e7:3e:28:a8:1d:f0:6f:
+        ca:4b:c9:76:ff:5b:95:dd:d8:48:4a:d6:93:10:3a:1a:36:3d:
+        2a:10:2c:89:c5:19:fa:e8:fa:eb:b8:51:37:de:af:30:e3:ae:
+        09:d3:21:9c:83:4a:c1:70:ec:f6:f3:4b:72:40:75:61:02:bd:
+        fc:1b:96:e2:24:39:be:9a:43:29:8c:d7:c6:90:e2:14:fd:5e:
+        22:9f:32:45:67:d2:f6:6d:45:5e:43:e6:1c:ed:74:18:2c:9c:
+        ba:eb:a5:ee:76:2b:5f:b1:7a:06:18:94:95:52:58:fe:ef:61:
+        d9:f0:fd:ba:b4:88:af:a3:78:f1:d9:36:42:4f:df:55:f9:9e:
+        4d:f1:c9:12:85:f6:6c:1f:a5:1b:17:f2:2a:4a:1e:65:fa:18:
+        1a:22:ee:c6:fb:b9:65:1d:30:1a:a7:f9:78:87:27:a5:c8:4a:
+        35:6d:92:2d:f0:13:75:a2:77:df:fa:28:d0:68:0b:19:7f:38:
+        f3:64:0c:93
 -----BEGIN CERTIFICATE-----
-MIIDvTCCAqWgAwIBAgIBFTANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
-IEVOVElUWSBMSVIzMB4XDTA3MTAxOTE5MDYwN1oXDTA4MTAxODE5MDYwN1owHDEa
+MIIDvTCCAqWgAwIBAgIBGDANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
+IEVOVElUWSBMSVIzMB4XDTA3MTAyOTE2MDM1MloXDTA4MTAyODE2MDM1MlowHDEa
 MBgGA1UEAxMRVEVTVCBFTlRJVFkgSVNQNWEwggEiMA0GCSqGSIb3DQEBAQUAA4IB
 DwAwggEKAoIBAQDmS614KGvmUBtlgdWNK1Z3zbvJR6CqMrAsrB/x5JArwjNv51Ox
 0B2rBSedt6HuqE/IWzYj4xLkUVknzf16qtxWBaFzq3ndPIKyj6757MA2OOYCqv2J
@@ -81,11 +81,11 @@ Af8EBAMCAQYwQgYIKwYBBQUHAQsENjA0MDIGCCsGAQUFBzAFhiZyc3luYzovL3dv
 bWJhdHMtci11cy5oYWN0cm4ubmV0L0lTUDVhLzBEBggrBgEFBQcBAQQ4MDYwNAYI
 KwYBBQUHMAKGKHJzeW5jOi8vd29tYmF0cy1yLXVzLmhhY3Rybi5uZXQvTElSMy5j
 ZXIwOQYIKwYBBQUHAQcBAf8EKjAoMAwEAgABMAYDBAAKAAAwGAQCAAIwEgMQACAB
-DbgAAAAAAAAAAAoAADANBgkqhkiG9w0BAQsFAAOCAQEAiIV1UqRXYjKG13L49aLq
-TKmnCceosBIO4WnSmd5GWVLY754/RY60A89k4dvwVzfo8yPSfvRqdGQ6ejvh5rsN
-8B0S4xpZw7VvKbeAPMJ2KrK+CTqVmVqCBbQQcPApL5YnDMSD5t/gzjetMgoLqDhL
-qFDpF2HG+7xBVIv85KfpaQMjkCy9P+V0E5GJd9+Iy0xYr75+r+cs4ihk5l/zCaAh
-iRKFiVCi/9aIwJ8lW0Cxsm9su9MyuSSccLuUvmOi2vuoLIv/gwCLjcuPzG24BboN
-s2cF//ZALbt9xQ3fbULUeREsEjRVimNLUOSVkoY2uKYkFTNAf8cyud78/etg64E9
-4g==
+DbgAAAAAAAAAAAoAADANBgkqhkiG9w0BAQsFAAOCAQEAMWDLWZUCKa0uLZLE6WEr
+56K8OXB7sGKvVgiBxVB/7E7U/39KxzRM1d3c3ZJk9197qzydnRW4xHMx68Ytrwwf
+qQXnPiioHfBvykvJdv9bld3YSErWkxA6GjY9KhAsicUZ+uj667hRN96vMOOuCdMh
+nINKwXDs9vNLckB1YQK9/BuW4iQ5vppDKYzXxpDiFP1eIp8yRWfS9m1FXkPmHO10
+GCycuuul7nYrX7F6BhiUlVJY/u9h2fD9urSIr6N48dk2Qk/fVfmeTfHJEoX2bB+l
+GxfyKkoeZfoYGiLuxvu5ZR0wGqf5eIcnpchKNW2SLfATdaJ33/oo0GgLGX8482QM
+kw==
 -----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/ISP5b.cer b/scripts/resource-cert-samples/ISP5b.cer
index 6173347f..b4d63508 100644
--- a/scripts/resource-cert-samples/ISP5b.cer
+++ b/scripts/resource-cert-samples/ISP5b.cer
@@ -1,12 +1,12 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 20 (0x14)
+        Serial Number: 23 (0x17)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=TEST ENTITY LIR3
         Validity
-            Not Before: Oct 19 19:06:07 2007 GMT
-            Not After : Oct 18 19:06:07 2008 GMT
+            Not Before: Oct 29 16:03:52 2007 GMT
+            Not After : Oct 28 16:03:52 2008 GMT
         Subject: CN=TEST ENTITY ISP5b
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -51,24 +51,24 @@ Certificate:
                   2001:db8:0:0:0:0:a03::/120
 
     Signature Algorithm: sha256WithRSAEncryption
-        22:c9:29:33:23:37:da:af:8a:41:20:fe:35:f1:2a:25:86:ba:
-        88:08:d5:a5:26:79:f7:86:75:50:9b:ef:69:e0:c6:04:6b:0a:
-        e0:3f:06:78:ee:b5:9c:c3:23:45:8c:2b:f0:26:4d:9e:94:da:
-        c8:d0:a0:b3:71:bd:b5:89:dc:f5:0a:c5:56:a6:f8:1e:0f:fc:
-        27:cc:ec:42:ae:ca:7b:f6:61:f9:df:80:8d:87:85:e0:79:1b:
-        0c:32:82:37:e2:59:7c:65:7b:bd:48:ba:c0:13:24:74:f2:6a:
-        73:f8:47:a8:c7:7b:b3:89:0d:2e:5e:fc:09:06:5c:4d:4d:6e:
-        3b:c4:c1:57:c7:59:68:96:bd:97:91:df:91:d9:9d:8c:08:ef:
-        82:7c:0a:dc:54:5b:7b:1d:d9:cb:1b:a6:ca:ce:82:1b:1c:4e:
-        cb:42:2e:42:7a:8c:0b:00:74:2c:b6:14:41:fc:e8:51:f0:20:
-        1b:81:61:3d:47:ef:a2:9b:0d:0b:89:57:11:34:9f:f2:21:9e:
-        c9:9f:f1:39:d0:2f:73:97:86:8a:cb:ab:90:67:76:25:06:8b:
-        a2:cf:94:1a:84:09:bd:0e:d1:28:52:7f:f1:52:69:9b:d2:66:
-        b9:51:7a:87:e2:b1:cf:b2:d2:c4:00:fe:16:d1:29:ac:f6:61:
-        6b:58:89:0d
+        6c:20:82:cb:ed:5f:a4:c6:fa:b5:4c:20:7d:e8:18:e7:a9:8a:
+        a4:43:aa:1b:0a:47:01:e9:d5:29:f2:58:40:e1:b0:64:37:b1:
+        54:e0:49:4c:b9:98:a4:41:b0:cf:33:87:c7:47:30:58:f9:46:
+        51:5d:d4:8c:65:24:59:a6:8a:01:c0:bc:46:38:45:fa:64:51:
+        eb:ff:87:7c:18:33:41:7e:e9:52:98:a6:0f:1a:d8:43:2f:34:
+        9d:14:b4:14:e8:68:2e:16:5f:06:a7:85:96:7e:dc:49:67:f9:
+        56:5b:42:1a:af:00:fb:b5:d3:84:b8:e0:79:3c:b6:b7:b9:f3:
+        04:fc:e4:9a:9f:74:6c:ea:ff:8a:14:9d:69:15:ac:b6:5b:09:
+        eb:78:64:a7:7d:81:f9:f1:c9:4c:73:ae:88:43:da:39:32:37:
+        4c:df:16:74:4d:dd:27:3a:bf:99:39:5c:a8:8d:f5:47:a8:60:
+        7c:3d:56:5b:ab:73:f7:57:26:00:55:16:f1:dc:ae:d7:e1:48:
+        ed:b0:32:75:aa:76:4c:5b:7e:ef:be:6f:bc:8c:1e:12:70:27:
+        25:3d:b6:fd:6e:34:3f:9b:9f:cb:13:37:26:f4:56:fc:5b:9d:
+        7c:b5:b9:7a:29:ff:ca:c0:55:bb:57:55:25:45:b5:a1:c4:2d:
+        3c:2d:9c:8d
 -----BEGIN CERTIFICATE-----
-MIIDvTCCAqWgAwIBAgIBFDANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
-IEVOVElUWSBMSVIzMB4XDTA3MTAxOTE5MDYwN1oXDTA4MTAxODE5MDYwN1owHDEa
+MIIDvTCCAqWgAwIBAgIBFzANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
+IEVOVElUWSBMSVIzMB4XDTA3MTAyOTE2MDM1MloXDTA4MTAyODE2MDM1MlowHDEa
 MBgGA1UEAxMRVEVTVCBFTlRJVFkgSVNQNWIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
 DwAwggEKAoIBAQC/j1nY/PodBHApznsBZCFA3FxD/kyviMhim76cco+KpTSKOyON
 m4pPv2asaHGc/WhZ9b+fTS611uP6vfNgU1y3EayVC8CHzZmelFeN7AW436r8jjjT
@@ -81,11 +81,11 @@ Af8EBAMCAQYwQgYIKwYBBQUHAQsENjA0MDIGCCsGAQUFBzAFhiZyc3luYzovL3dv
 bWJhdHMtci11cy5oYWN0cm4ubmV0L0lTUDViLzBEBggrBgEFBQcBAQQ4MDYwNAYI
 KwYBBQUHMAKGKHJzeW5jOi8vd29tYmF0cy1yLXVzLmhhY3Rybi5uZXQvTElSMy5j
 ZXIwOQYIKwYBBQUHAQcBAf8EKjAoMAwEAgABMAYDBAAKAwAwGAQCAAIwEgMQACAB
-DbgAAAAAAAAAAAoDADANBgkqhkiG9w0BAQsFAAOCAQEAIskpMyM32q+KQSD+NfEq
-JYa6iAjVpSZ594Z1UJvvaeDGBGsK4D8GeO61nMMjRYwr8CZNnpTayNCgs3G9tYnc
-9QrFVqb4Hg/8J8zsQq7Ke/Zh+d+AjYeF4HkbDDKCN+JZfGV7vUi6wBMkdPJqc/hH
-qMd7s4kNLl78CQZcTU1uO8TBV8dZaJa9l5HfkdmdjAjvgnwK3FRbex3Zyxumys6C
-GxxOy0IuQnqMCwB0LLYUQfzoUfAgG4FhPUfvopsNC4lXETSf8iGeyZ/xOdAvc5eG
-isurkGd2JQaLos+UGoQJvQ7RKFJ/8VJpm9JmuVF6h+Kxz7LSxAD+FtEprPZha1iJ
-DQ==
+DbgAAAAAAAAAAAoDADANBgkqhkiG9w0BAQsFAAOCAQEAbCCCy+1fpMb6tUwgfegY
+56mKpEOqGwpHAenVKfJYQOGwZDexVOBJTLmYpEGwzzOHx0cwWPlGUV3UjGUkWaaK
+AcC8RjhF+mRR6/+HfBgzQX7pUpimDxrYQy80nRS0FOhoLhZfBqeFln7cSWf5VltC
+Gq8A+7XThLjgeTy2t7nzBPzkmp90bOr/ihSdaRWstlsJ63hkp32B+fHJTHOuiEPa
+OTI3TN8WdE3dJzq/mTlcqI31R6hgfD1WW6tz91cmAFUW8dyu1+FI7bAydap2TFt+
+775vvIweEnAnJT22/W40P5ufyxM3JvRW/FudfLW5ein/ysBVu1dVJUW1ocQtPC2c
+jQ==
 -----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/ISP5c.cer b/scripts/resource-cert-samples/ISP5c.cer
index 3fea16ec..a35e6d8c 100644
--- a/scripts/resource-cert-samples/ISP5c.cer
+++ b/scripts/resource-cert-samples/ISP5c.cer
@@ -1,12 +1,12 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 19 (0x13)
+        Serial Number: 22 (0x16)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=TEST ENTITY LIR3
         Validity
-            Not Before: Oct 19 19:06:07 2007 GMT
-            Not After : Oct 18 19:06:07 2008 GMT
+            Not Before: Oct 29 16:03:51 2007 GMT
+            Not After : Oct 28 16:03:51 2008 GMT
         Subject: CN=TEST ENTITY ISP5c
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -49,24 +49,24 @@ Certificate:
                   64534-64540
 
     Signature Algorithm: sha256WithRSAEncryption
-        36:12:96:70:b8:91:46:d3:30:35:cf:9b:f2:ce:98:5b:0c:25:
-        a6:3e:10:60:44:b3:1a:fc:3d:93:b6:f3:e9:50:30:aa:16:29:
-        18:6f:62:f1:02:2a:fd:51:02:79:5b:30:ee:2a:f9:fb:16:fb:
-        31:eb:ab:cf:cb:f8:af:82:ad:42:24:06:0c:c2:bd:88:c4:d9:
-        d3:b2:7a:51:e7:70:24:d1:33:73:ae:3f:9a:ec:7c:56:88:ae:
-        b3:0a:49:03:4a:74:11:02:96:c0:be:8c:8c:f3:d0:53:3e:63:
-        08:72:ce:6c:3d:6a:2f:c2:6a:7f:f5:1a:aa:af:f0:9a:03:be:
-        15:38:27:9a:e3:c4:53:8d:d3:69:bb:18:c6:2e:a5:25:ba:08:
-        f7:86:fe:c0:a1:a0:b0:60:3b:66:aa:52:d1:a0:92:87:1b:96:
-        52:ba:4e:32:0f:72:5d:6f:61:52:2c:c5:1b:b8:74:34:f5:77:
-        16:47:44:af:de:10:f7:0f:e8:ff:6e:6f:dd:a0:8e:3c:0b:b7:
-        5c:d8:76:00:1c:dd:26:ba:fd:a5:42:6e:ea:69:12:59:64:8d:
-        bc:5d:90:eb:5b:04:85:2f:e8:b7:a2:cb:af:9e:a8:0c:f6:c3:
-        bd:e0:b1:5b:58:12:36:b2:ed:bd:61:53:33:5c:4a:a2:d3:79:
-        e5:dc:54:56
+        8b:32:d1:76:91:99:a4:fe:a9:47:f9:ad:1b:e4:09:b2:91:49:
+        01:ea:21:09:e1:db:ae:45:07:73:e1:be:99:6b:e5:73:30:20:
+        57:95:c0:e0:9f:32:29:75:e7:fd:15:06:0c:48:aa:17:0a:4b:
+        21:9e:b2:b8:ba:03:d7:fb:40:69:19:80:28:c7:a4:bd:e0:63:
+        ec:e4:88:db:82:b9:03:bb:88:bb:48:40:c5:ea:34:4d:39:38:
+        5f:a1:0b:4b:8b:60:b6:a5:08:01:20:2b:44:b9:1b:2f:c6:72:
+        dc:90:4c:b3:56:9d:0c:64:dc:5e:d2:da:4e:4f:c5:63:22:18:
+        67:0b:77:fc:fd:7f:31:73:70:81:cd:f8:9a:67:07:6f:b2:b7:
+        ea:f4:68:19:86:9a:60:59:c4:3c:a1:ea:ba:09:6d:13:9d:3f:
+        76:cc:5f:2e:3f:e0:9b:5b:3c:72:5f:39:ed:9f:34:48:97:b3:
+        c1:bb:c5:de:5a:6b:11:71:ba:d1:c4:63:20:2c:bf:75:e8:c2:
+        4a:b8:80:b8:ac:bf:46:cc:d7:2a:8b:c3:63:23:ca:9e:8d:94:
+        2c:6a:53:2f:68:7e:cd:3d:71:fd:32:c7:f7:16:11:c6:a3:3a:
+        2f:1f:05:0c:98:3f:17:3d:8c:7a:e4:47:cd:75:55:f8:b3:1b:
+        a3:bc:27:3d
 -----BEGIN CERTIFICATE-----
-MIIDozCCAougAwIBAgIBEzANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
-IEVOVElUWSBMSVIzMB4XDTA3MTAxOTE5MDYwN1oXDTA4MTAxODE5MDYwN1owHDEa
+MIIDozCCAougAwIBAgIBFjANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
+IEVOVElUWSBMSVIzMB4XDTA3MTAyOTE2MDM1MVoXDTA4MTAyODE2MDM1MVowHDEa
 MBgGA1UEAxMRVEVTVCBFTlRJVFkgSVNQNWMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
 DwAwggEKAoIBAQDIi6ElZd/uon9Ur1IKGhr6DXWzPOngKdOJIOlRSWcsQ9qgLNRE
 s5YUqQd3YLlvAe+OVKV0rFpn+DBNEPmsn7h1YQv253zqm1yYeks+xOJZQtMZyg9Y
@@ -79,10 +79,10 @@ BAQDAgEGMEIGCCsGAQUFBwELBDYwNDAyBggrBgEFBQcwBYYmcnN5bmM6Ly93b21i
 YXRzLXItdXMuaGFjdHJuLm5ldC9JU1A1Yy8wRAYIKwYBBQUHAQEEODA2MDQGCCsG
 AQUFBzAChihyc3luYzovL3dvbWJhdHMtci11cy5oYWN0cm4ubmV0L0xJUjMuY2Vy
 MCEGCCsGAQUFBwEIAQH/BBIwEKAOMAwwCgIDAPwWAgMA/BwwDQYJKoZIhvcNAQEL
-BQADggEBADYSlnC4kUbTMDXPm/LOmFsMJaY+EGBEsxr8PZO28+lQMKoWKRhvYvEC
-Kv1RAnlbMO4q+fsW+zHrq8/L+K+CrUIkBgzCvYjE2dOyelHncCTRM3OuP5rsfFaI
-rrMKSQNKdBEClsC+jIzz0FM+Ywhyzmw9ai/Can/1Gqqv8JoDvhU4J5rjxFON02m7
-GMYupSW6CPeG/sChoLBgO2aqUtGgkocbllK6TjIPcl1vYVIsxRu4dDT1dxZHRK/e
-EPcP6P9ub92gjjwLt1zYdgAc3Sa6/aVCbuppEllkjbxdkOtbBIUv6Leiy6+eqAz2
-w73gsVtYEjay7b1hUzNcSqLTeeXcVFY=
+BQADggEBAIsy0XaRmaT+qUf5rRvkCbKRSQHqIQnh265FB3Phvplr5XMwIFeVwOCf
+Mil15/0VBgxIqhcKSyGesri6A9f7QGkZgCjHpL3gY+zkiNuCuQO7iLtIQMXqNE05
+OF+hC0uLYLalCAEgK0S5Gy/GctyQTLNWnQxk3F7S2k5PxWMiGGcLd/z9fzFzcIHN
++JpnB2+yt+r0aBmGmmBZxDyh6roJbROdP3bMXy4/4JtbPHJfOe2fNEiXs8G7xd5a
+axFxutHEYyAsv3Xowkq4gLisv0bM1yqLw2Mjyp6NlCxqUy9ofs09cf0yx/cWEcaj
+Oi8fBQyYPxc9jHrkR811VfizG6O8Jz0=
 -----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/LIR1.cer b/scripts/resource-cert-samples/LIR1.cer
index 7f7116ad..272d774d 100644
--- a/scripts/resource-cert-samples/LIR1.cer
+++ b/scripts/resource-cert-samples/LIR1.cer
@@ -1,12 +1,12 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 42 (0x2a)
+        Serial Number: 46 (0x2e)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=TEST ENTITY RIR
         Validity
-            Not Before: Oct 19 19:06:07 2007 GMT
-            Not After : Oct 18 19:06:07 2008 GMT
+            Not Before: Oct 29 16:03:51 2007 GMT
+            Not After : Oct 28 16:03:51 2008 GMT
         Subject: CN=TEST ENTITY LIR1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -54,24 +54,24 @@ Certificate:
                   192.0.2.44-192.0.2.100
 
     Signature Algorithm: sha256WithRSAEncryption
-        56:79:7d:ae:75:85:0f:e2:2f:f9:77:f6:34:78:f7:da:4f:d2:
-        6d:df:9d:6e:0d:ab:06:15:d9:e3:99:06:ab:7f:5d:09:ec:23:
-        2b:38:75:bf:f5:43:1d:3b:b9:a7:27:a9:77:89:ba:48:47:a5:
-        72:14:50:1b:33:3b:bc:cd:9b:5a:fb:17:f3:33:7e:14:59:24:
-        9c:5c:53:01:68:8a:34:db:43:e7:ef:1c:ad:e6:ba:82:e2:dc:
-        1c:e6:7e:59:64:5d:58:89:a1:01:c5:23:10:b0:32:c1:62:54:
-        97:e8:3b:b0:0c:51:52:12:56:ea:7a:4f:4c:b7:43:ef:d0:8c:
-        65:b3:39:de:7b:95:2b:e4:99:df:2e:d5:9e:b5:77:c6:4d:d4:
-        b8:0a:40:86:13:40:7f:53:ad:c6:5a:38:6a:48:1b:5e:da:7e:
-        5a:1b:d4:66:c0:cc:4e:e9:0d:48:4d:7f:f5:f0:9a:c8:17:63:
-        1a:08:80:34:35:ac:ad:b8:5f:26:a1:b7:dc:4f:08:98:3b:36:
-        2b:d1:65:6d:0c:ce:2d:77:94:88:79:a1:34:7a:55:74:7c:a0:
-        04:87:e1:a2:7b:1f:c1:06:f5:ea:61:d1:20:69:ea:cd:be:21:
-        b9:41:17:04:a4:3e:8f:bf:dc:da:51:b9:ea:41:77:f3:c0:f6:
-        02:65:c3:d5
+        51:ad:f6:e5:8b:1c:98:ed:f8:31:15:2c:ec:d5:be:9e:97:0d:
+        4a:f8:ab:6d:dd:35:6c:57:d1:d7:f1:c6:e4:c7:1d:b9:e6:c9:
+        5b:92:21:ec:64:79:9d:83:0f:5d:5e:5c:20:1b:8f:01:d5:a8:
+        e3:5f:7e:c3:0c:c2:3c:80:f7:f0:aa:e6:ff:c7:6a:16:7f:e7:
+        94:dc:69:42:1b:dd:36:f0:45:61:f5:cd:1f:a7:6f:20:04:af:
+        1e:6e:84:76:00:e2:6a:8d:02:81:31:a4:5f:3f:41:62:7a:87:
+        21:0b:da:08:6a:d3:90:4b:fe:c3:48:99:92:23:c9:f6:35:0b:
+        d8:48:9d:44:8c:e5:26:79:62:7a:78:c6:4b:18:42:65:0b:63:
+        a0:63:18:15:e6:8d:1d:93:12:15:eb:c3:93:c8:7d:10:5a:8f:
+        49:c5:a4:53:95:11:5c:db:f5:26:b7:2f:90:bd:6e:76:84:f9:
+        57:90:96:f5:25:75:7f:18:c6:4c:bb:aa:6a:ce:72:6d:0a:a7:
+        59:11:ea:9e:6f:b5:1f:5d:c9:db:f5:56:74:fe:ca:60:62:80:
+        b5:b1:6c:e7:24:d6:c4:c1:b0:05:0b:76:31:af:82:07:2d:9a:
+        a2:75:4d:18:54:0e:24:29:22:2d:02:ba:bd:51:cd:f0:02:6e:
+        5b:6e:12:f8
 -----BEGIN CERTIFICATE-----
-MIID1TCCAr2gAwIBAgIBKjANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
-IEVOVElUWSBSSVIwHhcNMDcxMDE5MTkwNjA3WhcNMDgxMDE4MTkwNjA3WjAbMRkw
+MIID1TCCAr2gAwIBAgIBLjANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
+IEVOVElUWSBSSVIwHhcNMDcxMDI5MTYwMzUxWhcNMDgxMDI4MTYwMzUxWjAbMRkw
 FwYDVQQDExBURVNUIEVOVElUWSBMSVIxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAr10c+dm71QHhWzbMUfb9hldgqp7H7E4Fr/tRXHrCWMSoV64UYum8
 tnJ9z0nISkCCSvQ+MLWUJZ5seIFXQ9aFAo3RnLXXNC/iqX0YJ7VHmkIWyJB/lizd
@@ -85,10 +85,10 @@ YXRzLXItdXMuaGFjdHJuLm5ldC9MSVIxLzBDBggrBgEFBQcBAQQ3MDUwMwYIKwYB
 BQUHMAKGJ3JzeW5jOi8vd29tYmF0cy1yLXVzLmhhY3Rybi5uZXQvUklSLmNlcjAa
 BggrBgEFBQcBCAEB/wQLMAmgBzAFAgMA/BUwOQYIKwYBBQUHAQcBAf8EKjAoMCYE
 AgABMCAwDgMFAMAAAgEDBQHAAAIgMA4DBQLAAAIsAwUAwAACZDANBgkqhkiG9w0B
-AQsFAAOCAQEAVnl9rnWFD+Iv+Xf2NHj32k/Sbd+dbg2rBhXZ45kGq39dCewjKzh1
-v/VDHTu5pyepd4m6SEelchRQGzM7vM2bWvsX8zN+FFkknFxTAWiKNNtD5+8crea6
-guLcHOZ+WWRdWImhAcUjELAywWJUl+g7sAxRUhJW6npPTLdD79CMZbM53nuVK+SZ
-3y7VnrV3xk3UuApAhhNAf1Otxlo4akgbXtp+WhvUZsDMTukNSE1/9fCayBdjGgiA
-NDWsrbhfJqG33E8ImDs2K9FlbQzOLXeUiHmhNHpVdHygBIfhonsfwQb16mHRIGnq
-zb4huUEXBKQ+j7/c2lG56kF388D2AmXD1Q==
+AQsFAAOCAQEAUa325YscmO34MRUs7NW+npcNSvirbd01bFfR1/HG5McduebJW5Ih
+7GR5nYMPXV5cIBuPAdWo419+wwzCPID38Krm/8dqFn/nlNxpQhvdNvBFYfXNH6dv
+IASvHm6EdgDiao0CgTGkXz9BYnqHIQvaCGrTkEv+w0iZkiPJ9jUL2EidRIzlJnli
+enjGSxhCZQtjoGMYFeaNHZMSFevDk8h9EFqPScWkU5URXNv1JrcvkL1udoT5V5CW
+9SV1fxjGTLuqas5ybQqnWRHqnm+1H13J2/VWdP7KYGKAtbFs5yTWxMGwBQt2Ma+C
+By2aonVNGFQOJCkiLQK6vVHN8AJuW24S+A==
 -----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/LIR1/17.pem b/scripts/resource-cert-samples/LIR1/17.pem
new file mode 100644
index 00000000..1d6affa1
--- /dev/null
+++ b/scripts/resource-cert-samples/LIR1/17.pem
@@ -0,0 +1,88 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 23 (0x17)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=TEST ENTITY LIR1
+        Validity
+            Not Before: Oct 29 16:03:52 2007 GMT
+            Not After : Oct 28 16:03:52 2008 GMT
+        Subject: CN=TEST ENTITY ISP2
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:d0:77:df:c4:21:af:1b:5a:6b:a8:a7:28:d7:43:
+                    c8:9b:6d:25:d8:8d:7f:91:2b:e3:95:fd:92:60:ac:
+                    14:12:d7:23:68:85:4b:0e:db:2b:e6:38:e0:48:db:
+                    18:37:8f:40:c0:90:58:0e:3f:09:67:5f:8e:3f:04:
+                    75:06:60:92:42:f3:e4:45:04:35:95:5d:e9:22:42:
+                    2c:f6:5c:a6:7d:79:8c:e1:08:19:7c:35:9d:3a:fd:
+                    e7:ff:9b:29:b5:ee:89:47:cc:0d:83:a0:e1:73:af:
+                    1f:09:84:a8:0b:83:cc:79:88:bf:7c:1d:73:d6:ab:
+                    42:1b:64:9a:5c:19:83:2b:9d:e5:ad:4c:58:05:76:
+                    95:70:23:ee:a5:c0:31:ca:a2:a7:c8:1d:1e:f2:c9:
+                    f2:3d:38:82:c2:53:e5:54:86:f2:7c:b1:73:e1:dc:
+                    e9:86:73:08:ac:59:3b:be:2f:58:c1:42:c5:80:18:
+                    8c:3a:0a:2a:32:f6:fe:28:d0:28:52:83:c6:30:69:
+                    51:90:59:19:9b:d3:d4:c2:e0:52:6a:c1:4e:59:9a:
+                    18:e4:78:2e:57:f9:7f:2b:5d:76:28:c9:c9:c5:7e:
+                    e5:43:a1:9b:68:d2:06:1c:be:3f:69:f9:c2:fa:9e:
+                    4f:68:cf:63:6f:db:6d:fc:67:35:c0:b1:6e:0a:37:
+                    ec:33
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                73:B2:16:1A:CD:DC:D7:30:60:0F:FA:81:95:F8:A2:F5:4E:95:F3:AD
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            Subject Information Access: 
+                1.3.6.1.5.5.7.48.5 - URI:rsync://wombats-r-us.hactrn.net/ISP2/
+
+            Authority Information Access: 
+                CA Issuers - URI:rsync://wombats-r-us.hactrn.net/LIR1.cer
+
+            sbgp-ipAddrBlock: critical
+                IPv4:
+                  192.0.2.44-192.0.2.100
+
+    Signature Algorithm: sha256WithRSAEncryption
+        26:19:f6:80:86:41:d6:c1:4f:73:58:9c:58:e4:79:9a:2e:9b:
+        d6:ab:1e:1e:e4:75:62:bb:7b:7e:e7:a1:fa:ea:81:83:f2:e3:
+        c8:e0:c2:fa:a1:5c:42:e9:f4:e0:41:2e:fa:3c:64:23:2f:d1:
+        77:52:59:2d:a5:1e:fe:6e:fa:32:a4:1e:07:cd:d7:f9:f7:b7:
+        c3:95:62:a0:c8:88:33:76:2f:9e:e5:75:d6:8e:18:20:ef:4f:
+        0a:b3:33:39:14:04:1d:87:42:ba:8f:f9:14:b0:48:c8:e3:4e:
+        41:d9:25:f5:95:58:23:03:4c:3a:ab:60:7e:1e:3c:e1:77:d7:
+        a4:a8:14:04:d0:5e:68:89:42:5d:3c:ee:d1:f7:3c:3a:e5:18:
+        0d:95:77:5f:fe:24:f8:dd:3d:0b:9d:df:56:3f:ff:ff:3b:aa:
+        d2:50:cf:34:17:d5:bb:09:50:72:ed:83:85:4f:a9:07:fe:ec:
+        82:36:74:61:79:b7:54:37:0a:10:dc:fc:69:17:d5:31:89:63:
+        f6:e2:45:2a:b1:8f:b2:58:23:8e:5b:25:1f:c0:42:c6:76:67:
+        eb:85:62:cb:94:c0:d2:5f:1a:1a:c6:cb:46:c3:e8:2f:6b:e4:
+        62:f2:ab:4c:0d:f5:aa:8c:32:10:b2:cd:a7:23:2c:a6:3d:b2:
+        3b:8e:6f:f4
+-----BEGIN CERTIFICATE-----
+MIIDqTCCApGgAwIBAgIBFzANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
+IEVOVElUWSBMSVIxMB4XDTA3MTAyOTE2MDM1MloXDTA4MTAyODE2MDM1MlowGzEZ
+MBcGA1UEAxMQVEVTVCBFTlRJVFkgSVNQMjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANB338Qhrxtaa6inKNdDyJttJdiNf5Er45X9kmCsFBLXI2iFSw7b
+K+Y44EjbGDePQMCQWA4/CWdfjj8EdQZgkkLz5EUENZVd6SJCLPZcpn15jOEIGXw1
+nTr95/+bKbXuiUfMDYOg4XOvHwmEqAuDzHmIv3wdc9arQhtkmlwZgyud5a1MWAV2
+lXAj7qXAMcqip8gdHvLJ8j04gsJT5VSG8nyxc+Hc6YZzCKxZO74vWMFCxYAYjDoK
+KjL2/ijQKFKDxjBpUZBZGZvT1MLgUmrBTlmaGOR4Llf5fytddijJycV+5UOhm2jS
+Bhy+P2n5wvqeT2jPY2/bbfxnNcCxbgo37DMCAwEAAaOB9zCB9DAPBgNVHRMBAf8E
+BTADAQH/MB0GA1UdDgQWBBRzshYazdzXMGAP+oGV+KL1TpXzrTAOBgNVHQ8BAf8E
+BAMCAQYwQQYIKwYBBQUHAQsENTAzMDEGCCsGAQUFBzAFhiVyc3luYzovL3dvbWJh
+dHMtci11cy5oYWN0cm4ubmV0L0lTUDIvMEQGCCsGAQUFBwEBBDgwNjA0BggrBgEF
+BQcwAoYocnN5bmM6Ly93b21iYXRzLXItdXMuaGFjdHJuLm5ldC9MSVIxLmNlcjAp
+BggrBgEFBQcBBwEB/wQaMBgwFgQCAAEwEDAOAwUCwAACLAMFAMAAAmQwDQYJKoZI
+hvcNAQELBQADggEBACYZ9oCGQdbBT3NYnFjkeZoum9arHh7kdWK7e37nofrqgYPy
+48jgwvqhXELp9OBBLvo8ZCMv0XdSWS2lHv5u+jKkHgfN1/n3t8OVYqDIiDN2L57l
+ddaOGCDvTwqzMzkUBB2HQrqP+RSwSMjjTkHZJfWVWCMDTDqrYH4ePOF316SoFATQ
+XmiJQl087tH3PDrlGA2Vd1/+JPjdPQud31Y///87qtJQzzQX1bsJUHLtg4VPqQf+
+7II2dGF5t1Q3ChDc/GkX1TGJY/biRSqxj7JYI45bJR/AQsZ2Z+uFYsuUwNJfGhrG
+y0bD6C9r5GLyq0wN9aqMMhCyzacjLKY9sjuOb/Q=
+-----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/LIR1/18.pem b/scripts/resource-cert-samples/LIR1/18.pem
new file mode 100644
index 00000000..c74d669a
--- /dev/null
+++ b/scripts/resource-cert-samples/LIR1/18.pem
@@ -0,0 +1,93 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 24 (0x18)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=TEST ENTITY LIR1
+        Validity
+            Not Before: Oct 29 16:03:52 2007 GMT
+            Not After : Oct 28 16:03:52 2008 GMT
+        Subject: CN=TEST ENTITY ISP1
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:eb:80:54:7a:74:4b:e4:81:15:d0:25:2d:5e:21:
+                    be:47:e6:31:ab:e2:fe:79:55:48:b7:36:55:3d:dc:
+                    11:88:5b:b7:36:be:d3:bb:d7:16:8d:f8:4b:f4:c5:
+                    bd:34:c4:8e:2c:67:97:e6:27:10:40:c5:36:f4:b6:
+                    6c:b9:29:82:2e:76:b0:29:ea:43:9a:d1:30:de:05:
+                    a1:c1:54:7c:17:67:1d:fc:29:dd:80:53:b2:81:30:
+                    db:13:ee:3e:e6:5d:c7:bc:3d:a6:11:6d:81:77:b7:
+                    9f:3e:36:df:7c:d6:d2:5a:22:36:68:7c:14:cc:ac:
+                    54:ed:ae:fd:e2:cd:b1:a3:5d:a9:65:ec:1b:8b:4b:
+                    cf:80:8e:a6:98:8f:69:b1:a6:35:bd:69:c9:2e:66:
+                    7f:22:11:66:56:c5:75:4c:81:a3:6e:49:71:0d:f5:
+                    75:87:13:e8:62:e8:1a:0c:a8:30:81:6a:be:90:59:
+                    23:3b:61:c0:15:5f:68:bf:b5:c9:3f:af:3a:a2:7f:
+                    80:01:78:f6:f4:55:ca:ee:ca:8d:08:9b:c5:3e:74:
+                    98:02:b2:0b:a6:d8:e8:6e:78:88:7b:95:76:b6:ca:
+                    be:f1:80:a9:dd:e8:3c:80:91:ce:3f:fd:0b:dd:b7:
+                    d8:a6:8c:94:20:07:19:74:fa:86:ff:cb:97:c3:f6:
+                    a4:e7
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                66:EC:29:21:2E:76:83:19:39:ED:8E:ED:B7:06:A8:4C:E5:0E:2E:11
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            Subject Information Access: 
+                1.3.6.1.5.5.7.48.5 - URI:rsync://wombats-r-us.hactrn.net/ISP1/
+
+            Authority Information Access: 
+                CA Issuers - URI:rsync://wombats-r-us.hactrn.net/LIR1.cer
+
+            sbgp-autonomousSysNum: critical
+                Autonomous System Numbers:
+                  64533
+
+            sbgp-ipAddrBlock: critical
+                IPv4:
+                  192.0.2.1-192.0.2.33
+
+    Signature Algorithm: sha256WithRSAEncryption
+        04:44:50:5a:c4:68:fd:0c:7a:51:99:27:80:ae:0a:ea:ca:62:
+        4d:34:65:ec:c0:1b:16:59:fe:41:76:fa:06:06:be:4f:37:26:
+        ec:75:de:53:c7:c6:dd:27:bb:72:ab:4f:0f:6b:a9:3c:19:23:
+        76:9f:bd:63:c8:f4:1b:f6:a4:bd:da:84:7d:8d:c4:96:58:5a:
+        09:8f:e0:6c:ac:70:68:12:c5:74:db:c9:46:40:1e:20:d3:b8:
+        19:8c:18:27:8a:9d:a4:47:2e:ed:29:a3:38:d9:0b:f2:fe:d9:
+        22:80:2c:2c:92:9d:54:42:7e:68:ad:32:d0:4d:ad:f4:2f:d2:
+        80:1c:9b:ac:13:68:a7:0a:fa:41:c4:f3:1c:02:da:f8:cb:d5:
+        5e:62:a6:16:56:81:ce:82:ec:37:56:c2:59:9a:41:f2:c1:22:
+        3f:63:ee:a6:ca:23:e9:60:62:07:84:2c:73:21:5a:16:8f:6f:
+        06:7c:b0:c7:bb:66:f0:a8:75:6f:36:26:24:2b:7a:0e:a1:9a:
+        11:28:6f:53:1f:76:fb:60:9d:9f:84:97:1f:cd:76:c6:de:c8:
+        f8:f9:66:a8:d0:79:31:2c:39:7f:e5:f6:76:36:ba:1e:6e:ea:
+        31:02:86:60:75:8d:f7:d4:c7:35:f3:5e:8a:b5:18:31:46:30:
+        7f:e0:33:d7
+-----BEGIN CERTIFICATE-----
+MIIDxzCCAq+gAwIBAgIBGDANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
+IEVOVElUWSBMSVIxMB4XDTA3MTAyOTE2MDM1MloXDTA4MTAyODE2MDM1MlowGzEZ
+MBcGA1UEAxMQVEVTVCBFTlRJVFkgSVNQMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAOuAVHp0S+SBFdAlLV4hvkfmMavi/nlVSLc2VT3cEYhbtza+07vX
+Fo34S/TFvTTEjixnl+YnEEDFNvS2bLkpgi52sCnqQ5rRMN4FocFUfBdnHfwp3YBT
+soEw2xPuPuZdx7w9phFtgXe3nz4233zW0loiNmh8FMysVO2u/eLNsaNdqWXsG4tL
+z4COppiPabGmNb1pyS5mfyIRZlbFdUyBo25JcQ31dYcT6GLoGgyoMIFqvpBZIzth
+wBVfaL+1yT+vOqJ/gAF49vRVyu7KjQibxT50mAKyC6bY6G54iHuVdrbKvvGAqd3o
+PICRzj/9C9232KaMlCAHGXT6hv/Ll8P2pOcCAwEAAaOCARQwggEQMA8GA1UdEwEB
+/wQFMAMBAf8wHQYDVR0OBBYEFGbsKSEudoMZOe2O7bcGqEzlDi4RMA4GA1UdDwEB
+/wQEAwIBBjBBBggrBgEFBQcBCwQ1MDMwMQYIKwYBBQUHMAWGJXJzeW5jOi8vd29t
+YmF0cy1yLXVzLmhhY3Rybi5uZXQvSVNQMS8wRAYIKwYBBQUHAQEEODA2MDQGCCsG
+AQUFBzAChihyc3luYzovL3dvbWJhdHMtci11cy5oYWN0cm4ubmV0L0xJUjEuY2Vy
+MBoGCCsGAQUFBwEIAQH/BAswCaAHMAUCAwD8FTApBggrBgEFBQcBBwEB/wQaMBgw
+FgQCAAEwEDAOAwUAwAACAQMFAcAAAiAwDQYJKoZIhvcNAQELBQADggEBAAREUFrE
+aP0MelGZJ4CuCurKYk00ZezAGxZZ/kF2+gYGvk83Jux13lPHxt0nu3KrTw9rqTwZ
+I3afvWPI9Bv2pL3ahH2NxJZYWgmP4GyscGgSxXTbyUZAHiDTuBmMGCeKnaRHLu0p
+ozjZC/L+2SKALCySnVRCfmitMtBNrfQv0oAcm6wTaKcK+kHE8xwC2vjL1V5iphZW
+gc6C7DdWwlmaQfLBIj9j7qbKI+lgYgeELHMhWhaPbwZ8sMe7ZvCodW82JiQreg6h
+mhEob1MfdvtgnZ+Elx/NdsbeyPj5ZqjQeTEsOX/l9nY2uh5u6jEChmB1jffUxzXz
+Xoq1GDFGMH/gM9c=
+-----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/LIR1/index b/scripts/resource-cert-samples/LIR1/index
index 32dc04cb..f99c30bc 100644
--- a/scripts/resource-cert-samples/LIR1/index
+++ b/scripts/resource-cert-samples/LIR1/index
@@ -20,3 +20,5 @@ V	080809011510Z		13	unknown	/CN=TEST ENTITY ISP2
 V	080809011511Z		14	unknown	/CN=TEST ENTITY ISP1
 V	081018190607Z		15	unknown	/CN=TEST ENTITY ISP2
 V	081018190608Z		16	unknown	/CN=TEST ENTITY ISP1
+V	081028160352Z		17	unknown	/CN=TEST ENTITY ISP2
+V	081028160352Z		18	unknown	/CN=TEST ENTITY ISP1
diff --git a/scripts/resource-cert-samples/LIR1/index.old b/scripts/resource-cert-samples/LIR1/index.old
index 54a0ba7e..5b557f46 100644
--- a/scripts/resource-cert-samples/LIR1/index.old
+++ b/scripts/resource-cert-samples/LIR1/index.old
@@ -19,3 +19,5 @@ V	080809011340Z		12	unknown	/CN=TEST ENTITY ISP1
 V	080809011510Z		13	unknown	/CN=TEST ENTITY ISP2
 V	080809011511Z		14	unknown	/CN=TEST ENTITY ISP1
 V	081018190607Z		15	unknown	/CN=TEST ENTITY ISP2
+V	081018190608Z		16	unknown	/CN=TEST ENTITY ISP1
+V	081028160352Z		17	unknown	/CN=TEST ENTITY ISP2
diff --git a/scripts/resource-cert-samples/LIR1/serial b/scripts/resource-cert-samples/LIR1/serial
index 98d9bcb7..d6b24041 100644
--- a/scripts/resource-cert-samples/LIR1/serial
+++ b/scripts/resource-cert-samples/LIR1/serial
@@ -1 +1 @@
-17
+19
diff --git a/scripts/resource-cert-samples/LIR1/serial.old b/scripts/resource-cert-samples/LIR1/serial.old
index b6a7d89c..3c032078 100644
--- a/scripts/resource-cert-samples/LIR1/serial.old
+++ b/scripts/resource-cert-samples/LIR1/serial.old
@@ -1 +1 @@
-16
+18
diff --git a/scripts/resource-cert-samples/LIR2.cer b/scripts/resource-cert-samples/LIR2.cer
index aaed0d68..61bb37a9 100644
--- a/scripts/resource-cert-samples/LIR2.cer
+++ b/scripts/resource-cert-samples/LIR2.cer
@@ -1,12 +1,12 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 41 (0x29)
+        Serial Number: 45 (0x2d)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=TEST ENTITY RIR
         Validity
-            Not Before: Oct 19 19:06:07 2007 GMT
-            Not After : Oct 18 19:06:07 2008 GMT
+            Not Before: Oct 29 16:03:51 2007 GMT
+            Not After : Oct 28 16:03:51 2008 GMT
         Subject: CN=TEST ENTITY LIR2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -54,24 +54,24 @@ Certificate:
                   2001:db8:0:0:0:10:0:44/128
 
     Signature Algorithm: sha256WithRSAEncryption
-        23:d8:22:41:32:ce:3b:82:26:87:5c:52:4b:b3:ec:81:8e:06:
-        8e:a4:8d:a2:8e:e8:f6:0a:5f:d8:65:43:d2:f6:cf:2d:cb:33:
-        78:1f:ce:a4:2a:a3:18:8f:23:ef:4c:56:ae:3c:a8:21:19:3d:
-        98:e2:19:58:99:93:e3:da:25:4e:f1:2a:c9:e8:5b:5b:ed:3a:
-        2c:2c:9b:7e:5e:f3:8a:63:bf:e8:92:3b:e0:80:8e:50:ee:6e:
-        16:37:51:eb:34:b1:90:13:a8:13:9e:49:7f:da:aa:e4:b8:c8:
-        e6:c7:5c:5e:15:e4:19:c2:ea:81:54:65:fc:8b:c1:c2:54:89:
-        0a:2d:d9:ad:96:e7:2b:92:c7:ca:bf:b2:d4:fb:f2:45:51:f3:
-        a0:0e:39:cf:5c:10:f4:7e:8c:4c:e5:0c:65:00:38:fa:d6:24:
-        5d:5d:93:eb:a7:ee:78:65:05:6c:c5:2b:de:08:a0:3a:65:e8:
-        13:7f:1e:6c:2e:58:ce:3e:00:4d:a6:e1:28:89:61:ef:b3:66:
-        2e:6f:81:91:a5:4d:56:47:27:c2:33:28:d8:ae:ac:74:7c:76:
-        eb:bc:0c:43:9a:a9:ae:52:f9:22:24:4b:3c:96:a9:3e:4e:5c:
-        8b:85:6e:f2:84:9a:5f:fa:b9:c8:66:67:cd:fa:17:3f:23:c4:
-        45:97:64:36
+        5c:f7:ec:cb:ed:16:f2:e4:e2:cd:ca:e8:3c:ae:2f:9d:16:7e:
+        8b:f1:e7:bf:db:ef:44:85:95:15:ed:d7:8e:99:a5:9d:f5:98:
+        9e:c2:96:c4:c7:78:23:9a:36:fe:aa:9f:d5:fc:dc:b4:cc:b5:
+        25:21:79:cd:74:e9:a8:95:b2:05:c4:4f:a0:37:d1:16:b5:bd:
+        48:de:9b:b1:c1:91:d7:a3:e3:7f:bb:af:ed:59:21:57:1d:ef:
+        20:ed:a2:4d:a9:34:35:0c:05:a4:cb:8a:8a:08:d6:16:53:07:
+        9f:a4:63:29:0e:9d:ed:69:34:3f:6e:35:53:8c:90:11:17:36:
+        75:96:ea:f1:34:fa:d7:73:7c:0c:ab:95:44:d1:a5:e9:85:74:
+        05:f8:5c:f6:70:6c:94:c2:ea:61:e1:6a:94:f4:b8:66:8d:c3:
+        c5:0e:f5:47:a2:8a:1e:40:f1:30:97:b0:e1:de:e4:89:95:a3:
+        f6:a0:56:64:9f:e6:63:23:24:f5:41:4f:36:01:c2:50:2f:99:
+        dc:53:e8:e0:b0:eb:bd:1d:8d:28:3f:ce:b5:0b:68:2b:a2:cf:
+        e2:14:53:ae:10:2a:3e:51:00:96:5c:09:b5:41:97:fb:ba:19:
+        94:d4:3e:74:f3:65:9d:bf:0b:77:45:7a:1d:1c:aa:74:f2:ea:
+        53:a6:92:6d
 -----BEGIN CERTIFICATE-----
-MIID8DCCAtigAwIBAgIBKTANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
-IEVOVElUWSBSSVIwHhcNMDcxMDE5MTkwNjA3WhcNMDgxMDE4MTkwNjA3WjAbMRkw
+MIID8DCCAtigAwIBAgIBLTANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
+IEVOVElUWSBSSVIwHhcNMDcxMDI5MTYwMzUxWhcNMDgxMDI4MTYwMzUxWjAbMRkw
 FwYDVQQDExBURVNUIEVOVElUWSBMSVIyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEA8Ri2eQs1xYNkSIMxA57ncihlsaxh4XcuwE3wsRxh2MxaLccLm3h6
 Pv03rfqwcwuc/LtvYOo4767RJ7iBWQ+z59BnsqL1T+IExswTnzMoNZZ6286sndNk
@@ -85,11 +85,11 @@ YXRzLXItdXMuaGFjdHJuLm5ldC9MSVIyLzBDBggrBgEFBQcBAQQ3MDUwMwYIKwYB
 BQUHMAKGJ3JzeW5jOi8vd29tYmF0cy1yLXVzLmhhY3Rybi5uZXQvUklSLmNlcjAa
 BggrBgEFBQcBCAEB/wQLMAmgBzAFAgMA/CAwVAYIKwYBBQUHAQcBAf8ERTBDMEEE
 AgACMDswJgMRAiABDbgAAAAAAAAAAAAAAEQDEQAgAQ24AAAAAAAAAAAAAAEAAxEA
-IAENuAAAAAAAAAAQAAAARDANBgkqhkiG9w0BAQsFAAOCAQEAI9giQTLOO4Imh1xS
-S7PsgY4GjqSNoo7o9gpf2GVD0vbPLcszeB/OpCqjGI8j70xWrjyoIRk9mOIZWJmT
-49olTvEqyehbW+06LCybfl7zimO/6JI74ICOUO5uFjdR6zSxkBOoE55Jf9qq5LjI
-5sdcXhXkGcLqgVRl/IvBwlSJCi3ZrZbnK5LHyr+y1PvyRVHzoA45z1wQ9H6MTOUM
-ZQA4+tYkXV2T66fueGUFbMUr3gigOmXoE38ebC5Yzj4ATabhKIlh77NmLm+BkaVN
-VkcnwjMo2K6sdHx267wMQ5qprlL5IiRLPJapPk5ci4Vu8oSaX/q5yGZnzfoXPyPE
-RZdkNg==
+IAENuAAAAAAAAAAQAAAARDANBgkqhkiG9w0BAQsFAAOCAQEAXPfsy+0W8uTizcro
+PK4vnRZ+i/Hnv9vvRIWVFe3XjpmlnfWYnsKWxMd4I5o2/qqf1fzctMy1JSF5zXTp
+qJWyBcRPoDfRFrW9SN6bscGR16Pjf7uv7VkhVx3vIO2iTak0NQwFpMuKigjWFlMH
+n6RjKQ6d7Wk0P241U4yQERc2dZbq8TT613N8DKuVRNGl6YV0Bfhc9nBslMLqYeFq
+lPS4Zo3DxQ71R6KKHkDxMJew4d7kiZWj9qBWZJ/mYyMk9UFPNgHCUC+Z3FPo4LDr
+vR2NKD/OtQtoK6LP4hRTrhAqPlEAllwJtUGX+7oZlNQ+dPNlnb8Ld0V6HRyqdPLq
+U6aSbQ==
 -----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/LIR2/17.pem b/scripts/resource-cert-samples/LIR2/17.pem
new file mode 100644
index 00000000..881741df
--- /dev/null
+++ b/scripts/resource-cert-samples/LIR2/17.pem
@@ -0,0 +1,93 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 23 (0x17)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=TEST ENTITY LIR2
+        Validity
+            Not Before: Oct 29 16:03:52 2007 GMT
+            Not After : Oct 28 16:03:52 2008 GMT
+        Subject: CN=TEST ENTITY ISP4
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:b3:05:ad:fb:06:db:49:81:ad:df:50:04:e0:18:
+                    e8:f1:f4:83:e6:26:4b:9e:fc:2d:1c:df:e2:2b:57:
+                    38:48:eb:c4:13:a3:fd:6c:c5:e2:1c:d5:3a:fd:66:
+                    d7:ff:2e:ff:4a:b7:5a:c5:f4:19:b1:8d:9e:a8:49:
+                    4e:3b:20:46:da:08:de:b0:9c:71:5e:77:a9:14:e2:
+                    4c:20:0e:ff:c5:20:fa:f3:6d:3b:0b:ce:e1:72:b6:
+                    ff:f5:75:7f:3e:35:af:1c:4f:e0:92:45:f0:1f:57:
+                    ce:38:6c:3e:f6:2f:96:73:1f:60:db:63:8e:63:b3:
+                    f3:35:85:e9:00:39:92:b3:9f:4a:6b:bd:e9:a0:00:
+                    ca:be:fe:27:78:9b:44:23:53:56:13:48:7d:cd:d1:
+                    01:3a:88:36:66:4f:7f:f3:2c:9f:c7:c4:52:75:1e:
+                    0e:3c:50:29:c9:39:e0:ff:90:4d:95:47:56:13:e1:
+                    30:f3:30:33:ee:02:60:70:b0:bd:dd:3b:aa:b9:2a:
+                    86:bf:e7:e2:a8:ec:64:2a:0b:12:05:08:03:7e:d8:
+                    41:bb:23:de:29:e5:0f:9b:3b:00:2e:4f:0e:f5:31:
+                    91:ec:bd:34:02:68:6d:d7:71:a9:8c:4d:23:d2:43:
+                    ae:d7:f8:e5:69:2b:ae:13:86:13:27:38:72:48:70:
+                    f8:1f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                98:CF:F8:00:82:EC:D7:E9:17:4F:BD:7A:87:60:32:A5:BB:9D:B5:0E
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            Subject Information Access: 
+                1.3.6.1.5.5.7.48.5 - URI:rsync://wombats-r-us.hactrn.net/ISP4/
+
+            Authority Information Access: 
+                CA Issuers - URI:rsync://wombats-r-us.hactrn.net/LIR2.cer
+
+            sbgp-autonomousSysNum: critical
+                Autonomous System Numbers:
+                  64544
+
+            sbgp-ipAddrBlock: critical
+                IPv6:
+                  2001:db8:0:0:0:10:0:44/128
+
+    Signature Algorithm: sha256WithRSAEncryption
+        16:93:aa:d0:4e:99:13:31:ad:92:a7:ed:88:46:05:31:3e:ea:
+        46:16:93:44:64:30:98:c3:20:62:b6:f4:05:e8:f5:ca:2d:46:
+        65:6b:d0:47:24:cf:aa:95:56:6c:61:22:ce:38:8a:3c:33:6e:
+        ef:2e:f6:f0:6f:35:47:7e:bb:c9:97:be:da:87:38:9c:dd:d4:
+        2f:b1:0a:43:c0:60:65:92:aa:c1:a7:6b:4a:b0:bd:65:e8:89:
+        f1:20:0e:02:f5:31:79:aa:32:9e:fb:e2:c6:0f:43:58:e5:3b:
+        41:10:8c:8b:2b:64:0b:10:68:6e:a5:f1:b2:8c:38:be:b5:5b:
+        82:df:af:17:58:ff:fc:37:ee:fe:9b:37:53:2c:d7:90:01:d3:
+        c5:38:8b:5f:85:bd:02:3e:00:1f:e1:e4:75:19:ad:e2:d3:5f:
+        eb:48:32:e6:82:79:fc:36:cf:9e:dc:aa:13:f4:36:69:87:e0:
+        f3:4e:d1:21:2d:f6:04:d1:c0:37:55:5e:2f:58:b3:65:49:ed:
+        24:96:33:9a:fe:d9:ba:a8:61:ab:45:2f:95:8d:39:33:17:15:
+        c1:bf:26:01:79:40:43:1b:50:40:0d:98:39:5a:d5:2b:af:9f:
+        fd:8a:5d:b6:20:01:c6:0f:03:00:d5:39:75:f7:24:62:9c:bf:
+        6b:a5:f8:a8
+-----BEGIN CERTIFICATE-----
+MIIDyjCCArKgAwIBAgIBFzANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
+IEVOVElUWSBMSVIyMB4XDTA3MTAyOTE2MDM1MloXDTA4MTAyODE2MDM1MlowGzEZ
+MBcGA1UEAxMQVEVTVCBFTlRJVFkgSVNQNDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALMFrfsG20mBrd9QBOAY6PH0g+YmS578LRzf4itXOEjrxBOj/WzF
+4hzVOv1m1/8u/0q3WsX0GbGNnqhJTjsgRtoI3rCccV53qRTiTCAO/8Ug+vNtOwvO
+4XK2//V1fz41rxxP4JJF8B9XzjhsPvYvlnMfYNtjjmOz8zWF6QA5krOfSmu96aAA
+yr7+J3ibRCNTVhNIfc3RATqINmZPf/Msn8fEUnUeDjxQKck54P+QTZVHVhPhMPMw
+M+4CYHCwvd07qrkqhr/n4qjsZCoLEgUIA37YQbsj3inlD5s7AC5PDvUxkey9NAJo
+bddxqYxNI9JDrtf45WkrrhOGEyc4ckhw+B8CAwEAAaOCARcwggETMA8GA1UdEwEB
+/wQFMAMBAf8wHQYDVR0OBBYEFJjP+ACC7NfpF0+9eodgMqW7nbUOMA4GA1UdDwEB
+/wQEAwIBBjBBBggrBgEFBQcBCwQ1MDMwMQYIKwYBBQUHMAWGJXJzeW5jOi8vd29t
+YmF0cy1yLXVzLmhhY3Rybi5uZXQvSVNQNC8wRAYIKwYBBQUHAQEEODA2MDQGCCsG
+AQUFBzAChihyc3luYzovL3dvbWJhdHMtci11cy5oYWN0cm4ubmV0L0xJUjIuY2Vy
+MBoGCCsGAQUFBwEIAQH/BAswCaAHMAUCAwD8IDAsBggrBgEFBQcBBwEB/wQdMBsw
+GQQCAAIwEwMRACABDbgAAAAAAAAAEAAAAEQwDQYJKoZIhvcNAQELBQADggEBABaT
+qtBOmRMxrZKn7YhGBTE+6kYWk0RkMJjDIGK29AXo9cotRmVr0Eckz6qVVmxhIs44
+ijwzbu8u9vBvNUd+u8mXvtqHOJzd1C+xCkPAYGWSqsGna0qwvWXoifEgDgL1MXmq
+Mp774sYPQ1jlO0EQjIsrZAsQaG6l8bKMOL61W4LfrxdY//w37v6bN1Ms15AB08U4
+i1+FvQI+AB/h5HUZreLTX+tIMuaCefw2z57cqhP0NmmH4PNO0SEt9gTRwDdVXi9Y
+s2VJ7SSWM5r+2bqoYatFL5WNOTMXFcG/JgF5QEMbUEANmDla1Suvn/2KXbYgAcYP
+AwDVOXX3JGKcv2ul+Kg=
+-----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/LIR2/18.pem b/scripts/resource-cert-samples/LIR2/18.pem
new file mode 100644
index 00000000..d3d0cfac
--- /dev/null
+++ b/scripts/resource-cert-samples/LIR2/18.pem
@@ -0,0 +1,89 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 24 (0x18)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=TEST ENTITY LIR2
+        Validity
+            Not Before: Oct 29 16:03:52 2007 GMT
+            Not After : Oct 28 16:03:52 2008 GMT
+        Subject: CN=TEST ENTITY ISP3
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:d1:24:75:c1:44:29:12:9a:fe:8c:1d:1e:01:aa:
+                    05:ea:1f:47:ab:1a:8d:cf:d2:42:a1:31:7d:9c:3e:
+                    66:72:ce:2c:df:01:17:15:40:40:94:d1:ae:6d:d7:
+                    ca:fd:52:d9:ec:5f:f0:64:30:a3:42:70:a1:a1:6f:
+                    05:2d:10:ee:b1:05:65:3f:f2:c1:78:84:cc:1d:66:
+                    ee:35:52:c7:ae:99:76:b1:63:4d:c1:2e:24:fb:f7:
+                    43:2d:0b:21:0d:d3:d6:b7:cf:60:50:49:3d:17:53:
+                    3e:2b:f8:68:95:7e:1c:c5:e2:1e:73:06:8c:b2:53:
+                    a1:70:39:d9:9e:e5:56:fc:58:d0:b3:f3:90:37:5a:
+                    6e:5a:3b:ef:05:be:f1:64:2f:31:2e:5a:58:f2:30:
+                    7a:73:52:7f:b8:0d:71:3c:63:52:17:0f:b7:07:3b:
+                    c3:46:b9:9c:88:bc:73:df:14:5a:bc:16:fc:f8:79:
+                    b0:a1:41:87:05:f9:52:a8:36:61:62:de:90:68:21:
+                    83:bb:8c:83:47:af:bb:82:3e:44:28:97:2b:02:a8:
+                    81:04:05:16:cd:bf:ef:9e:02:f9:54:66:2a:28:99:
+                    79:2b:b5:19:10:d4:df:35:95:f3:3f:fa:13:6a:06:
+                    6f:f5:38:28:d6:b6:0b:8a:70:5b:8d:70:8d:34:99:
+                    96:3f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                E1:97:2E:19:70:B5:7F:FC:82:4F:33:3D:6B:2C:DE:9A:9B:36:3D:7E
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            Subject Information Access: 
+                1.3.6.1.5.5.7.48.5 - URI:rsync://wombats-r-us.hactrn.net/ISP3/
+
+            Authority Information Access: 
+                CA Issuers - URI:rsync://wombats-r-us.hactrn.net/LIR2.cer
+
+            sbgp-ipAddrBlock: critical
+                IPv6:
+                  2001:db8:0:0:0:0:0:44-2001:db8:0:0:0:0:0:100
+
+    Signature Algorithm: sha256WithRSAEncryption
+        1f:e4:62:d3:16:47:b1:20:de:bd:de:98:ec:ec:0e:8f:89:3e:
+        61:c7:4c:40:6f:4c:41:e8:f6:e7:b1:c1:f3:09:5a:6d:e6:53:
+        62:fd:44:de:d5:42:01:73:d6:5c:ca:39:dc:97:8d:2c:29:83:
+        4a:a3:09:dd:dc:44:9b:12:6e:d7:be:93:e0:2e:d2:a4:6f:16:
+        1c:4a:e7:fc:3d:d9:5a:59:95:2f:6c:54:a5:cb:25:82:9b:4f:
+        ed:3e:24:13:5b:38:69:37:dc:f2:58:1b:c9:b0:74:a7:12:36:
+        b4:23:b7:db:63:bb:ff:3e:bd:82:e2:b4:bf:1c:13:22:2a:b8:
+        5a:cc:f2:4c:55:e0:48:36:fe:07:62:b7:8a:3a:4e:51:19:7c:
+        0d:1b:19:0c:83:28:45:e4:c1:9b:b7:bd:4a:9c:eb:f4:90:87:
+        83:39:7c:b2:cf:4d:78:2a:2b:b4:e7:4f:ee:63:54:13:5a:ac:
+        1e:82:c0:e4:3d:7d:a3:40:6d:a0:22:64:25:e8:af:5d:e9:f6:
+        85:1a:a7:98:e0:77:f4:94:03:3c:84:62:e0:f1:be:f5:e4:53:
+        aa:0c:b9:24:19:b4:92:e1:05:4b:eb:16:ab:3c:3d:cc:60:c2:
+        ce:69:d5:66:4a:29:12:72:3e:85:f7:06:97:f3:b4:ba:26:5a:
+        d1:f5:2c:a8
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBGDANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
+IEVOVElUWSBMSVIyMB4XDTA3MTAyOTE2MDM1MloXDTA4MTAyODE2MDM1MlowGzEZ
+MBcGA1UEAxMQVEVTVCBFTlRJVFkgSVNQMzCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANEkdcFEKRKa/owdHgGqBeofR6sajc/SQqExfZw+ZnLOLN8BFxVA
+QJTRrm3Xyv1S2exf8GQwo0JwoaFvBS0Q7rEFZT/ywXiEzB1m7jVSx66ZdrFjTcEu
+JPv3Qy0LIQ3T1rfPYFBJPRdTPiv4aJV+HMXiHnMGjLJToXA52Z7lVvxY0LPzkDda
+blo77wW+8WQvMS5aWPIwenNSf7gNcTxjUhcPtwc7w0a5nIi8c98UWrwW/Ph5sKFB
+hwX5Uqg2YWLekGghg7uMg0evu4I+RCiXKwKogQQFFs2/754C+VRmKiiZeSu1GRDU
+3zWV8z/6E2oGb/U4KNa2C4pwW41wjTSZlj8CAwEAAaOCARAwggEMMA8GA1UdEwEB
+/wQFMAMBAf8wHQYDVR0OBBYEFOGXLhlwtX/8gk8zPWss3pqbNj1+MA4GA1UdDwEB
+/wQEAwIBBjBBBggrBgEFBQcBCwQ1MDMwMQYIKwYBBQUHMAWGJXJzeW5jOi8vd29t
+YmF0cy1yLXVzLmhhY3Rybi5uZXQvSVNQMy8wRAYIKwYBBQUHAQEEODA2MDQGCCsG
+AQUFBzAChihyc3luYzovL3dvbWJhdHMtci11cy5oYWN0cm4ubmV0L0xJUjIuY2Vy
+MEEGCCsGAQUFBwEHAQH/BDIwMDAuBAIAAjAoMCYDEQIgAQ24AAAAAAAAAAAAAABE
+AxEAIAENuAAAAAAAAAAAAAABADANBgkqhkiG9w0BAQsFAAOCAQEAH+Ri0xZHsSDe
+vd6Y7OwOj4k+YcdMQG9MQej257HB8wlabeZTYv1E3tVCAXPWXMo53JeNLCmDSqMJ
+3dxEmxJu176T4C7SpG8WHErn/D3ZWlmVL2xUpcslgptP7T4kE1s4aTfc8lgbybB0
+pxI2tCO322O7/z69guK0vxwTIiq4WszyTFXgSDb+B2K3ijpOURl8DRsZDIMoReTB
+m7e9Spzr9JCHgzl8ss9NeCortOdP7mNUE1qsHoLA5D19o0BtoCJkJeivXen2hRqn
+mOB39JQDPIRi4PG+9eRTqgy5JBm0kuEFS+sWqzw9zGDCzmnVZkopEnI+hfcGl/O0
+uiZa0fUsqA==
+-----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/LIR2/index b/scripts/resource-cert-samples/LIR2/index
index 019c9164..45b5ba86 100644
--- a/scripts/resource-cert-samples/LIR2/index
+++ b/scripts/resource-cert-samples/LIR2/index
@@ -20,3 +20,5 @@ V	080809011510Z		13	unknown	/CN=TEST ENTITY ISP4
 V	080809011510Z		14	unknown	/CN=TEST ENTITY ISP3
 V	081018190607Z		15	unknown	/CN=TEST ENTITY ISP4
 V	081018190607Z		16	unknown	/CN=TEST ENTITY ISP3
+V	081028160352Z		17	unknown	/CN=TEST ENTITY ISP4
+V	081028160352Z		18	unknown	/CN=TEST ENTITY ISP3
diff --git a/scripts/resource-cert-samples/LIR2/index.old b/scripts/resource-cert-samples/LIR2/index.old
index 4336ebd7..09ea1e2b 100644
--- a/scripts/resource-cert-samples/LIR2/index.old
+++ b/scripts/resource-cert-samples/LIR2/index.old
@@ -19,3 +19,5 @@ V	080809011339Z		12	unknown	/CN=TEST ENTITY ISP3
 V	080809011510Z		13	unknown	/CN=TEST ENTITY ISP4
 V	080809011510Z		14	unknown	/CN=TEST ENTITY ISP3
 V	081018190607Z		15	unknown	/CN=TEST ENTITY ISP4
+V	081018190607Z		16	unknown	/CN=TEST ENTITY ISP3
+V	081028160352Z		17	unknown	/CN=TEST ENTITY ISP4
diff --git a/scripts/resource-cert-samples/LIR2/serial b/scripts/resource-cert-samples/LIR2/serial
index 98d9bcb7..d6b24041 100644
--- a/scripts/resource-cert-samples/LIR2/serial
+++ b/scripts/resource-cert-samples/LIR2/serial
@@ -1 +1 @@
-17
+19
diff --git a/scripts/resource-cert-samples/LIR2/serial.old b/scripts/resource-cert-samples/LIR2/serial.old
index b6a7d89c..3c032078 100644
--- a/scripts/resource-cert-samples/LIR2/serial.old
+++ b/scripts/resource-cert-samples/LIR2/serial.old
@@ -1 +1 @@
-16
+18
diff --git a/scripts/resource-cert-samples/LIR3.cer b/scripts/resource-cert-samples/LIR3.cer
index 5bf407ac..b32d729e 100644
--- a/scripts/resource-cert-samples/LIR3.cer
+++ b/scripts/resource-cert-samples/LIR3.cer
@@ -1,12 +1,12 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 40 (0x28)
+        Serial Number: 44 (0x2c)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=TEST ENTITY RIR
         Validity
-            Not Before: Oct 19 19:06:07 2007 GMT
-            Not After : Oct 18 19:06:07 2008 GMT
+            Not Before: Oct 29 16:03:51 2007 GMT
+            Not After : Oct 28 16:03:51 2008 GMT
         Subject: CN=TEST ENTITY LIR3
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -57,24 +57,24 @@ Certificate:
                   2001:db8:0:0:0:0:a03::/120
 
     Signature Algorithm: sha256WithRSAEncryption
-        1e:63:2b:cd:40:87:83:32:a1:6e:ed:4e:17:08:9e:e9:19:3c:
-        6b:14:68:0b:7a:81:b3:fe:3e:9b:de:9e:19:a5:7d:76:6c:18:
-        5f:ed:9e:9b:59:5c:a8:1e:08:2a:71:ac:e1:40:61:89:38:fe:
-        46:c2:ba:81:d0:85:db:0f:78:a6:f6:72:03:43:e1:d5:af:21:
-        38:d8:77:fc:12:b8:b6:fe:09:8e:a2:c9:db:77:9c:94:f0:28:
-        28:bc:41:ee:42:7c:65:ce:bb:9a:15:b5:06:8f:c8:a4:cf:10:
-        39:4d:72:a0:f0:e6:7e:c3:2a:40:fc:be:c5:17:98:fe:3a:08:
-        a5:cb:7b:4c:49:59:5d:c2:bd:87:ac:fe:10:1e:e0:45:69:eb:
-        2d:3d:ff:f9:12:ef:2f:ef:8a:f9:4d:e6:c1:f8:27:b5:fc:78:
-        64:cc:ee:94:95:17:cc:ed:2b:03:d6:4e:85:06:0f:a1:e2:70:
-        0a:a1:fc:01:a0:8e:70:04:0e:b0:0c:86:3e:9a:2f:a9:64:9a:
-        00:62:b0:82:30:74:6f:2c:fd:e6:bd:2c:9c:74:da:cd:07:a2:
-        0d:a4:a2:e2:1a:ad:57:4c:35:04:c5:16:7e:c8:9c:a0:57:53:
-        28:e2:8d:34:92:1a:77:9c:ff:6b:8a:4f:78:e6:2e:70:08:67:
-        82:b4:7d:9f
+        5f:28:81:1a:2c:d6:f6:55:be:cc:d2:3c:a1:fe:6c:86:6f:7d:
+        cc:9d:be:96:0d:03:45:27:cd:c4:e7:a5:be:9e:24:59:76:24:
+        ef:4b:3e:14:4a:d4:88:29:90:bf:87:38:75:68:d7:3d:c6:b5:
+        cc:dd:dc:6c:71:3f:92:de:f0:79:c5:f1:3c:83:d7:f9:bb:22:
+        ad:3e:f7:69:df:73:9c:06:9b:cc:47:d9:ef:d4:1f:09:69:38:
+        a9:e4:a9:f6:a6:b7:ec:f7:ee:6e:fd:cf:90:31:db:3b:dc:fe:
+        8b:45:dc:34:39:8c:fe:0f:6a:53:b6:7f:25:1d:aa:e3:23:9a:
+        73:73:cc:6f:ad:63:e9:c8:e7:f7:98:68:52:e7:1f:5d:f1:f4:
+        f6:ac:4e:9b:f5:c8:22:ab:b2:01:b5:25:b1:39:d9:21:25:5f:
+        b6:e0:a2:b0:41:7e:15:30:71:ed:39:f2:0a:f9:84:ef:13:78:
+        9b:91:96:4f:e7:9a:26:a7:5d:f5:7b:36:15:4a:1d:6c:dd:91:
+        85:8d:be:7c:76:59:05:b9:19:41:76:09:e7:29:d9:86:90:53:
+        b0:64:8a:3e:7c:43:aa:1f:aa:68:60:19:fd:bf:15:9c:be:a8:
+        a6:b8:24:13:76:88:c5:fe:2a:6e:df:4d:67:f4:26:b1:8c:ce:
+        b9:ba:fb:d6
 -----BEGIN CERTIFICATE-----
-MIID9DCCAtygAwIBAgIBKDANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
-IEVOVElUWSBSSVIwHhcNMDcxMDE5MTkwNjA3WhcNMDgxMDE4MTkwNjA3WjAbMRkw
+MIID9DCCAtygAwIBAgIBLDANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
+IEVOVElUWSBSSVIwHhcNMDcxMDI5MTYwMzUxWhcNMDgxMDI4MTYwMzUxWjAbMRkw
 FwYDVQQDExBURVNUIEVOVElUWSBMSVIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
 MIIBCgKCAQEAoyFXYWSvERjUy96m3K3ZLA8PWJ9+yIVVESZMfPBraBqeagyP5tw9
 g1gqzHesGXNvWvNuJKzNGtwdC0xE9W2LChc9hvno/uZg5Z9AauWU6JpWFxccq8GM
@@ -88,11 +88,11 @@ YXRzLXItdXMuaGFjdHJuLm5ldC9MSVIzLzBDBggrBgEFBQcBAQQ3MDUwMwYIKwYB
 BQUHMAKGJ3JzeW5jOi8vd29tYmF0cy1yLXVzLmhhY3Rybi5uZXQvUklSLmNlcjAh
 BggrBgEFBQcBCAEB/wQSMBCgDjAMMAoCAwD8FgIDAPwcMFEGCCsGAQUFBwEHAQH/
 BEIwQDASBAIAATAMAwQACgAAAwQACgMAMCoEAgACMCQDEAAgAQ24AAAAAAAAAAAK
-AAADEAAgAQ24AAAAAAAAAAAKAwAwDQYJKoZIhvcNAQELBQADggEBAB5jK81Ah4My
-oW7tThcInukZPGsUaAt6gbP+PpvenhmlfXZsGF/tnptZXKgeCCpxrOFAYYk4/kbC
-uoHQhdsPeKb2cgND4dWvITjYd/wSuLb+CY6iydt3nJTwKCi8Qe5CfGXOu5oVtQaP
-yKTPEDlNcqDw5n7DKkD8vsUXmP46CKXLe0xJWV3CvYes/hAe4EVp6y09//kS7y/v
-ivlN5sH4J7X8eGTM7pSVF8ztKwPWToUGD6HicAqh/AGgjnAEDrAMhj6aL6lkmgBi
-sIIwdG8s/ea9LJx02s0Hog2kouIarVdMNQTFFn7InKBXUyjijTSSGnec/2uKT3jm
-LnAIZ4K0fZ8=
+AAADEAAgAQ24AAAAAAAAAAAKAwAwDQYJKoZIhvcNAQELBQADggEBAF8ogRos1vZV
+vszSPKH+bIZvfcydvpYNA0UnzcTnpb6eJFl2JO9LPhRK1IgpkL+HOHVo1z3Gtczd
+3GxxP5Le8HnF8TyD1/m7Iq0+92nfc5wGm8xH2e/UHwlpOKnkqfamt+z37m79z5Ax
+2zvc/otF3DQ5jP4PalO2fyUdquMjmnNzzG+tY+nI5/eYaFLnH13x9PasTpv1yCKr
+sgG1JbE52SElX7bgorBBfhUwce058gr5hO8TeJuRlk/nmianXfV7NhVKHWzdkYWN
+vnx2WQW5GUF2Cecp2YaQU7Bkij58Q6ofqmhgGf2/FZy+qKa4JBN2iMX+Km7fTWf0
+JrGMzrm6+9Y=
 -----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/LIR3/16.pem b/scripts/resource-cert-samples/LIR3/16.pem
new file mode 100644
index 00000000..a35e6d8c
--- /dev/null
+++ b/scripts/resource-cert-samples/LIR3/16.pem
@@ -0,0 +1,88 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 22 (0x16)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=TEST ENTITY LIR3
+        Validity
+            Not Before: Oct 29 16:03:51 2007 GMT
+            Not After : Oct 28 16:03:51 2008 GMT
+        Subject: CN=TEST ENTITY ISP5c
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:c8:8b:a1:25:65:df:ee:a2:7f:54:af:52:0a:1a:
+                    1a:fa:0d:75:b3:3c:e9:e0:29:d3:89:20:e9:51:49:
+                    67:2c:43:da:a0:2c:d4:44:b3:96:14:a9:07:77:60:
+                    b9:6f:01:ef:8e:54:a5:74:ac:5a:67:f8:30:4d:10:
+                    f9:ac:9f:b8:75:61:0b:f6:e7:7c:ea:9b:5c:98:7a:
+                    4b:3e:c4:e2:59:42:d3:19:ca:0f:58:0e:b7:c8:82:
+                    4e:e5:bb:ac:fd:92:e5:88:b2:fc:64:cf:6e:38:3b:
+                    18:83:fc:e7:a6:ae:fb:90:36:d0:e1:ca:4d:90:41:
+                    0f:0f:3b:2a:c0:0c:d9:7b:7d:e8:50:13:f6:09:73:
+                    82:a3:d2:e3:bb:82:08:87:7f:d2:bb:0e:0e:7a:28:
+                    b6:25:02:b5:d9:51:fc:33:32:47:47:ff:cf:7f:bc:
+                    ee:00:01:bb:05:5e:2e:03:9a:ad:95:3b:ca:c2:c6:
+                    87:64:74:39:aa:59:6b:ae:e0:a7:51:1a:07:f2:8e:
+                    4c:8e:65:2f:df:f2:99:ba:e0:b6:8a:4f:c0:20:72:
+                    79:98:00:8f:0d:50:13:3d:d1:3e:8c:bd:dc:74:a9:
+                    33:a8:56:1d:31:78:7c:e7:02:9e:8d:0a:14:12:6d:
+                    d3:37:c7:7a:f0:84:10:fe:fe:4d:28:97:26:6e:08:
+                    85:a1
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                2D:87:C1:9A:F8:58:2B:BD:C2:F8:7E:30:47:B3:A9:88:37:C9:EB:46
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            Subject Information Access: 
+                1.3.6.1.5.5.7.48.5 - URI:rsync://wombats-r-us.hactrn.net/ISP5c/
+
+            Authority Information Access: 
+                CA Issuers - URI:rsync://wombats-r-us.hactrn.net/LIR3.cer
+
+            sbgp-autonomousSysNum: critical
+                Autonomous System Numbers:
+                  64534-64540
+
+    Signature Algorithm: sha256WithRSAEncryption
+        8b:32:d1:76:91:99:a4:fe:a9:47:f9:ad:1b:e4:09:b2:91:49:
+        01:ea:21:09:e1:db:ae:45:07:73:e1:be:99:6b:e5:73:30:20:
+        57:95:c0:e0:9f:32:29:75:e7:fd:15:06:0c:48:aa:17:0a:4b:
+        21:9e:b2:b8:ba:03:d7:fb:40:69:19:80:28:c7:a4:bd:e0:63:
+        ec:e4:88:db:82:b9:03:bb:88:bb:48:40:c5:ea:34:4d:39:38:
+        5f:a1:0b:4b:8b:60:b6:a5:08:01:20:2b:44:b9:1b:2f:c6:72:
+        dc:90:4c:b3:56:9d:0c:64:dc:5e:d2:da:4e:4f:c5:63:22:18:
+        67:0b:77:fc:fd:7f:31:73:70:81:cd:f8:9a:67:07:6f:b2:b7:
+        ea:f4:68:19:86:9a:60:59:c4:3c:a1:ea:ba:09:6d:13:9d:3f:
+        76:cc:5f:2e:3f:e0:9b:5b:3c:72:5f:39:ed:9f:34:48:97:b3:
+        c1:bb:c5:de:5a:6b:11:71:ba:d1:c4:63:20:2c:bf:75:e8:c2:
+        4a:b8:80:b8:ac:bf:46:cc:d7:2a:8b:c3:63:23:ca:9e:8d:94:
+        2c:6a:53:2f:68:7e:cd:3d:71:fd:32:c7:f7:16:11:c6:a3:3a:
+        2f:1f:05:0c:98:3f:17:3d:8c:7a:e4:47:cd:75:55:f8:b3:1b:
+        a3:bc:27:3d
+-----BEGIN CERTIFICATE-----
+MIIDozCCAougAwIBAgIBFjANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
+IEVOVElUWSBMSVIzMB4XDTA3MTAyOTE2MDM1MVoXDTA4MTAyODE2MDM1MVowHDEa
+MBgGA1UEAxMRVEVTVCBFTlRJVFkgSVNQNWMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDIi6ElZd/uon9Ur1IKGhr6DXWzPOngKdOJIOlRSWcsQ9qgLNRE
+s5YUqQd3YLlvAe+OVKV0rFpn+DBNEPmsn7h1YQv253zqm1yYeks+xOJZQtMZyg9Y
+DrfIgk7lu6z9kuWIsvxkz244OxiD/OemrvuQNtDhyk2QQQ8POyrADNl7fehQE/YJ
+c4Kj0uO7ggiHf9K7Dg56KLYlArXZUfwzMkdH/89/vO4AAbsFXi4Dmq2VO8rCxodk
+dDmqWWuu4KdRGgfyjkyOZS/f8pm64LaKT8AgcnmYAI8NUBM90T6Mvdx0qTOoVh0x
+eHznAp6NChQSbdM3x3rwhBD+/k0olyZuCIWhAgMBAAGjgfAwge0wDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQULYfBmvhYK73C+H4wR7OpiDfJ60YwDgYDVR0PAQH/
+BAQDAgEGMEIGCCsGAQUFBwELBDYwNDAyBggrBgEFBQcwBYYmcnN5bmM6Ly93b21i
+YXRzLXItdXMuaGFjdHJuLm5ldC9JU1A1Yy8wRAYIKwYBBQUHAQEEODA2MDQGCCsG
+AQUFBzAChihyc3luYzovL3dvbWJhdHMtci11cy5oYWN0cm4ubmV0L0xJUjMuY2Vy
+MCEGCCsGAQUFBwEIAQH/BBIwEKAOMAwwCgIDAPwWAgMA/BwwDQYJKoZIhvcNAQEL
+BQADggEBAIsy0XaRmaT+qUf5rRvkCbKRSQHqIQnh265FB3Phvplr5XMwIFeVwOCf
+Mil15/0VBgxIqhcKSyGesri6A9f7QGkZgCjHpL3gY+zkiNuCuQO7iLtIQMXqNE05
+OF+hC0uLYLalCAEgK0S5Gy/GctyQTLNWnQxk3F7S2k5PxWMiGGcLd/z9fzFzcIHN
++JpnB2+yt+r0aBmGmmBZxDyh6roJbROdP3bMXy4/4JtbPHJfOe2fNEiXs8G7xd5a
+axFxutHEYyAsv3Xowkq4gLisv0bM1yqLw2Mjyp6NlCxqUy9ofs09cf0yx/cWEcaj
+Oi8fBQyYPxc9jHrkR811VfizG6O8Jz0=
+-----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/LIR3/17.pem b/scripts/resource-cert-samples/LIR3/17.pem
new file mode 100644
index 00000000..b4d63508
--- /dev/null
+++ b/scripts/resource-cert-samples/LIR3/17.pem
@@ -0,0 +1,91 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 23 (0x17)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=TEST ENTITY LIR3
+        Validity
+            Not Before: Oct 29 16:03:52 2007 GMT
+            Not After : Oct 28 16:03:52 2008 GMT
+        Subject: CN=TEST ENTITY ISP5b
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:bf:8f:59:d8:fc:fa:1d:04:70:29:ce:7b:01:64:
+                    21:40:dc:5c:43:fe:4c:af:88:c8:62:9b:be:9c:72:
+                    8f:8a:a5:34:8a:3b:23:8d:9b:8a:4f:bf:66:ac:68:
+                    71:9c:fd:68:59:f5:bf:9f:4d:2e:b5:d6:e3:fa:bd:
+                    f3:60:53:5c:b7:11:ac:95:0b:c0:87:cd:99:9e:94:
+                    57:8d:ec:05:b8:df:aa:fc:8e:38:d3:0f:65:6d:09:
+                    60:f2:e1:98:81:72:d8:51:3e:41:91:b3:10:95:f5:
+                    f5:d0:f9:e5:5c:a1:85:fa:71:26:85:e3:d1:4c:02:
+                    7f:14:e2:1e:4a:8a:96:68:9e:d6:16:a5:ef:ad:b5:
+                    83:62:cd:23:74:7c:82:56:b4:d1:34:53:5a:8a:7a:
+                    61:9f:ae:54:5b:ef:f9:56:de:87:6b:42:92:bc:49:
+                    f4:b5:c3:35:07:4a:18:47:d2:92:c6:1c:16:74:74:
+                    b1:e9:39:3c:53:12:05:9d:eb:dc:9c:72:2b:97:4d:
+                    27:21:77:96:7d:4c:ce:79:0c:fb:a7:b8:99:6b:66:
+                    20:2e:56:9c:44:b4:e3:5e:80:c4:7d:78:a1:b4:05:
+                    f7:20:7d:26:1e:44:bf:5d:69:15:3c:7a:24:67:bd:
+                    b9:b5:08:0f:33:4d:af:3b:2d:e7:b9:ab:1d:2b:d6:
+                    fb:73
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                6C:B3:65:94:FE:C6:9F:4A:50:9D:4D:8B:40:1A:A1:FD:97:17:97:92
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            Subject Information Access: 
+                1.3.6.1.5.5.7.48.5 - URI:rsync://wombats-r-us.hactrn.net/ISP5b/
+
+            Authority Information Access: 
+                CA Issuers - URI:rsync://wombats-r-us.hactrn.net/LIR3.cer
+
+            sbgp-ipAddrBlock: critical
+                IPv4:
+                  10.3.0.0/24
+                IPv6:
+                  2001:db8:0:0:0:0:a03::/120
+
+    Signature Algorithm: sha256WithRSAEncryption
+        6c:20:82:cb:ed:5f:a4:c6:fa:b5:4c:20:7d:e8:18:e7:a9:8a:
+        a4:43:aa:1b:0a:47:01:e9:d5:29:f2:58:40:e1:b0:64:37:b1:
+        54:e0:49:4c:b9:98:a4:41:b0:cf:33:87:c7:47:30:58:f9:46:
+        51:5d:d4:8c:65:24:59:a6:8a:01:c0:bc:46:38:45:fa:64:51:
+        eb:ff:87:7c:18:33:41:7e:e9:52:98:a6:0f:1a:d8:43:2f:34:
+        9d:14:b4:14:e8:68:2e:16:5f:06:a7:85:96:7e:dc:49:67:f9:
+        56:5b:42:1a:af:00:fb:b5:d3:84:b8:e0:79:3c:b6:b7:b9:f3:
+        04:fc:e4:9a:9f:74:6c:ea:ff:8a:14:9d:69:15:ac:b6:5b:09:
+        eb:78:64:a7:7d:81:f9:f1:c9:4c:73:ae:88:43:da:39:32:37:
+        4c:df:16:74:4d:dd:27:3a:bf:99:39:5c:a8:8d:f5:47:a8:60:
+        7c:3d:56:5b:ab:73:f7:57:26:00:55:16:f1:dc:ae:d7:e1:48:
+        ed:b0:32:75:aa:76:4c:5b:7e:ef:be:6f:bc:8c:1e:12:70:27:
+        25:3d:b6:fd:6e:34:3f:9b:9f:cb:13:37:26:f4:56:fc:5b:9d:
+        7c:b5:b9:7a:29:ff:ca:c0:55:bb:57:55:25:45:b5:a1:c4:2d:
+        3c:2d:9c:8d
+-----BEGIN CERTIFICATE-----
+MIIDvTCCAqWgAwIBAgIBFzANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
+IEVOVElUWSBMSVIzMB4XDTA3MTAyOTE2MDM1MloXDTA4MTAyODE2MDM1MlowHDEa
+MBgGA1UEAxMRVEVTVCBFTlRJVFkgSVNQNWIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC/j1nY/PodBHApznsBZCFA3FxD/kyviMhim76cco+KpTSKOyON
+m4pPv2asaHGc/WhZ9b+fTS611uP6vfNgU1y3EayVC8CHzZmelFeN7AW436r8jjjT
+D2VtCWDy4ZiBcthRPkGRsxCV9fXQ+eVcoYX6cSaF49FMAn8U4h5KipZontYWpe+t
+tYNizSN0fIJWtNE0U1qKemGfrlRb7/lW3odrQpK8SfS1wzUHShhH0pLGHBZ0dLHp
+OTxTEgWd69ycciuXTSchd5Z9TM55DPunuJlrZiAuVpxEtONegMR9eKG0BfcgfSYe
+RL9daRU8eiRnvbm1CA8zTa87Lee5qx0r1vtzAgMBAAGjggEJMIIBBTAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBRss2WU/safSlCdTYtAGqH9lxeXkjAOBgNVHQ8B
+Af8EBAMCAQYwQgYIKwYBBQUHAQsENjA0MDIGCCsGAQUFBzAFhiZyc3luYzovL3dv
+bWJhdHMtci11cy5oYWN0cm4ubmV0L0lTUDViLzBEBggrBgEFBQcBAQQ4MDYwNAYI
+KwYBBQUHMAKGKHJzeW5jOi8vd29tYmF0cy1yLXVzLmhhY3Rybi5uZXQvTElSMy5j
+ZXIwOQYIKwYBBQUHAQcBAf8EKjAoMAwEAgABMAYDBAAKAwAwGAQCAAIwEgMQACAB
+DbgAAAAAAAAAAAoDADANBgkqhkiG9w0BAQsFAAOCAQEAbCCCy+1fpMb6tUwgfegY
+56mKpEOqGwpHAenVKfJYQOGwZDexVOBJTLmYpEGwzzOHx0cwWPlGUV3UjGUkWaaK
+AcC8RjhF+mRR6/+HfBgzQX7pUpimDxrYQy80nRS0FOhoLhZfBqeFln7cSWf5VltC
+Gq8A+7XThLjgeTy2t7nzBPzkmp90bOr/ihSdaRWstlsJ63hkp32B+fHJTHOuiEPa
+OTI3TN8WdE3dJzq/mTlcqI31R6hgfD1WW6tz91cmAFUW8dyu1+FI7bAydap2TFt+
+775vvIweEnAnJT22/W40P5ufyxM3JvRW/FudfLW5ein/ysBVu1dVJUW1ocQtPC2c
+jQ==
+-----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/LIR3/18.pem b/scripts/resource-cert-samples/LIR3/18.pem
new file mode 100644
index 00000000..d264ae2f
--- /dev/null
+++ b/scripts/resource-cert-samples/LIR3/18.pem
@@ -0,0 +1,91 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 24 (0x18)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=TEST ENTITY LIR3
+        Validity
+            Not Before: Oct 29 16:03:52 2007 GMT
+            Not After : Oct 28 16:03:52 2008 GMT
+        Subject: CN=TEST ENTITY ISP5a
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:e6:4b:ad:78:28:6b:e6:50:1b:65:81:d5:8d:2b:
+                    56:77:cd:bb:c9:47:a0:aa:32:b0:2c:ac:1f:f1:e4:
+                    90:2b:c2:33:6f:e7:53:b1:d0:1d:ab:05:27:9d:b7:
+                    a1:ee:a8:4f:c8:5b:36:23:e3:12:e4:51:59:27:cd:
+                    fd:7a:aa:dc:56:05:a1:73:ab:79:dd:3c:82:b2:8f:
+                    ae:f9:ec:c0:36:38:e6:02:aa:fd:89:60:21:52:5b:
+                    b6:33:80:75:e5:7f:fd:ac:6e:ec:d4:9a:26:2f:7e:
+                    28:45:16:29:47:7d:f3:8a:72:d5:e4:65:fa:f4:54:
+                    6f:ae:48:33:62:c1:32:f1:2b:83:33:36:63:60:9e:
+                    bc:c7:e7:99:5d:51:da:cd:2f:8f:83:47:20:9e:e9:
+                    cc:a3:72:c0:72:bd:49:2d:c4:52:ea:6f:da:42:46:
+                    71:90:c7:af:7f:9f:c7:dd:0b:96:96:3c:45:9f:c0:
+                    ea:65:6a:43:e3:f3:92:d5:e1:73:c0:6e:20:f5:17:
+                    e5:d1:58:da:21:b3:e9:0c:4d:f0:e8:bd:7c:b7:ef:
+                    81:c9:f5:70:cf:a8:20:7d:e2:6a:f9:1b:66:a9:c8:
+                    71:d6:32:f8:72:3d:83:99:19:0d:0c:6b:e9:f8:92:
+                    cd:33:17:86:6a:3d:af:0d:05:94:ab:1c:d4:2c:a4:
+                    45:cb
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                09:F0:14:0B:79:FB:0B:FF:A8:EF:54:B9:EC:3E:B9:8B:D0:CB:9C:EC
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            Subject Information Access: 
+                1.3.6.1.5.5.7.48.5 - URI:rsync://wombats-r-us.hactrn.net/ISP5a/
+
+            Authority Information Access: 
+                CA Issuers - URI:rsync://wombats-r-us.hactrn.net/LIR3.cer
+
+            sbgp-ipAddrBlock: critical
+                IPv4:
+                  10.0.0.0/24
+                IPv6:
+                  2001:db8:0:0:0:0:a00::/120
+
+    Signature Algorithm: sha256WithRSAEncryption
+        31:60:cb:59:95:02:29:ad:2e:2d:92:c4:e9:61:2b:e7:a2:bc:
+        39:70:7b:b0:62:af:56:08:81:c5:50:7f:ec:4e:d4:ff:7f:4a:
+        c7:34:4c:d5:dd:dc:dd:92:64:f7:5f:7b:ab:3c:9d:9d:15:b8:
+        c4:73:31:eb:c6:2d:af:0c:1f:a9:05:e7:3e:28:a8:1d:f0:6f:
+        ca:4b:c9:76:ff:5b:95:dd:d8:48:4a:d6:93:10:3a:1a:36:3d:
+        2a:10:2c:89:c5:19:fa:e8:fa:eb:b8:51:37:de:af:30:e3:ae:
+        09:d3:21:9c:83:4a:c1:70:ec:f6:f3:4b:72:40:75:61:02:bd:
+        fc:1b:96:e2:24:39:be:9a:43:29:8c:d7:c6:90:e2:14:fd:5e:
+        22:9f:32:45:67:d2:f6:6d:45:5e:43:e6:1c:ed:74:18:2c:9c:
+        ba:eb:a5:ee:76:2b:5f:b1:7a:06:18:94:95:52:58:fe:ef:61:
+        d9:f0:fd:ba:b4:88:af:a3:78:f1:d9:36:42:4f:df:55:f9:9e:
+        4d:f1:c9:12:85:f6:6c:1f:a5:1b:17:f2:2a:4a:1e:65:fa:18:
+        1a:22:ee:c6:fb:b9:65:1d:30:1a:a7:f9:78:87:27:a5:c8:4a:
+        35:6d:92:2d:f0:13:75:a2:77:df:fa:28:d0:68:0b:19:7f:38:
+        f3:64:0c:93
+-----BEGIN CERTIFICATE-----
+MIIDvTCCAqWgAwIBAgIBGDANBgkqhkiG9w0BAQsFADAbMRkwFwYDVQQDExBURVNU
+IEVOVElUWSBMSVIzMB4XDTA3MTAyOTE2MDM1MloXDTA4MTAyODE2MDM1MlowHDEa
+MBgGA1UEAxMRVEVTVCBFTlRJVFkgSVNQNWEwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDmS614KGvmUBtlgdWNK1Z3zbvJR6CqMrAsrB/x5JArwjNv51Ox
+0B2rBSedt6HuqE/IWzYj4xLkUVknzf16qtxWBaFzq3ndPIKyj6757MA2OOYCqv2J
+YCFSW7YzgHXlf/2sbuzUmiYvfihFFilHffOKctXkZfr0VG+uSDNiwTLxK4MzNmNg
+nrzH55ldUdrNL4+DRyCe6cyjcsByvUktxFLqb9pCRnGQx69/n8fdC5aWPEWfwOpl
+akPj85LV4XPAbiD1F+XRWNohs+kMTfDovXy374HJ9XDPqCB94mr5G2apyHHWMvhy
+PYOZGQ0Ma+n4ks0zF4ZqPa8NBZSrHNQspEXLAgMBAAGjggEJMIIBBTAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBQJ8BQLefsL/6jvVLnsPrmL0Muc7DAOBgNVHQ8B
+Af8EBAMCAQYwQgYIKwYBBQUHAQsENjA0MDIGCCsGAQUFBzAFhiZyc3luYzovL3dv
+bWJhdHMtci11cy5oYWN0cm4ubmV0L0lTUDVhLzBEBggrBgEFBQcBAQQ4MDYwNAYI
+KwYBBQUHMAKGKHJzeW5jOi8vd29tYmF0cy1yLXVzLmhhY3Rybi5uZXQvTElSMy5j
+ZXIwOQYIKwYBBQUHAQcBAf8EKjAoMAwEAgABMAYDBAAKAAAwGAQCAAIwEgMQACAB
+DbgAAAAAAAAAAAoAADANBgkqhkiG9w0BAQsFAAOCAQEAMWDLWZUCKa0uLZLE6WEr
+56K8OXB7sGKvVgiBxVB/7E7U/39KxzRM1d3c3ZJk9197qzydnRW4xHMx68Ytrwwf
+qQXnPiioHfBvykvJdv9bld3YSErWkxA6GjY9KhAsicUZ+uj667hRN96vMOOuCdMh
+nINKwXDs9vNLckB1YQK9/BuW4iQ5vppDKYzXxpDiFP1eIp8yRWfS9m1FXkPmHO10
+GCycuuul7nYrX7F6BhiUlVJY/u9h2fD9urSIr6N48dk2Qk/fVfmeTfHJEoX2bB+l
+GxfyKkoeZfoYGiLuxvu5ZR0wGqf5eIcnpchKNW2SLfATdaJ33/oo0GgLGX8482QM
+kw==
+-----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/LIR3/index b/scripts/resource-cert-samples/LIR3/index
index 157b3920..d908a65e 100644
--- a/scripts/resource-cert-samples/LIR3/index
+++ b/scripts/resource-cert-samples/LIR3/index
@@ -19,3 +19,6 @@ V	080809011510Z		12	unknown	/CN=TEST ENTITY ISP5a
 V	081018190607Z		13	unknown	/CN=TEST ENTITY ISP5c
 V	081018190607Z		14	unknown	/CN=TEST ENTITY ISP5b
 V	081018190607Z		15	unknown	/CN=TEST ENTITY ISP5a
+V	081028160351Z		16	unknown	/CN=TEST ENTITY ISP5c
+V	081028160352Z		17	unknown	/CN=TEST ENTITY ISP5b
+V	081028160352Z		18	unknown	/CN=TEST ENTITY ISP5a
diff --git a/scripts/resource-cert-samples/LIR3/index.old b/scripts/resource-cert-samples/LIR3/index.old
index 57e8a8f3..f0518533 100644
--- a/scripts/resource-cert-samples/LIR3/index.old
+++ b/scripts/resource-cert-samples/LIR3/index.old
@@ -18,3 +18,6 @@ V	080809011510Z		11	unknown	/CN=TEST ENTITY ISP5b
 V	080809011510Z		12	unknown	/CN=TEST ENTITY ISP5a
 V	081018190607Z		13	unknown	/CN=TEST ENTITY ISP5c
 V	081018190607Z		14	unknown	/CN=TEST ENTITY ISP5b
+V	081018190607Z		15	unknown	/CN=TEST ENTITY ISP5a
+V	081028160351Z		16	unknown	/CN=TEST ENTITY ISP5c
+V	081028160352Z		17	unknown	/CN=TEST ENTITY ISP5b
diff --git a/scripts/resource-cert-samples/LIR3/serial b/scripts/resource-cert-samples/LIR3/serial
index b6a7d89c..d6b24041 100644
--- a/scripts/resource-cert-samples/LIR3/serial
+++ b/scripts/resource-cert-samples/LIR3/serial
@@ -1 +1 @@
-16
+19
diff --git a/scripts/resource-cert-samples/LIR3/serial.old b/scripts/resource-cert-samples/LIR3/serial.old
index 60d3b2f4..3c032078 100644
--- a/scripts/resource-cert-samples/LIR3/serial.old
+++ b/scripts/resource-cert-samples/LIR3/serial.old
@@ -1 +1 @@
-15
+18
diff --git a/scripts/resource-cert-samples/Makefile b/scripts/resource-cert-samples/Makefile
index 67f7aa27..09334e5c 100644
--- a/scripts/resource-cert-samples/Makefile
+++ b/scripts/resource-cert-samples/Makefile
@@ -3,230 +3,230 @@
 all:: RIR.cer
 
 RIR.key:
-	../../openssl/openssl-0.9.8f/apps/openssl genrsa -out $@ 2048
+	../../openssl/openssl-0.9.8g/apps/openssl genrsa -out $@ 2048
 
 RIR.req: RIR.key RIR.cnf Makefile
-	../../openssl/openssl-0.9.8f/apps/openssl req -new -config RIR.cnf -key RIR.key -out $@
+	../../openssl/openssl-0.9.8g/apps/openssl req -new -config RIR.cnf -key RIR.key -out $@
 
 RIR.cer: RIR.req RIR.cnf RIR.key Makefile
 	@test -d RIR || mkdir RIR
 	@test -f RIR/index || touch RIR/index
 	@test -f RIR/serial || echo 01 >RIR/serial
-	../../openssl/openssl-0.9.8f/apps/openssl ca -batch -out $@ -in RIR.req -extfile RIR.cnf -config RIR.cnf -selfsign
+	../../openssl/openssl-0.9.8g/apps/openssl ca -batch -out $@ -in RIR.req -extfile RIR.cnf -config RIR.cnf -selfsign
 
 
 show_req::
-	../../openssl/openssl-0.9.8f/apps/openssl req -noout -text -in RIR.req -config /dev/null
+	../../openssl/openssl-0.9.8g/apps/openssl req -noout -text -in RIR.req -config /dev/null
 
 show_cer::
-	../../openssl/openssl-0.9.8f/apps/openssl x509 -noout -text -in RIR.cer
+	../../openssl/openssl-0.9.8g/apps/openssl x509 -noout -text -in RIR.cer
 
 all:: LIR3.cer
 
 LIR3.key:
-	../../openssl/openssl-0.9.8f/apps/openssl genrsa -out $@ 2048
+	../../openssl/openssl-0.9.8g/apps/openssl genrsa -out $@ 2048
 
 LIR3.req: LIR3.key LIR3.cnf Makefile
-	../../openssl/openssl-0.9.8f/apps/openssl req -new -config LIR3.cnf -key LIR3.key -out $@
+	../../openssl/openssl-0.9.8g/apps/openssl req -new -config LIR3.cnf -key LIR3.key -out $@
 
 LIR3.cer: LIR3.req LIR3.cnf RIR.key Makefile
 	@test -d LIR3 || mkdir LIR3
 	@test -f LIR3/index || touch LIR3/index
 	@test -f LIR3/serial || echo 01 >LIR3/serial
-	../../openssl/openssl-0.9.8f/apps/openssl ca -batch -out $@ -in LIR3.req -extfile LIR3.cnf -config RIR.cnf
+	../../openssl/openssl-0.9.8g/apps/openssl ca -batch -out $@ -in LIR3.req -extfile LIR3.cnf -config RIR.cnf
 
 
 show_req::
-	../../openssl/openssl-0.9.8f/apps/openssl req -noout -text -in LIR3.req -config /dev/null
+	../../openssl/openssl-0.9.8g/apps/openssl req -noout -text -in LIR3.req -config /dev/null
 
 show_cer::
-	../../openssl/openssl-0.9.8f/apps/openssl x509 -noout -text -in LIR3.cer
+	../../openssl/openssl-0.9.8g/apps/openssl x509 -noout -text -in LIR3.cer
 
 all:: LIR2.cer
 
 LIR2.key:
-	../../openssl/openssl-0.9.8f/apps/openssl genrsa -out $@ 2048
+	../../openssl/openssl-0.9.8g/apps/openssl genrsa -out $@ 2048
 
 LIR2.req: LIR2.key LIR2.cnf Makefile
-	../../openssl/openssl-0.9.8f/apps/openssl req -new -config LIR2.cnf -key LIR2.key -out $@
+	../../openssl/openssl-0.9.8g/apps/openssl req -new -config LIR2.cnf -key LIR2.key -out $@
 
 LIR2.cer: LIR2.req LIR2.cnf RIR.key Makefile
 	@test -d LIR2 || mkdir LIR2
 	@test -f LIR2/index || touch LIR2/index
 	@test -f LIR2/serial || echo 01 >LIR2/serial
-	../../openssl/openssl-0.9.8f/apps/openssl ca -batch -out $@ -in LIR2.req -extfile LIR2.cnf -config RIR.cnf
+	../../openssl/openssl-0.9.8g/apps/openssl ca -batch -out $@ -in LIR2.req -extfile LIR2.cnf -config RIR.cnf
 
 
 show_req::
-	../../openssl/openssl-0.9.8f/apps/openssl req -noout -text -in LIR2.req -config /dev/null
+	../../openssl/openssl-0.9.8g/apps/openssl req -noout -text -in LIR2.req -config /dev/null
 
 show_cer::
-	../../openssl/openssl-0.9.8f/apps/openssl x509 -noout -text -in LIR2.cer
+	../../openssl/openssl-0.9.8g/apps/openssl x509 -noout -text -in LIR2.cer
 
 all:: LIR1.cer
 
 LIR1.key:
-	../../openssl/openssl-0.9.8f/apps/openssl genrsa -out $@ 2048
+	../../openssl/openssl-0.9.8g/apps/openssl genrsa -out $@ 2048
 
 LIR1.req: LIR1.key LIR1.cnf Makefile
-	../../openssl/openssl-0.9.8f/apps/openssl req -new -config LIR1.cnf -key LIR1.key -out $@
+	../../openssl/openssl-0.9.8g/apps/openssl req -new -config LIR1.cnf -key LIR1.key -out $@
 
 LIR1.cer: LIR1.req LIR1.cnf RIR.key Makefile
 	@test -d LIR1 || mkdir LIR1
 	@test -f LIR1/index || touch LIR1/index
 	@test -f LIR1/serial || echo 01 >LIR1/serial
-	../../openssl/openssl-0.9.8f/apps/openssl ca -batch -out $@ -in LIR1.req -extfile LIR1.cnf -config RIR.cnf
+	../../openssl/openssl-0.9.8g/apps/openssl ca -batch -out $@ -in LIR1.req -extfile LIR1.cnf -config RIR.cnf
 
 
 show_req::
-	../../openssl/openssl-0.9.8f/apps/openssl req -noout -text -in LIR1.req -config /dev/null
+	../../openssl/openssl-0.9.8g/apps/openssl req -noout -text -in LIR1.req -config /dev/null
 
 show_cer::
-	../../openssl/openssl-0.9.8f/apps/openssl x509 -noout -text -in LIR1.cer
+	../../openssl/openssl-0.9.8g/apps/openssl x509 -noout -text -in LIR1.cer
 
 all:: ISP5c.cer
 
 ISP5c.key:
-	../../openssl/openssl-0.9.8f/apps/openssl genrsa -out $@ 2048
+	../../openssl/openssl-0.9.8g/apps/openssl genrsa -out $@ 2048
 
 ISP5c.req: ISP5c.key ISP5c.cnf Makefile
-	../../openssl/openssl-0.9.8f/apps/openssl req -new -config ISP5c.cnf -key ISP5c.key -out $@
+	../../openssl/openssl-0.9.8g/apps/openssl req -new -config ISP5c.cnf -key ISP5c.key -out $@
 
 ISP5c.cer: ISP5c.req ISP5c.cnf LIR3.key Makefile
 	@test -d ISP5c || mkdir ISP5c
 	@test -f ISP5c/index || touch ISP5c/index
 	@test -f ISP5c/serial || echo 01 >ISP5c/serial
-	../../openssl/openssl-0.9.8f/apps/openssl ca -batch -out $@ -in ISP5c.req -extfile ISP5c.cnf -config LIR3.cnf
+	../../openssl/openssl-0.9.8g/apps/openssl ca -batch -out $@ -in ISP5c.req -extfile ISP5c.cnf -config LIR3.cnf
 
 
 show_req::
-	../../openssl/openssl-0.9.8f/apps/openssl req -noout -text -in ISP5c.req -config /dev/null
+	../../openssl/openssl-0.9.8g/apps/openssl req -noout -text -in ISP5c.req -config /dev/null
 
 show_cer::
-	../../openssl/openssl-0.9.8f/apps/openssl x509 -noout -text -in ISP5c.cer
+	../../openssl/openssl-0.9.8g/apps/openssl x509 -noout -text -in ISP5c.cer
 
 all:: ISP5b.cer
 
 ISP5b.key:
-	../../openssl/openssl-0.9.8f/apps/openssl genrsa -out $@ 2048
+	../../openssl/openssl-0.9.8g/apps/openssl genrsa -out $@ 2048
 
 ISP5b.req: ISP5b.key ISP5b.cnf Makefile
-	../../openssl/openssl-0.9.8f/apps/openssl req -new -config ISP5b.cnf -key ISP5b.key -out $@
+	../../openssl/openssl-0.9.8g/apps/openssl req -new -config ISP5b.cnf -key ISP5b.key -out $@
 
 ISP5b.cer: ISP5b.req ISP5b.cnf LIR3.key Makefile
 	@test -d ISP5b || mkdir ISP5b
 	@test -f ISP5b/index || touch ISP5b/index
 	@test -f ISP5b/serial || echo 01 >ISP5b/serial
-	../../openssl/openssl-0.9.8f/apps/openssl ca -batch -out $@ -in ISP5b.req -extfile ISP5b.cnf -config LIR3.cnf
+	../../openssl/openssl-0.9.8g/apps/openssl ca -batch -out $@ -in ISP5b.req -extfile ISP5b.cnf -config LIR3.cnf
 
 
 show_req::
-	../../openssl/openssl-0.9.8f/apps/openssl req -noout -text -in ISP5b.req -config /dev/null
+	../../openssl/openssl-0.9.8g/apps/openssl req -noout -text -in ISP5b.req -config /dev/null
 
 show_cer::
-	../../openssl/openssl-0.9.8f/apps/openssl x509 -noout -text -in ISP5b.cer
+	../../openssl/openssl-0.9.8g/apps/openssl x509 -noout -text -in ISP5b.cer
 
 all:: ISP5a.cer
 
 ISP5a.key:
-	../../openssl/openssl-0.9.8f/apps/openssl genrsa -out $@ 2048
+	../../openssl/openssl-0.9.8g/apps/openssl genrsa -out $@ 2048
 
 ISP5a.req: ISP5a.key ISP5a.cnf Makefile
-	../../openssl/openssl-0.9.8f/apps/openssl req -new -config ISP5a.cnf -key ISP5a.key -out $@
+	../../openssl/openssl-0.9.8g/apps/openssl req -new -config ISP5a.cnf -key ISP5a.key -out $@
 
 ISP5a.cer: ISP5a.req ISP5a.cnf LIR3.key Makefile
 	@test -d ISP5a || mkdir ISP5a
 	@test -f ISP5a/index || touch ISP5a/index
 	@test -f ISP5a/serial || echo 01 >ISP5a/serial
-	../../openssl/openssl-0.9.8f/apps/openssl ca -batch -out $@ -in ISP5a.req -extfile ISP5a.cnf -config LIR3.cnf
+	../../openssl/openssl-0.9.8g/apps/openssl ca -batch -out $@ -in ISP5a.req -extfile ISP5a.cnf -config LIR3.cnf
 
 
 show_req::
-	../../openssl/openssl-0.9.8f/apps/openssl req -noout -text -in ISP5a.req -config /dev/null
+	../../openssl/openssl-0.9.8g/apps/openssl req -noout -text -in ISP5a.req -config /dev/null
 
 show_cer::
-	../../openssl/openssl-0.9.8f/apps/openssl x509 -noout -text -in ISP5a.cer
+	../../openssl/openssl-0.9.8g/apps/openssl x509 -noout -text -in ISP5a.cer
 
 all:: ISP4.cer
 
 ISP4.key:
-	../../openssl/openssl-0.9.8f/apps/openssl genrsa -out $@ 2048
+	../../openssl/openssl-0.9.8g/apps/openssl genrsa -out $@ 2048
 
 ISP4.req: ISP4.key ISP4.cnf Makefile
-	../../openssl/openssl-0.9.8f/apps/openssl req -new -config ISP4.cnf -key ISP4.key -out $@
+	../../openssl/openssl-0.9.8g/apps/openssl req -new -config ISP4.cnf -key ISP4.key -out $@
 
 ISP4.cer: ISP4.req ISP4.cnf LIR2.key Makefile
 	@test -d ISP4 || mkdir ISP4
 	@test -f ISP4/index || touch ISP4/index
 	@test -f ISP4/serial || echo 01 >ISP4/serial
-	../../openssl/openssl-0.9.8f/apps/openssl ca -batch -out $@ -in ISP4.req -extfile ISP4.cnf -config LIR2.cnf
+	../../openssl/openssl-0.9.8g/apps/openssl ca -batch -out $@ -in ISP4.req -extfile ISP4.cnf -config LIR2.cnf
 
 
 show_req::
-	../../openssl/openssl-0.9.8f/apps/openssl req -noout -text -in ISP4.req -config /dev/null
+	../../openssl/openssl-0.9.8g/apps/openssl req -noout -text -in ISP4.req -config /dev/null
 
 show_cer::
-	../../openssl/openssl-0.9.8f/apps/openssl x509 -noout -text -in ISP4.cer
+	../../openssl/openssl-0.9.8g/apps/openssl x509 -noout -text -in ISP4.cer
 
 all:: ISP3.cer
 
 ISP3.key:
-	../../openssl/openssl-0.9.8f/apps/openssl genrsa -out $@ 2048
+	../../openssl/openssl-0.9.8g/apps/openssl genrsa -out $@ 2048
 
 ISP3.req: ISP3.key ISP3.cnf Makefile
-	../../openssl/openssl-0.9.8f/apps/openssl req -new -config ISP3.cnf -key ISP3.key -out $@
+	../../openssl/openssl-0.9.8g/apps/openssl req -new -config ISP3.cnf -key ISP3.key -out $@
 
 ISP3.cer: ISP3.req ISP3.cnf LIR2.key Makefile
 	@test -d ISP3 || mkdir ISP3
 	@test -f ISP3/index || touch ISP3/index
 	@test -f ISP3/serial || echo 01 >ISP3/serial
-	../../openssl/openssl-0.9.8f/apps/openssl ca -batch -out $@ -in ISP3.req -extfile ISP3.cnf -config LIR2.cnf
+	../../openssl/openssl-0.9.8g/apps/openssl ca -batch -out $@ -in ISP3.req -extfile ISP3.cnf -config LIR2.cnf
 
 
 show_req::
-	../../openssl/openssl-0.9.8f/apps/openssl req -noout -text -in ISP3.req -config /dev/null
+	../../openssl/openssl-0.9.8g/apps/openssl req -noout -text -in ISP3.req -config /dev/null
 
 show_cer::
-	../../openssl/openssl-0.9.8f/apps/openssl x509 -noout -text -in ISP3.cer
+	../../openssl/openssl-0.9.8g/apps/openssl x509 -noout -text -in ISP3.cer
 
 all:: ISP2.cer
 
 ISP2.key:
-	../../openssl/openssl-0.9.8f/apps/openssl genrsa -out $@ 2048
+	../../openssl/openssl-0.9.8g/apps/openssl genrsa -out $@ 2048
 
 ISP2.req: ISP2.key ISP2.cnf Makefile
-	../../openssl/openssl-0.9.8f/apps/openssl req -new -config ISP2.cnf -key ISP2.key -out $@
+	../../openssl/openssl-0.9.8g/apps/openssl req -new -config ISP2.cnf -key ISP2.key -out $@
 
 ISP2.cer: ISP2.req ISP2.cnf LIR1.key Makefile
 	@test -d ISP2 || mkdir ISP2
 	@test -f ISP2/index || touch ISP2/index
 	@test -f ISP2/serial || echo 01 >ISP2/serial
-	../../openssl/openssl-0.9.8f/apps/openssl ca -batch -out $@ -in ISP2.req -extfile ISP2.cnf -config LIR1.cnf
+	../../openssl/openssl-0.9.8g/apps/openssl ca -batch -out $@ -in ISP2.req -extfile ISP2.cnf -config LIR1.cnf
 
 
 show_req::
-	../../openssl/openssl-0.9.8f/apps/openssl req -noout -text -in ISP2.req -config /dev/null
+	../../openssl/openssl-0.9.8g/apps/openssl req -noout -text -in ISP2.req -config /dev/null
 
 show_cer::
-	../../openssl/openssl-0.9.8f/apps/openssl x509 -noout -text -in ISP2.cer
+	../../openssl/openssl-0.9.8g/apps/openssl x509 -noout -text -in ISP2.cer
 
 all:: ISP1.cer
 
 ISP1.key:
-	../../openssl/openssl-0.9.8f/apps/openssl genrsa -out $@ 2048
+	../../openssl/openssl-0.9.8g/apps/openssl genrsa -out $@ 2048
 
 ISP1.req: ISP1.key ISP1.cnf Makefile
-	../../openssl/openssl-0.9.8f/apps/openssl req -new -config ISP1.cnf -key ISP1.key -out $@
+	../../openssl/openssl-0.9.8g/apps/openssl req -new -config ISP1.cnf -key ISP1.key -out $@
 
 ISP1.cer: ISP1.req ISP1.cnf LIR1.key Makefile
 	@test -d ISP1 || mkdir ISP1
 	@test -f ISP1/index || touch ISP1/index
 	@test -f ISP1/serial || echo 01 >ISP1/serial
-	../../openssl/openssl-0.9.8f/apps/openssl ca -batch -out $@ -in ISP1.req -extfile ISP1.cnf -config LIR1.cnf
+	../../openssl/openssl-0.9.8g/apps/openssl ca -batch -out $@ -in ISP1.req -extfile ISP1.cnf -config LIR1.cnf
 
 
 show_req::
-	../../openssl/openssl-0.9.8f/apps/openssl req -noout -text -in ISP1.req -config /dev/null
+	../../openssl/openssl-0.9.8g/apps/openssl req -noout -text -in ISP1.req -config /dev/null
 
 show_cer::
-	../../openssl/openssl-0.9.8f/apps/openssl x509 -noout -text -in ISP1.cer
+	../../openssl/openssl-0.9.8g/apps/openssl x509 -noout -text -in ISP1.cer
diff --git a/scripts/resource-cert-samples/RIR.cer b/scripts/resource-cert-samples/RIR.cer
index 899f8afe..7d69f853 100644
--- a/scripts/resource-cert-samples/RIR.cer
+++ b/scripts/resource-cert-samples/RIR.cer
@@ -1,12 +1,12 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 39 (0x27)
+        Serial Number: 43 (0x2b)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=TEST ENTITY RIR
         Validity
-            Not Before: Oct 19 19:06:07 2007 GMT
-            Not After : Oct 18 19:06:07 2008 GMT
+            Not Before: Oct 29 16:03:51 2007 GMT
+            Not After : Oct 28 16:03:51 2008 GMT
         Subject: CN=TEST ENTITY RIR
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
@@ -59,24 +59,24 @@ Certificate:
                   2001:db8:0:0:0:10:0:44/128
 
     Signature Algorithm: sha256WithRSAEncryption
-        2e:45:6d:53:05:ed:dd:c9:79:ad:3e:69:42:51:c2:83:f4:d6:
-        e6:9b:ab:ec:70:45:6f:8b:08:83:9e:db:91:69:e2:62:03:c8:
-        84:e0:6b:9e:0a:76:80:ff:06:b3:28:ad:8b:7d:75:6c:89:0d:
-        d0:91:55:a3:ed:bb:00:9b:36:23:8e:b2:77:58:05:62:30:4d:
-        c5:90:f3:38:0d:75:ab:4e:5c:2e:40:15:38:76:fe:12:21:14:
-        32:52:1d:0c:3f:3a:b7:76:ef:60:98:58:ef:47:2a:20:23:bc:
-        ce:63:fe:ef:d7:d5:6a:2c:08:19:61:ec:be:0d:f0:23:09:1d:
-        eb:24:c0:f5:fa:30:dd:3b:65:82:09:23:e1:4b:14:15:35:8b:
-        71:88:bb:15:4b:a5:69:ff:77:b3:65:7b:32:ee:e8:5a:af:64:
-        05:cc:7f:f3:eb:72:01:5e:10:66:4c:2f:3b:d7:49:1a:21:9a:
-        1a:21:01:17:18:a3:b2:39:96:7f:3c:a4:25:c7:ea:a8:36:34:
-        60:5e:6d:95:32:a4:a7:c8:7d:af:f3:9a:fc:ed:90:05:07:5c:
-        2e:b3:f2:46:3a:ca:d0:4a:37:41:19:38:9d:f2:32:f8:b7:f2:
-        b8:9b:a7:2a:e2:b2:77:8a:98:49:33:d7:33:04:de:1e:a8:5c:
-        d0:e6:db:45
+        21:d1:04:bf:8b:88:c1:6f:c5:0b:25:0e:54:72:03:59:1f:bc:
+        c1:16:e1:9b:0b:5c:fa:1d:3d:39:b7:c1:3a:5c:74:a4:12:f3:
+        ae:59:75:f8:82:64:58:24:c5:dd:fb:8b:ae:85:23:e0:6a:3b:
+        de:76:ae:b8:55:df:71:42:5e:26:d6:e7:dc:7e:64:47:fa:2b:
+        93:c2:2f:b7:3a:bd:f9:a1:4b:5d:8c:c5:91:51:42:82:9b:49:
+        c3:02:3a:a6:b6:c6:f0:3b:df:cb:78:f9:11:87:69:c4:76:dd:
+        00:8d:c1:35:37:f6:09:0b:7b:d9:62:c0:2e:8b:83:70:0f:47:
+        c5:22:27:39:91:28:95:65:c3:24:d5:54:a0:22:2a:aa:60:a5:
+        ba:4b:72:12:4a:02:ac:15:11:45:cc:70:34:0e:bf:54:f2:fb:
+        5b:d1:15:3d:04:73:66:0c:2b:58:07:5f:c6:1f:49:a5:bc:c1:
+        63:6b:5b:d8:f0:0c:07:41:f6:f3:0b:93:27:53:79:77:c6:1b:
+        b1:46:0a:00:d5:55:57:1e:b3:df:1e:40:54:bf:22:b0:92:ff:
+        54:47:ce:26:ba:75:2b:4c:ad:dd:98:af:12:7b:01:66:b3:94:
+        bc:39:7f:ba:91:f7:eb:5c:cc:f3:58:4a:7d:7d:0e:fc:4c:3f:
+        dc:1e:62:c3
 -----BEGIN CERTIFICATE-----
-MIIEEDCCAvigAwIBAgIBJzANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
-IEVOVElUWSBSSVIwHhcNMDcxMDE5MTkwNjA3WhcNMDgxMDE4MTkwNjA3WjAaMRgw
+MIIEEDCCAvigAwIBAgIBKzANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
+IEVOVElUWSBSSVIwHhcNMDcxMDI5MTYwMzUxWhcNMDgxMDI4MTYwMzUxWjAaMRgw
 FgYDVQQDEw9URVNUIEVOVElUWSBSSVIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
 ggEKAoIBAQCspybEmGiZtvLnxZcFfvnX8uw55iuOwkKIuY8itjxZsA6KHQ74gbHI
 /0qKGkO8eJE+r7KwlWCpPp3C/5mPj7bc2Ea3hjWm9kIFwsWbhBXiWA9wnLxT1yh2
@@ -91,10 +91,10 @@ AgMA/BUCAwD8HAIDAPwgMIGuBggrBgEFBQcBBwEB/wSBnjCBmzAyBAIAATAsAwQA
 CgAAAwQACgMAMA4DBQDAAAIBAwUBwAACIDAOAwUCwAACLAMFAMAAAmQwZQQCAAIw
 XzAmAxECIAENuAAAAAAAAAAAAAAARAMRACABDbgAAAAAAAAAAAAAAQADEAAgAQ24
 AAAAAAAAAAAKAAADEAAgAQ24AAAAAAAAAAAKAwADEQAgAQ24AAAAAAAAABAAAABE
-MA0GCSqGSIb3DQEBCwUAA4IBAQAuRW1TBe3dyXmtPmlCUcKD9Nbmm6vscEVviwiD
-ntuRaeJiA8iE4GueCnaA/wazKK2LfXVsiQ3QkVWj7bsAmzYjjrJ3WAViME3FkPM4
-DXWrTlwuQBU4dv4SIRQyUh0MPzq3du9gmFjvRyogI7zOY/7v19VqLAgZYey+DfAj
-CR3rJMD1+jDdO2WCCSPhSxQVNYtxiLsVS6Vp/3ezZXsy7uhar2QFzH/z63IBXhBm
-TC8710kaIZoaIQEXGKOyOZZ/PKQlx+qoNjRgXm2VMqSnyH2v85r87ZAFB1wus/JG
-OsrQSjdBGTid8jL4t/K4m6cq4rJ3iphJM9czBN4eqFzQ5ttF
+MA0GCSqGSIb3DQEBCwUAA4IBAQAh0QS/i4jBb8ULJQ5UcgNZH7zBFuGbC1z6HT05
+t8E6XHSkEvOuWXX4gmRYJMXd+4uuhSPgajvedq64Vd9xQl4m1ufcfmRH+iuTwi+3
+Or35oUtdjMWRUUKCm0nDAjqmtsbwO9/LePkRh2nEdt0AjcE1N/YJC3vZYsAui4Nw
+D0fFIic5kSiVZcMk1VSgIiqqYKW6S3ISSgKsFRFFzHA0Dr9U8vtb0RU9BHNmDCtY
+B1/GH0mlvMFja1vY8AwHQfbzC5MnU3l3xhuxRgoA1VVXHrPfHkBUvyKwkv9UR84m
+unUrTK3dmK8SewFms5S8OX+6kffrXMzzWEp9fQ78TD/cHmLD
 -----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/RIR/2B.pem b/scripts/resource-cert-samples/RIR/2B.pem
new file mode 100644
index 00000000..7d69f853
--- /dev/null
+++ b/scripts/resource-cert-samples/RIR/2B.pem
@@ -0,0 +1,100 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 43 (0x2b)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=TEST ENTITY RIR
+        Validity
+            Not Before: Oct 29 16:03:51 2007 GMT
+            Not After : Oct 28 16:03:51 2008 GMT
+        Subject: CN=TEST ENTITY RIR
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:ac:a7:26:c4:98:68:99:b6:f2:e7:c5:97:05:7e:
+                    f9:d7:f2:ec:39:e6:2b:8e:c2:42:88:b9:8f:22:b6:
+                    3c:59:b0:0e:8a:1d:0e:f8:81:b1:c8:ff:4a:8a:1a:
+                    43:bc:78:91:3e:af:b2:b0:95:60:a9:3e:9d:c2:ff:
+                    99:8f:8f:b6:dc:d8:46:b7:86:35:a6:f6:42:05:c2:
+                    c5:9b:84:15:e2:58:0f:70:9c:bc:53:d7:28:76:f8:
+                    f2:14:79:22:bd:d6:8b:6c:0e:2b:02:e5:d8:f3:33:
+                    fa:16:43:9b:80:87:f9:b2:45:ab:bd:7d:14:b2:24:
+                    2f:41:13:6f:45:c4:dc:f9:4d:7f:d8:d3:e1:aa:5c:
+                    52:9d:c9:7a:38:b7:b0:43:bd:b7:6a:37:43:ec:e7:
+                    34:c4:3b:4c:ca:cc:7b:1f:91:ef:ab:d4:35:76:42:
+                    82:d4:f5:79:e0:12:3c:24:92:2e:dc:a2:5c:83:f0:
+                    71:8a:26:96:30:d4:b8:96:4d:00:2c:1a:f0:0f:79:
+                    52:c7:27:73:54:77:c1:86:f9:86:61:ce:e0:69:a7:
+                    a8:3d:77:39:e7:24:ee:41:8d:52:19:3b:57:8c:84:
+                    cc:9a:d5:05:7c:e6:83:2c:e3:13:6d:66:1b:87:20:
+                    82:47:e1:05:26:f0:3b:29:69:6d:bc:af:48:91:c4:
+                    40:f1
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                FB:B8:A7:A3:36:48:0A:A0:9F:F0:2E:DC:8B:68:BC:B3:5C:45:25:D7
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            Subject Information Access: 
+                1.3.6.1.5.5.7.48.5 - URI:rsync://wombats-r-us.hactrn.net/RIR/
+
+            sbgp-autonomousSysNum: critical
+                Autonomous System Numbers:
+                  64533-64540
+                  64544
+
+            sbgp-ipAddrBlock: critical
+                IPv4:
+                  10.0.0.0/24
+                  10.3.0.0/24
+                  192.0.2.1-192.0.2.33
+                  192.0.2.44-192.0.2.100
+                IPv6:
+                  2001:db8:0:0:0:0:0:44-2001:db8:0:0:0:0:0:100
+                  2001:db8:0:0:0:0:a00::/120
+                  2001:db8:0:0:0:0:a03::/120
+                  2001:db8:0:0:0:10:0:44/128
+
+    Signature Algorithm: sha256WithRSAEncryption
+        21:d1:04:bf:8b:88:c1:6f:c5:0b:25:0e:54:72:03:59:1f:bc:
+        c1:16:e1:9b:0b:5c:fa:1d:3d:39:b7:c1:3a:5c:74:a4:12:f3:
+        ae:59:75:f8:82:64:58:24:c5:dd:fb:8b:ae:85:23:e0:6a:3b:
+        de:76:ae:b8:55:df:71:42:5e:26:d6:e7:dc:7e:64:47:fa:2b:
+        93:c2:2f:b7:3a:bd:f9:a1:4b:5d:8c:c5:91:51:42:82:9b:49:
+        c3:02:3a:a6:b6:c6:f0:3b:df:cb:78:f9:11:87:69:c4:76:dd:
+        00:8d:c1:35:37:f6:09:0b:7b:d9:62:c0:2e:8b:83:70:0f:47:
+        c5:22:27:39:91:28:95:65:c3:24:d5:54:a0:22:2a:aa:60:a5:
+        ba:4b:72:12:4a:02:ac:15:11:45:cc:70:34:0e:bf:54:f2:fb:
+        5b:d1:15:3d:04:73:66:0c:2b:58:07:5f:c6:1f:49:a5:bc:c1:
+        63:6b:5b:d8:f0:0c:07:41:f6:f3:0b:93:27:53:79:77:c6:1b:
+        b1:46:0a:00:d5:55:57:1e:b3:df:1e:40:54:bf:22:b0:92:ff:
+        54:47:ce:26:ba:75:2b:4c:ad:dd:98:af:12:7b:01:66:b3:94:
+        bc:39:7f:ba:91:f7:eb:5c:cc:f3:58:4a:7d:7d:0e:fc:4c:3f:
+        dc:1e:62:c3
+-----BEGIN CERTIFICATE-----
+MIIEEDCCAvigAwIBAgIBKzANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
+IEVOVElUWSBSSVIwHhcNMDcxMDI5MTYwMzUxWhcNMDgxMDI4MTYwMzUxWjAaMRgw
+FgYDVQQDEw9URVNUIEVOVElUWSBSSVIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCspybEmGiZtvLnxZcFfvnX8uw55iuOwkKIuY8itjxZsA6KHQ74gbHI
+/0qKGkO8eJE+r7KwlWCpPp3C/5mPj7bc2Ea3hjWm9kIFwsWbhBXiWA9wnLxT1yh2
++PIUeSK91otsDisC5djzM/oWQ5uAh/myRau9fRSyJC9BE29FxNz5TX/Y0+GqXFKd
+yXo4t7BDvbdqN0Ps5zTEO0zKzHsfke+r1DV2QoLU9XngEjwkki7colyD8HGKJpYw
+1LiWTQAsGvAPeVLHJ3NUd8GG+YZhzuBpp6g9dznnJO5BjVIZO1eMhMya1QV85oMs
+4xNtZhuHIIJH4QUm8DspaW28r0iRxEDxAgMBAAGjggFfMIIBWzAPBgNVHRMBAf8E
+BTADAQH/MB0GA1UdDgQWBBT7uKejNkgKoJ/wLtyLaLyzXEUl1zAOBgNVHQ8BAf8E
+BAMCAQYwQAYIKwYBBQUHAQsENDAyMDAGCCsGAQUFBzAFhiRyc3luYzovL3dvbWJh
+dHMtci11cy5oYWN0cm4ubmV0L1JJUi8wJgYIKwYBBQUHAQgBAf8EFzAVoBMwETAK
+AgMA/BUCAwD8HAIDAPwgMIGuBggrBgEFBQcBBwEB/wSBnjCBmzAyBAIAATAsAwQA
+CgAAAwQACgMAMA4DBQDAAAIBAwUBwAACIDAOAwUCwAACLAMFAMAAAmQwZQQCAAIw
+XzAmAxECIAENuAAAAAAAAAAAAAAARAMRACABDbgAAAAAAAAAAAAAAQADEAAgAQ24
+AAAAAAAAAAAKAAADEAAgAQ24AAAAAAAAAAAKAwADEQAgAQ24AAAAAAAAABAAAABE
+MA0GCSqGSIb3DQEBCwUAA4IBAQAh0QS/i4jBb8ULJQ5UcgNZH7zBFuGbC1z6HT05
+t8E6XHSkEvOuWXX4gmRYJMXd+4uuhSPgajvedq64Vd9xQl4m1ufcfmRH+iuTwi+3
+Or35oUtdjMWRUUKCm0nDAjqmtsbwO9/LePkRh2nEdt0AjcE1N/YJC3vZYsAui4Nw
+D0fFIic5kSiVZcMk1VSgIiqqYKW6S3ISSgKsFRFFzHA0Dr9U8vtb0RU9BHNmDCtY
+B1/GH0mlvMFja1vY8AwHQfbzC5MnU3l3xhuxRgoA1VVXHrPfHkBUvyKwkv9UR84m
+unUrTK3dmK8SewFms5S8OX+6kffrXMzzWEp9fQ78TD/cHmLD
+-----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/RIR/2C.pem b/scripts/resource-cert-samples/RIR/2C.pem
new file mode 100644
index 00000000..b32d729e
--- /dev/null
+++ b/scripts/resource-cert-samples/RIR/2C.pem
@@ -0,0 +1,98 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 44 (0x2c)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=TEST ENTITY RIR
+        Validity
+            Not Before: Oct 29 16:03:51 2007 GMT
+            Not After : Oct 28 16:03:51 2008 GMT
+        Subject: CN=TEST ENTITY LIR3
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:a3:21:57:61:64:af:11:18:d4:cb:de:a6:dc:ad:
+                    d9:2c:0f:0f:58:9f:7e:c8:85:55:11:26:4c:7c:f0:
+                    6b:68:1a:9e:6a:0c:8f:e6:dc:3d:83:58:2a:cc:77:
+                    ac:19:73:6f:5a:f3:6e:24:ac:cd:1a:dc:1d:0b:4c:
+                    44:f5:6d:8b:0a:17:3d:86:f9:e8:fe:e6:60:e5:9f:
+                    40:6a:e5:94:e8:9a:56:17:17:1c:ab:c1:8c:37:40:
+                    2b:55:bf:2c:5e:dc:8d:ca:25:7f:8a:5f:ee:fb:16:
+                    86:eb:e0:08:d3:26:e5:e3:70:c5:0c:6b:fb:1b:8f:
+                    6b:5c:f6:e2:4a:58:a5:35:01:ea:05:1b:3e:ce:84:
+                    be:b5:3f:6d:18:16:4b:68:e5:79:4c:88:7d:b6:a5:
+                    65:a3:3a:c2:32:dc:ad:8f:8a:05:ee:f6:e9:7a:80:
+                    da:12:a9:0f:5a:b5:d2:d3:31:ac:3e:d3:19:25:2d:
+                    28:de:79:6c:ce:fd:77:66:d5:e3:2f:a9:cb:f9:85:
+                    8c:20:bb:a2:86:23:f0:93:95:20:04:78:c7:c7:07:
+                    a6:fe:f0:f4:45:bb:cf:78:2b:dd:ce:9c:08:a5:46:
+                    68:10:4c:d7:05:62:6c:86:5a:2d:7f:06:38:c2:4d:
+                    bb:44:87:00:43:79:d2:8f:f3:6b:b2:f4:5c:1c:b9:
+                    68:01
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                98:BE:04:FF:80:D1:AB:95:39:AA:3D:F2:0E:67:7D:00:AD:A3:FD:C5
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            Subject Information Access: 
+                1.3.6.1.5.5.7.48.5 - URI:rsync://wombats-r-us.hactrn.net/LIR3/
+
+            Authority Information Access: 
+                CA Issuers - URI:rsync://wombats-r-us.hactrn.net/RIR.cer
+
+            sbgp-autonomousSysNum: critical
+                Autonomous System Numbers:
+                  64534-64540
+
+            sbgp-ipAddrBlock: critical
+                IPv4:
+                  10.0.0.0/24
+                  10.3.0.0/24
+                IPv6:
+                  2001:db8:0:0:0:0:a00::/120
+                  2001:db8:0:0:0:0:a03::/120
+
+    Signature Algorithm: sha256WithRSAEncryption
+        5f:28:81:1a:2c:d6:f6:55:be:cc:d2:3c:a1:fe:6c:86:6f:7d:
+        cc:9d:be:96:0d:03:45:27:cd:c4:e7:a5:be:9e:24:59:76:24:
+        ef:4b:3e:14:4a:d4:88:29:90:bf:87:38:75:68:d7:3d:c6:b5:
+        cc:dd:dc:6c:71:3f:92:de:f0:79:c5:f1:3c:83:d7:f9:bb:22:
+        ad:3e:f7:69:df:73:9c:06:9b:cc:47:d9:ef:d4:1f:09:69:38:
+        a9:e4:a9:f6:a6:b7:ec:f7:ee:6e:fd:cf:90:31:db:3b:dc:fe:
+        8b:45:dc:34:39:8c:fe:0f:6a:53:b6:7f:25:1d:aa:e3:23:9a:
+        73:73:cc:6f:ad:63:e9:c8:e7:f7:98:68:52:e7:1f:5d:f1:f4:
+        f6:ac:4e:9b:f5:c8:22:ab:b2:01:b5:25:b1:39:d9:21:25:5f:
+        b6:e0:a2:b0:41:7e:15:30:71:ed:39:f2:0a:f9:84:ef:13:78:
+        9b:91:96:4f:e7:9a:26:a7:5d:f5:7b:36:15:4a:1d:6c:dd:91:
+        85:8d:be:7c:76:59:05:b9:19:41:76:09:e7:29:d9:86:90:53:
+        b0:64:8a:3e:7c:43:aa:1f:aa:68:60:19:fd:bf:15:9c:be:a8:
+        a6:b8:24:13:76:88:c5:fe:2a:6e:df:4d:67:f4:26:b1:8c:ce:
+        b9:ba:fb:d6
+-----BEGIN CERTIFICATE-----
+MIID9DCCAtygAwIBAgIBLDANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
+IEVOVElUWSBSSVIwHhcNMDcxMDI5MTYwMzUxWhcNMDgxMDI4MTYwMzUxWjAbMRkw
+FwYDVQQDExBURVNUIEVOVElUWSBMSVIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAoyFXYWSvERjUy96m3K3ZLA8PWJ9+yIVVESZMfPBraBqeagyP5tw9
+g1gqzHesGXNvWvNuJKzNGtwdC0xE9W2LChc9hvno/uZg5Z9AauWU6JpWFxccq8GM
+N0ArVb8sXtyNyiV/il/u+xaG6+AI0ybl43DFDGv7G49rXPbiSlilNQHqBRs+zoS+
+tT9tGBZLaOV5TIh9tqVlozrCMtytj4oF7vbpeoDaEqkPWrXS0zGsPtMZJS0o3nls
+zv13ZtXjL6nL+YWMILuihiPwk5UgBHjHxwem/vD0RbvPeCvdzpwIpUZoEEzXBWJs
+hlotfwY4wk27RIcAQ3nSj/NrsvRcHLloAQIDAQABo4IBQjCCAT4wDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUmL4E/4DRq5U5qj3yDmd9AK2j/cUwDgYDVR0PAQH/
+BAQDAgEGMEEGCCsGAQUFBwELBDUwMzAxBggrBgEFBQcwBYYlcnN5bmM6Ly93b21i
+YXRzLXItdXMuaGFjdHJuLm5ldC9MSVIzLzBDBggrBgEFBQcBAQQ3MDUwMwYIKwYB
+BQUHMAKGJ3JzeW5jOi8vd29tYmF0cy1yLXVzLmhhY3Rybi5uZXQvUklSLmNlcjAh
+BggrBgEFBQcBCAEB/wQSMBCgDjAMMAoCAwD8FgIDAPwcMFEGCCsGAQUFBwEHAQH/
+BEIwQDASBAIAATAMAwQACgAAAwQACgMAMCoEAgACMCQDEAAgAQ24AAAAAAAAAAAK
+AAADEAAgAQ24AAAAAAAAAAAKAwAwDQYJKoZIhvcNAQELBQADggEBAF8ogRos1vZV
+vszSPKH+bIZvfcydvpYNA0UnzcTnpb6eJFl2JO9LPhRK1IgpkL+HOHVo1z3Gtczd
+3GxxP5Le8HnF8TyD1/m7Iq0+92nfc5wGm8xH2e/UHwlpOKnkqfamt+z37m79z5Ax
+2zvc/otF3DQ5jP4PalO2fyUdquMjmnNzzG+tY+nI5/eYaFLnH13x9PasTpv1yCKr
+sgG1JbE52SElX7bgorBBfhUwce058gr5hO8TeJuRlk/nmianXfV7NhVKHWzdkYWN
+vnx2WQW5GUF2Cecp2YaQU7Bkij58Q6ofqmhgGf2/FZy+qKa4JBN2iMX+Km7fTWf0
+JrGMzrm6+9Y=
+-----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/RIR/2D.pem b/scripts/resource-cert-samples/RIR/2D.pem
new file mode 100644
index 00000000..61bb37a9
--- /dev/null
+++ b/scripts/resource-cert-samples/RIR/2D.pem
@@ -0,0 +1,95 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 45 (0x2d)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=TEST ENTITY RIR
+        Validity
+            Not Before: Oct 29 16:03:51 2007 GMT
+            Not After : Oct 28 16:03:51 2008 GMT
+        Subject: CN=TEST ENTITY LIR2
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:f1:18:b6:79:0b:35:c5:83:64:48:83:31:03:9e:
+                    e7:72:28:65:b1:ac:61:e1:77:2e:c0:4d:f0:b1:1c:
+                    61:d8:cc:5a:2d:c7:0b:9b:78:7a:3e:fd:37:ad:fa:
+                    b0:73:0b:9c:fc:bb:6f:60:ea:38:ef:ae:d1:27:b8:
+                    81:59:0f:b3:e7:d0:67:b2:a2:f5:4f:e2:04:c6:cc:
+                    13:9f:33:28:35:96:7a:db:ce:ac:9d:d3:64:3d:b8:
+                    44:bc:cb:43:22:92:d6:3c:2e:bf:97:6e:39:6a:6e:
+                    68:93:5d:1c:a8:58:b7:a3:7a:26:44:fe:fe:30:ad:
+                    e2:05:89:4c:c9:ef:2c:e0:4e:31:69:3f:dd:91:1c:
+                    f0:b0:25:4c:3e:84:8a:ea:5e:03:b3:a8:cd:90:1a:
+                    1e:c8:e0:af:fe:11:ed:21:06:bd:3c:5e:08:a1:93:
+                    e2:41:43:43:38:d3:21:b3:4c:fa:85:8b:43:57:60:
+                    5d:bb:a0:78:e5:33:47:a8:33:76:be:df:6e:63:61:
+                    e3:31:8b:5d:8e:0c:c7:f5:c8:91:0c:be:57:c7:f2:
+                    bc:be:0b:ba:7a:1f:f6:19:f1:eb:00:74:c1:12:c2:
+                    dc:2b:2e:8d:f0:0a:ff:7f:e8:60:08:90:ba:51:fc:
+                    d0:90:11:37:f3:9e:44:b6:64:43:69:5d:61:d3:e1:
+                    8d:77
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                03:7A:DF:0C:DF:DC:93:3D:F7:A5:CC:27:7B:DC:22:F6:E9:55:97:F0
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            Subject Information Access: 
+                1.3.6.1.5.5.7.48.5 - URI:rsync://wombats-r-us.hactrn.net/LIR2/
+
+            Authority Information Access: 
+                CA Issuers - URI:rsync://wombats-r-us.hactrn.net/RIR.cer
+
+            sbgp-autonomousSysNum: critical
+                Autonomous System Numbers:
+                  64544
+
+            sbgp-ipAddrBlock: critical
+                IPv6:
+                  2001:db8:0:0:0:0:0:44-2001:db8:0:0:0:0:0:100
+                  2001:db8:0:0:0:10:0:44/128
+
+    Signature Algorithm: sha256WithRSAEncryption
+        5c:f7:ec:cb:ed:16:f2:e4:e2:cd:ca:e8:3c:ae:2f:9d:16:7e:
+        8b:f1:e7:bf:db:ef:44:85:95:15:ed:d7:8e:99:a5:9d:f5:98:
+        9e:c2:96:c4:c7:78:23:9a:36:fe:aa:9f:d5:fc:dc:b4:cc:b5:
+        25:21:79:cd:74:e9:a8:95:b2:05:c4:4f:a0:37:d1:16:b5:bd:
+        48:de:9b:b1:c1:91:d7:a3:e3:7f:bb:af:ed:59:21:57:1d:ef:
+        20:ed:a2:4d:a9:34:35:0c:05:a4:cb:8a:8a:08:d6:16:53:07:
+        9f:a4:63:29:0e:9d:ed:69:34:3f:6e:35:53:8c:90:11:17:36:
+        75:96:ea:f1:34:fa:d7:73:7c:0c:ab:95:44:d1:a5:e9:85:74:
+        05:f8:5c:f6:70:6c:94:c2:ea:61:e1:6a:94:f4:b8:66:8d:c3:
+        c5:0e:f5:47:a2:8a:1e:40:f1:30:97:b0:e1:de:e4:89:95:a3:
+        f6:a0:56:64:9f:e6:63:23:24:f5:41:4f:36:01:c2:50:2f:99:
+        dc:53:e8:e0:b0:eb:bd:1d:8d:28:3f:ce:b5:0b:68:2b:a2:cf:
+        e2:14:53:ae:10:2a:3e:51:00:96:5c:09:b5:41:97:fb:ba:19:
+        94:d4:3e:74:f3:65:9d:bf:0b:77:45:7a:1d:1c:aa:74:f2:ea:
+        53:a6:92:6d
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIBLTANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
+IEVOVElUWSBSSVIwHhcNMDcxMDI5MTYwMzUxWhcNMDgxMDI4MTYwMzUxWjAbMRkw
+FwYDVQQDExBURVNUIEVOVElUWSBMSVIyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA8Ri2eQs1xYNkSIMxA57ncihlsaxh4XcuwE3wsRxh2MxaLccLm3h6
+Pv03rfqwcwuc/LtvYOo4767RJ7iBWQ+z59BnsqL1T+IExswTnzMoNZZ6286sndNk
+PbhEvMtDIpLWPC6/l245am5ok10cqFi3o3omRP7+MK3iBYlMye8s4E4xaT/dkRzw
+sCVMPoSK6l4Ds6jNkBoeyOCv/hHtIQa9PF4IoZPiQUNDONMhs0z6hYtDV2Bdu6B4
+5TNHqDN2vt9uY2HjMYtdjgzH9ciRDL5Xx/K8vgu6eh/2GfHrAHTBEsLcKy6N8Ar/
+f+hgCJC6UfzQkBE3855EtmRDaV1h0+GNdwIDAQABo4IBPjCCATowDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUA3rfDN/ckz33pcwne9wi9ulVl/AwDgYDVR0PAQH/
+BAQDAgEGMEEGCCsGAQUFBwELBDUwMzAxBggrBgEFBQcwBYYlcnN5bmM6Ly93b21i
+YXRzLXItdXMuaGFjdHJuLm5ldC9MSVIyLzBDBggrBgEFBQcBAQQ3MDUwMwYIKwYB
+BQUHMAKGJ3JzeW5jOi8vd29tYmF0cy1yLXVzLmhhY3Rybi5uZXQvUklSLmNlcjAa
+BggrBgEFBQcBCAEB/wQLMAmgBzAFAgMA/CAwVAYIKwYBBQUHAQcBAf8ERTBDMEEE
+AgACMDswJgMRAiABDbgAAAAAAAAAAAAAAEQDEQAgAQ24AAAAAAAAAAAAAAEAAxEA
+IAENuAAAAAAAAAAQAAAARDANBgkqhkiG9w0BAQsFAAOCAQEAXPfsy+0W8uTizcro
+PK4vnRZ+i/Hnv9vvRIWVFe3XjpmlnfWYnsKWxMd4I5o2/qqf1fzctMy1JSF5zXTp
+qJWyBcRPoDfRFrW9SN6bscGR16Pjf7uv7VkhVx3vIO2iTak0NQwFpMuKigjWFlMH
+n6RjKQ6d7Wk0P241U4yQERc2dZbq8TT613N8DKuVRNGl6YV0Bfhc9nBslMLqYeFq
+lPS4Zo3DxQ71R6KKHkDxMJew4d7kiZWj9qBWZJ/mYyMk9UFPNgHCUC+Z3FPo4LDr
+vR2NKD/OtQtoK6LP4hRTrhAqPlEAllwJtUGX+7oZlNQ+dPNlnb8Ld0V6HRyqdPLq
+U6aSbQ==
+-----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/RIR/2E.pem b/scripts/resource-cert-samples/RIR/2E.pem
new file mode 100644
index 00000000..272d774d
--- /dev/null
+++ b/scripts/resource-cert-samples/RIR/2E.pem
@@ -0,0 +1,94 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 46 (0x2e)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=TEST ENTITY RIR
+        Validity
+            Not Before: Oct 29 16:03:51 2007 GMT
+            Not After : Oct 28 16:03:51 2008 GMT
+        Subject: CN=TEST ENTITY LIR1
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:af:5d:1c:f9:d9:bb:d5:01:e1:5b:36:cc:51:f6:
+                    fd:86:57:60:aa:9e:c7:ec:4e:05:af:fb:51:5c:7a:
+                    c2:58:c4:a8:57:ae:14:62:e9:bc:b6:72:7d:cf:49:
+                    c8:4a:40:82:4a:f4:3e:30:b5:94:25:9e:6c:78:81:
+                    57:43:d6:85:02:8d:d1:9c:b5:d7:34:2f:e2:a9:7d:
+                    18:27:b5:47:9a:42:16:c8:90:7f:96:2c:dd:b8:98:
+                    17:1f:77:62:4a:08:00:2d:e0:73:0c:39:37:ba:0f:
+                    a7:59:59:4c:7c:cd:e2:5c:d7:98:36:10:6c:88:3e:
+                    45:99:a6:88:2f:f6:7f:31:49:ba:42:2b:13:79:c2:
+                    b2:f1:09:d9:ad:37:a4:41:b6:6d:46:a1:18:05:a0:
+                    53:07:8e:e0:98:b2:d1:fd:67:68:77:64:d5:f3:fe:
+                    1d:22:36:9e:26:5a:1a:aa:18:94:c3:2c:7e:9a:af:
+                    be:2c:9d:5e:75:2c:49:d6:37:2b:06:1f:cc:63:97:
+                    7e:ee:2c:5f:67:af:4d:62:3e:7a:1f:0c:e1:1e:02:
+                    f2:d2:06:75:ae:3f:11:bc:8e:0f:13:64:38:14:36:
+                    1d:5d:02:ec:af:65:d5:b9:68:f4:22:66:2b:ef:47:
+                    5b:ad:3b:f2:af:b6:71:0c:94:56:8a:7c:01:36:f0:
+                    3a:3f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                8A:94:17:F9:53:F2:5B:94:54:56:DF:76:51:13:29:F6:71:19:A8:B3
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            Subject Information Access: 
+                1.3.6.1.5.5.7.48.5 - URI:rsync://wombats-r-us.hactrn.net/LIR1/
+
+            Authority Information Access: 
+                CA Issuers - URI:rsync://wombats-r-us.hactrn.net/RIR.cer
+
+            sbgp-autonomousSysNum: critical
+                Autonomous System Numbers:
+                  64533
+
+            sbgp-ipAddrBlock: critical
+                IPv4:
+                  192.0.2.1-192.0.2.33
+                  192.0.2.44-192.0.2.100
+
+    Signature Algorithm: sha256WithRSAEncryption
+        51:ad:f6:e5:8b:1c:98:ed:f8:31:15:2c:ec:d5:be:9e:97:0d:
+        4a:f8:ab:6d:dd:35:6c:57:d1:d7:f1:c6:e4:c7:1d:b9:e6:c9:
+        5b:92:21:ec:64:79:9d:83:0f:5d:5e:5c:20:1b:8f:01:d5:a8:
+        e3:5f:7e:c3:0c:c2:3c:80:f7:f0:aa:e6:ff:c7:6a:16:7f:e7:
+        94:dc:69:42:1b:dd:36:f0:45:61:f5:cd:1f:a7:6f:20:04:af:
+        1e:6e:84:76:00:e2:6a:8d:02:81:31:a4:5f:3f:41:62:7a:87:
+        21:0b:da:08:6a:d3:90:4b:fe:c3:48:99:92:23:c9:f6:35:0b:
+        d8:48:9d:44:8c:e5:26:79:62:7a:78:c6:4b:18:42:65:0b:63:
+        a0:63:18:15:e6:8d:1d:93:12:15:eb:c3:93:c8:7d:10:5a:8f:
+        49:c5:a4:53:95:11:5c:db:f5:26:b7:2f:90:bd:6e:76:84:f9:
+        57:90:96:f5:25:75:7f:18:c6:4c:bb:aa:6a:ce:72:6d:0a:a7:
+        59:11:ea:9e:6f:b5:1f:5d:c9:db:f5:56:74:fe:ca:60:62:80:
+        b5:b1:6c:e7:24:d6:c4:c1:b0:05:0b:76:31:af:82:07:2d:9a:
+        a2:75:4d:18:54:0e:24:29:22:2d:02:ba:bd:51:cd:f0:02:6e:
+        5b:6e:12:f8
+-----BEGIN CERTIFICATE-----
+MIID1TCCAr2gAwIBAgIBLjANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
+IEVOVElUWSBSSVIwHhcNMDcxMDI5MTYwMzUxWhcNMDgxMDI4MTYwMzUxWjAbMRkw
+FwYDVQQDExBURVNUIEVOVElUWSBMSVIxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAr10c+dm71QHhWzbMUfb9hldgqp7H7E4Fr/tRXHrCWMSoV64UYum8
+tnJ9z0nISkCCSvQ+MLWUJZ5seIFXQ9aFAo3RnLXXNC/iqX0YJ7VHmkIWyJB/lizd
+uJgXH3diSggALeBzDDk3ug+nWVlMfM3iXNeYNhBsiD5FmaaIL/Z/MUm6QisTecKy
+8QnZrTekQbZtRqEYBaBTB47gmLLR/Wdod2TV8/4dIjaeJloaqhiUwyx+mq++LJ1e
+dSxJ1jcrBh/MY5d+7ixfZ69NYj56HwzhHgLy0gZ1rj8RvI4PE2Q4FDYdXQLsr2XV
+uWj0ImYr70dbrTvyr7ZxDJRWinwBNvA6PwIDAQABo4IBIzCCAR8wDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUipQX+VPyW5RUVt92URMp9nEZqLMwDgYDVR0PAQH/
+BAQDAgEGMEEGCCsGAQUFBwELBDUwMzAxBggrBgEFBQcwBYYlcnN5bmM6Ly93b21i
+YXRzLXItdXMuaGFjdHJuLm5ldC9MSVIxLzBDBggrBgEFBQcBAQQ3MDUwMwYIKwYB
+BQUHMAKGJ3JzeW5jOi8vd29tYmF0cy1yLXVzLmhhY3Rybi5uZXQvUklSLmNlcjAa
+BggrBgEFBQcBCAEB/wQLMAmgBzAFAgMA/BUwOQYIKwYBBQUHAQcBAf8EKjAoMCYE
+AgABMCAwDgMFAMAAAgEDBQHAAAIgMA4DBQLAAAIsAwUAwAACZDANBgkqhkiG9w0B
+AQsFAAOCAQEAUa325YscmO34MRUs7NW+npcNSvirbd01bFfR1/HG5McduebJW5Ih
+7GR5nYMPXV5cIBuPAdWo419+wwzCPID38Krm/8dqFn/nlNxpQhvdNvBFYfXNH6dv
+IASvHm6EdgDiao0CgTGkXz9BYnqHIQvaCGrTkEv+w0iZkiPJ9jUL2EidRIzlJnli
+enjGSxhCZQtjoGMYFeaNHZMSFevDk8h9EFqPScWkU5URXNv1JrcvkL1udoT5V5CW
+9SV1fxjGTLuqas5ybQqnWRHqnm+1H13J2/VWdP7KYGKAtbFs5yTWxMGwBQt2Ma+C
+By2aonVNGFQOJCkiLQK6vVHN8AJuW24S+A==
+-----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/RIR/index b/scripts/resource-cert-samples/RIR/index
index 9adf1f8f..c559e62c 100644
--- a/scripts/resource-cert-samples/RIR/index
+++ b/scripts/resource-cert-samples/RIR/index
@@ -40,3 +40,7 @@ V	081018190607Z		27	unknown	/CN=TEST ENTITY RIR
 V	081018190607Z		28	unknown	/CN=TEST ENTITY LIR3
 V	081018190607Z		29	unknown	/CN=TEST ENTITY LIR2
 V	081018190607Z		2A	unknown	/CN=TEST ENTITY LIR1
+V	081028160351Z		2B	unknown	/CN=TEST ENTITY RIR
+V	081028160351Z		2C	unknown	/CN=TEST ENTITY LIR3
+V	081028160351Z		2D	unknown	/CN=TEST ENTITY LIR2
+V	081028160351Z		2E	unknown	/CN=TEST ENTITY LIR1
diff --git a/scripts/resource-cert-samples/RIR/index.old b/scripts/resource-cert-samples/RIR/index.old
index 6d485250..726eac1b 100644
--- a/scripts/resource-cert-samples/RIR/index.old
+++ b/scripts/resource-cert-samples/RIR/index.old
@@ -39,3 +39,7 @@ V	080809011510Z		26	unknown	/CN=TEST ENTITY LIR1
 V	081018190607Z		27	unknown	/CN=TEST ENTITY RIR
 V	081018190607Z		28	unknown	/CN=TEST ENTITY LIR3
 V	081018190607Z		29	unknown	/CN=TEST ENTITY LIR2
+V	081018190607Z		2A	unknown	/CN=TEST ENTITY LIR1
+V	081028160351Z		2B	unknown	/CN=TEST ENTITY RIR
+V	081028160351Z		2C	unknown	/CN=TEST ENTITY LIR3
+V	081028160351Z		2D	unknown	/CN=TEST ENTITY LIR2
diff --git a/scripts/resource-cert-samples/RIR/serial b/scripts/resource-cert-samples/RIR/serial
index 6a38d8bf..da51c429 100644
--- a/scripts/resource-cert-samples/RIR/serial
+++ b/scripts/resource-cert-samples/RIR/serial
@@ -1 +1 @@
-2B
+2F
diff --git a/scripts/resource-cert-samples/RIR/serial.old b/scripts/resource-cert-samples/RIR/serial.old
index 8676c24e..11ddf0af 100644
--- a/scripts/resource-cert-samples/RIR/serial.old
+++ b/scripts/resource-cert-samples/RIR/serial.old
@@ -1 +1 @@
-2A
+2E
diff --git a/tests/resource-set/Makefile b/tests/resource-set/Makefile
index e73674e4..364d7ad5 100644
--- a/tests/resource-set/Makefile
+++ b/tests/resource-set/Makefile
@@ -1,6 +1,6 @@
 # $Id$
 
-OPENSSL_DIR = ../../openssl/openssl-0.9.8f
+OPENSSL_DIR = ../../openssl/openssl-0.9.8g
 
 CFLAGS = -g -I${OPENSSL_DIR}/include
 
diff --git a/tests/uri/Makefile b/tests/uri/Makefile
index 80d7eed1..3c57fdf8 100644
--- a/tests/uri/Makefile
+++ b/tests/uri/Makefile
@@ -1,6 +1,6 @@
 # $Id$
 
-OPENSSL_DIR = ../../openssl/openssl-0.9.8f
+OPENSSL_DIR = ../../openssl/openssl-0.9.8g
 
 CFLAGS = -g -I${OPENSSL_DIR}/include
author	Rob Austein <sra@hactrn.net>	2007-10-29 16:08:39 +0000
committer	Rob Austein <sra@hactrn.net>	2007-10-29 16:08:39 +0000
commit	ad6d9a46ba9a14d6cd5560ee78ba4cc1ad770ff6 (patch)
tree	208b82f25f3c56e3b6fc3388bb92a4eaa824601f
parent	0487907ac58a6f2f84177434091743879733304e (diff)