Isolate OpenSSL version number into one Makefile.

svn path=/openssl/Makefile; revision=1192

8 files changed, 397 insertions, 2 deletions

diff --git a/scripts/resource-cert-samples/RIR/2F.pem b/scripts/resource-cert-samples/RIR/2F.pem
new file mode 100644
index 00000000..d7154c7c
--- /dev/null
+++ b/scripts/resource-cert-samples/RIR/2F.pem
@@ -0,0 +1,100 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 47 (0x2f)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=TEST ENTITY RIR
+        Validity
+            Not Before: Oct 29 16:32:33 2007 GMT
+            Not After : Oct 28 16:32:33 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
+        90:3c:6e:1d:89:9d:00:53:b4:b1:36:ea:2b:cf:21:d5:b2:77:
+        66:be:da:ad:db:92:35:0d:83:55:f5:92:11:73:93:af:1a:ec:
+        1d:7a:1a:84:8f:c0:61:29:f1:51:c7:a6:7c:95:7c:a8:38:40:
+        57:6b:fc:51:38:fd:6b:8a:7a:58:d8:c6:36:a5:0d:9b:7a:b9:
+        b4:47:e1:a5:fc:66:b6:51:22:45:50:94:b4:f2:47:f2:a2:29:
+        6a:33:6a:3c:26:44:c5:5a:17:ce:7a:f3:4a:46:0e:f4:fd:36:
+        01:7c:c5:1e:59:bc:3a:e7:36:f3:64:d4:0c:7a:f7:6a:ef:11:
+        ae:32:5a:77:62:b3:e4:b3:9e:16:9f:11:28:cb:11:dd:79:ff:
+        a5:b8:3e:3f:fd:df:34:92:2f:f4:0e:d2:50:a8:80:a1:17:91:
+        50:c7:d3:af:c5:6e:d8:ca:cd:28:e0:92:28:b3:c4:13:39:9d:
+        fc:a1:57:61:22:22:70:57:27:5f:33:72:17:a8:04:89:9d:44:
+        9b:7d:1a:66:10:19:f3:b9:9c:17:48:22:71:c6:a5:e0:ba:00:
+        ab:a4:01:bb:c7:2b:8f:0f:25:8a:20:71:21:4f:c0:74:34:14:
+        e5:23:3a:70:48:c2:04:9a:93:97:29:f9:39:7b:ac:1a:e4:2b:
+        0d:13:b6:b7
+-----BEGIN CERTIFICATE-----
+MIIEEDCCAvigAwIBAgIBLzANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
+IEVOVElUWSBSSVIwHhcNMDcxMDI5MTYzMjMzWhcNMDgxMDI4MTYzMjMzWjAaMRgw
+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
+MA0GCSqGSIb3DQEBCwUAA4IBAQCQPG4diZ0AU7SxNuorzyHVsndmvtqt25I1DYNV
+9ZIRc5OvGuwdehqEj8BhKfFRx6Z8lXyoOEBXa/xROP1rinpY2MY2pQ2berm0R+Gl
+/Ga2USJFUJS08kfyoilqM2o8JkTFWhfOevNKRg70/TYBfMUeWbw65zbzZNQMevdq
+7xGuMlp3YrPks54WnxEoyxHdef+luD4//d80ki/0DtJQqIChF5FQx9OvxW7Yys0o
+4JIos8QTOZ38oVdhIiJwVydfM3IXqASJnUSbfRpmEBnzuZwXSCJxxqXgugCrpAG7
+xyuPDyWKIHEhT8B0NBTlIzpwSMIEmpOXKfk5e6wa5CsNE7a3
+-----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/RIR/30.pem b/scripts/resource-cert-samples/RIR/30.pem
new file mode 100644
index 00000000..c466f22e
--- /dev/null
+++ b/scripts/resource-cert-samples/RIR/30.pem
@@ -0,0 +1,98 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 48 (0x30)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=TEST ENTITY RIR
+        Validity
+            Not Before: Oct 29 16:32:33 2007 GMT
+            Not After : Oct 28 16:32:33 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
+        18:25:58:2e:ac:98:93:f2:ce:b9:cf:fe:31:1d:4e:a4:64:bc:
+        f6:59:19:88:af:01:cb:72:68:04:4a:41:5f:d6:dc:86:f6:c3:
+        a3:83:06:ba:96:4c:fd:eb:26:a5:5d:64:07:08:fa:87:94:df:
+        00:b2:44:2e:dd:23:f6:cb:6b:80:b4:65:3d:61:e1:4c:3f:de:
+        db:a1:90:0f:da:0d:f1:cc:7c:72:1d:0e:07:50:87:3b:76:4b:
+        17:06:67:b8:a4:65:4e:94:7c:1e:e0:3f:99:3f:90:8e:9a:c5:
+        42:6f:35:bb:78:48:6b:0f:83:59:b9:57:70:94:dc:ad:d9:c4:
+        c0:bb:72:9c:c4:0d:e9:d8:69:7b:f1:dc:72:52:95:38:3c:6c:
+        c0:ed:e9:19:f3:48:9c:e5:60:d9:46:55:66:ab:b2:fb:bd:cd:
+        f0:c3:43:eb:48:1a:86:1f:71:6a:b6:11:65:e2:88:43:ab:4e:
+        69:a3:a7:ba:5c:09:f6:30:c5:93:f3:6a:72:be:9a:cf:5f:ba:
+        ea:3a:76:4f:43:03:13:12:4f:a6:ca:ed:c5:09:2f:2d:be:4a:
+        02:50:05:7d:f5:2c:61:af:1b:79:31:ad:b1:3b:4c:61:b0:99:
+        9f:95:19:ab:71:5f:b0:df:0f:9b:bf:38:42:a6:38:b3:a8:e8:
+        2c:c1:68:13
+-----BEGIN CERTIFICATE-----
+MIID9DCCAtygAwIBAgIBMDANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
+IEVOVElUWSBSSVIwHhcNMDcxMDI5MTYzMjMzWhcNMDgxMDI4MTYzMjMzWjAbMRkw
+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
+AAADEAAgAQ24AAAAAAAAAAAKAwAwDQYJKoZIhvcNAQELBQADggEBABglWC6smJPy
+zrnP/jEdTqRkvPZZGYivActyaARKQV/W3Ib2w6ODBrqWTP3rJqVdZAcI+oeU3wCy
+RC7dI/bLa4C0ZT1h4Uw/3tuhkA/aDfHMfHIdDgdQhzt2SxcGZ7ikZU6UfB7gP5k/
+kI6axUJvNbt4SGsPg1m5V3CU3K3ZxMC7cpzEDenYaXvx3HJSlTg8bMDt6RnzSJzl
+YNlGVWarsvu9zfDDQ+tIGoYfcWq2EWXiiEOrTmmjp7pcCfYwxZPzanK+ms9fuuo6
+dk9DAxMST6bK7cUJLy2+SgJQBX31LGGvG3kxrbE7TGGwmZ+VGatxX7DfD5u/OEKm
+OLOo6CzBaBM=
+-----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/RIR/31.pem b/scripts/resource-cert-samples/RIR/31.pem
new file mode 100644
index 00000000..dcc97dd1
--- /dev/null
+++ b/scripts/resource-cert-samples/RIR/31.pem
@@ -0,0 +1,95 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 49 (0x31)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=TEST ENTITY RIR
+        Validity
+            Not Before: Oct 29 16:32:33 2007 GMT
+            Not After : Oct 28 16:32:33 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
+        02:2b:a6:e7:ef:15:1e:a6:bf:dc:1f:4e:c5:5d:41:de:c2:82:
+        03:1b:94:25:3e:35:3f:ed:ac:cc:25:49:cb:f2:a3:91:cb:33:
+        72:3a:ef:f8:93:24:42:f9:3e:13:5d:50:07:6c:00:40:60:80:
+        06:22:db:07:43:d2:58:17:37:bd:22:89:d2:8d:9f:a0:e3:7e:
+        10:cd:e7:98:3d:4e:fa:5a:8b:05:23:b1:c6:88:9c:41:72:a9:
+        b7:7c:b8:a2:37:9f:76:6f:98:23:e2:90:02:75:dc:94:ae:3f:
+        72:1d:51:53:f3:dc:ec:a1:00:28:6e:13:5f:66:4f:6e:4a:61:
+        c1:0e:4e:b9:db:4e:11:bc:d9:57:fd:07:05:6e:05:5d:7a:52:
+        ae:7f:d5:50:cf:e3:6b:ff:87:03:9f:6c:b2:aa:f4:28:c3:75:
+        6d:09:bf:31:da:cb:40:fa:8f:ed:15:32:59:a7:9e:5b:8b:0d:
+        b2:4b:f1:1d:fd:37:ac:dc:6b:56:b5:64:1b:ce:56:12:41:e0:
+        d6:ff:7e:f4:84:f5:27:42:a2:2c:c5:b7:47:14:e1:f9:84:80:
+        a9:6e:cf:5f:64:40:ac:36:6e:03:f2:db:ae:e2:bf:ba:d4:98:
+        99:35:21:6f:5d:d9:db:f1:a9:1b:dc:13:11:aa:86:e7:a8:bc:
+        aa:ee:dd:ce
+-----BEGIN CERTIFICATE-----
+MIID8DCCAtigAwIBAgIBMTANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
+IEVOVElUWSBSSVIwHhcNMDcxMDI5MTYzMjMzWhcNMDgxMDI4MTYzMjMzWjAbMRkw
+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
+IAENuAAAAAAAAAAQAAAARDANBgkqhkiG9w0BAQsFAAOCAQEAAium5+8VHqa/3B9O
+xV1B3sKCAxuUJT41P+2szCVJy/Kjkcszcjrv+JMkQvk+E11QB2wAQGCABiLbB0PS
+WBc3vSKJ0o2foON+EM3nmD1O+lqLBSOxxoicQXKpt3y4ojefdm+YI+KQAnXclK4/
+ch1RU/Pc7KEAKG4TX2ZPbkphwQ5OudtOEbzZV/0HBW4FXXpSrn/VUM/ja/+HA59s
+sqr0KMN1bQm/MdrLQPqP7RUyWaeeW4sNskvxHf03rNxrVrVkG85WEkHg1v9+9IT1
+J0KiLMW3RxTh+YSAqW7PX2RArDZuA/LbruK/utSYmTUhb13Z2/GpG9wTEaqG56i8
+qu7dzg==
+-----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/RIR/32.pem b/scripts/resource-cert-samples/RIR/32.pem
new file mode 100644
index 00000000..348c6275
--- /dev/null
+++ b/scripts/resource-cert-samples/RIR/32.pem
@@ -0,0 +1,94 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 50 (0x32)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: CN=TEST ENTITY RIR
+        Validity
+            Not Before: Oct 29 16:32:33 2007 GMT
+            Not After : Oct 28 16:32:33 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
+        71:ca:3c:b4:39:4f:ec:c2:ba:bd:c4:e5:9d:b8:9e:12:5a:0d:
+        af:f6:e0:f5:65:0c:54:ac:5c:17:d2:29:92:a4:84:ea:47:09:
+        53:75:52:7c:af:67:11:7b:fb:35:14:77:9e:8e:34:a9:39:5a:
+        87:65:7f:5e:e7:81:80:82:4b:b2:e4:07:c3:7d:1e:bf:0a:31:
+        ff:43:9c:66:31:b0:19:0a:ea:52:14:67:62:f6:91:15:5c:d4:
+        da:f7:bb:87:1c:9d:31:4c:0d:8c:f6:c9:1c:44:68:21:09:49:
+        a9:d7:cc:7f:54:c2:cd:44:09:98:e9:7c:73:a3:9d:36:38:e8:
+        e2:bd:16:19:94:fd:97:ff:91:ca:62:22:1a:ff:f7:2c:a0:b9:
+        79:a4:07:84:37:bb:50:8b:6a:6b:25:9a:8e:3c:fb:4f:09:2b:
+        e1:75:c4:d4:2e:73:a2:cd:ce:f5:83:3c:a5:ca:33:f6:c8:39:
+        f8:dd:78:3f:61:05:7a:ae:09:3c:d4:bc:b1:4e:0d:4d:83:f8:
+        77:6c:a0:ea:6d:e6:5d:df:c4:e4:e0:7f:0f:9c:da:d0:f1:3b:
+        37:05:e4:77:1f:54:7b:d0:57:6d:55:dd:ba:41:ba:4b:90:df:
+        54:8e:a3:cd:0c:a8:ae:c9:09:e8:02:a6:23:e3:f9:62:f8:0e:
+        39:f7:87:f9
+-----BEGIN CERTIFICATE-----
+MIID1TCCAr2gAwIBAgIBMjANBgkqhkiG9w0BAQsFADAaMRgwFgYDVQQDEw9URVNU
+IEVOVElUWSBSSVIwHhcNMDcxMDI5MTYzMjMzWhcNMDgxMDI4MTYzMjMzWjAbMRkw
+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
+AQsFAAOCAQEAcco8tDlP7MK6vcTlnbieEloNr/bg9WUMVKxcF9IpkqSE6kcJU3VS
+fK9nEXv7NRR3no40qTlah2V/XueBgIJLsuQHw30evwox/0OcZjGwGQrqUhRnYvaR
+FVzU2ve7hxydMUwNjPbJHERoIQlJqdfMf1TCzUQJmOl8c6OdNjjo4r0WGZT9l/+R
+ymIiGv/3LKC5eaQHhDe7UItqayWajjz7Twkr4XXE1C5zos3O9YM8pcoz9sg5+N14
+P2EFeq4JPNS8sU4NTYP4d2yg6m3mXd/E5OB/D5za0PE7NwXkdx9Ue9BXbVXdukG6
+S5DfVI6jzQyorskJ6AKmI+P5YvgOOfeH+Q==
+-----END CERTIFICATE-----
diff --git a/scripts/resource-cert-samples/RIR/index b/scripts/resource-cert-samples/RIR/index
index c559e62c..66733b3b 100644
--- a/scripts/resource-cert-samples/RIR/index
+++ b/scripts/resource-cert-samples/RIR/index
@@ -44,3 +44,7 @@ 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
+V	081028163233Z		2F	unknown	/CN=TEST ENTITY RIR
+V	081028163233Z		30	unknown	/CN=TEST ENTITY LIR3
+V	081028163233Z		31	unknown	/CN=TEST ENTITY LIR2
+V	081028163233Z		32	unknown	/CN=TEST ENTITY LIR1
diff --git a/scripts/resource-cert-samples/RIR/index.old b/scripts/resource-cert-samples/RIR/index.old
index 726eac1b..e5d3f927 100644
--- a/scripts/resource-cert-samples/RIR/index.old
+++ b/scripts/resource-cert-samples/RIR/index.old
@@ -43,3 +43,7 @@ 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
+V	081028163233Z		2F	unknown	/CN=TEST ENTITY RIR
+V	081028163233Z		30	unknown	/CN=TEST ENTITY LIR3
+V	081028163233Z		31	unknown	/CN=TEST ENTITY LIR2
diff --git a/scripts/resource-cert-samples/RIR/serial b/scripts/resource-cert-samples/RIR/serial
index da51c429..bb95160c 100644
--- a/scripts/resource-cert-samples/RIR/serial
+++ b/scripts/resource-cert-samples/RIR/serial
@@ -1 +1 @@
-2F
+33
diff --git a/scripts/resource-cert-samples/RIR/serial.old b/scripts/resource-cert-samples/RIR/serial.old
index 11ddf0af..f5c89552 100644
--- a/scripts/resource-cert-samples/RIR/serial.old
+++ b/scripts/resource-cert-samples/RIR/serial.old
@@ -1 +1 @@
-2E
+32