tests: enhanced arbitrary extension tests with octet_string encodingarbitrary-exts-octet-string

3 files changed, 25 insertions, 16 deletions

diff --git a/tests/cert-tests/data/arb-extensions.csr b/tests/cert-tests/data/arb-extensions.csr
index b9e2e0a3f8..bfbff7f514 100644
--- a/tests/cert-tests/data/arb-extensions.csr
+++ b/tests/cert-tests/data/arb-extensions.csr
@@ -32,9 +32,15 @@ PKCS #10 Certificate Request Information:
 			Unknown extension 1.2.6710656.7 (not critical):
 				ASCII: .J.K..l|...4..~.L..&.ap.E........}!'...s.....b=...K..6Sb.4.Z.e.'.~.G....
 				Hexdump: d64af64bf3b66c7ceac6fa34a4d77ed64c968b26c761709445f40d9ca0a00091af7d212789c00b7387b1d0d7ab623dd4029d4b86db3653621d34cd5ad065dc27c17e9447b0aaaca7
+			Unknown extension 0.24.1.5 (not critical):
+				ASCII: ......
+				Hexdump: 0404cafebeaf
 			Unknown extension 2.34.11.12.13.14.15.16.17.1.5 (critical):
 				ASCII: ..
 				Hexdump: cafe
+			Unknown extension 0.24.1.5.1 (critical):
+				ASCII: ........
+				Hexdump: 0406beafcafefafa
 			Basic Constraints (critical):
 				Certificate Authority (CA): FALSE
 			Key Usage (critical):
@@ -44,21 +50,21 @@ Other Information:
 		5d40adf0ce9440958b7e99941d925422ca72365f
 
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIIC/jCCAmcCAQAwezEVMBMGA1UEAxMMQ2luZHkgTGF1cGVyMRcwFQYDVQQLEw5z
+MIIDIjCCAosCAQAwezEVMBMGA1UEAxMMQ2luZHkgTGF1cGVyMRcwFQYDVQQLEw5z
 bGVlcGluZyBkZXB0LjESMBAGA1UEChMJS29rbyBpbmMuMQ8wDQYDVQQIEwZBdHRp
 a2kxCzAJBgNVBAYTAkdSMRcwFQYKCZImiZPyLGQBARMHY2xhdXBlcjCBnzANBgkq
 hkiG9w0BAQEFAAOBjQAwgYkCgYEApcbOdUOEv2SeAicT8QNZ93ktku18L1CkA/Et
 ebmGiwV+OrtEqq+EzxOYHhxKOPczLXqfctRrbSawMTdwEPtC6didGGV+GUn8BZYE
 aIMed4a/7fXlEjsT/jMYnBp6HWmvRwJgeh+56M/byDQwUZY9jJZcALxh3ggPsTYh
-f6kA4wUCAwEAAaCCAUEwggE9BgkqhkiG9w0BCQ4xggEuMIIBKjASBgMqAwQECwAB
+f6kA4wUCAwEAAaCCAWUwggFhBgkqhkiG9w0BCQ4xggFSMIIBTjASBgMqAwQECwAB
 AgMEBQYHqqvNMBIGA84HCAQLAAECAwQFBgeqq80wGgYGKgMEBQYHBBAdNM1a0GXc
 J8F+lEewqqynMFwGCCoDj////38HBFAXjw5BPwQcydZK9kvztmx86sb6NKTXftZM
 losmx2FwlEX0DZygoACRr30hJ4nAC3OHsdDXq2I91AKdS4bbNlNiHTTNWtBl3CfB
 fpRHsKqspzBSBgYqg5nLAAcESNZK9kvztmx86sb6NKTXftZMlosmx2FwlEX0DZyg
-oACRr30hJ4nAC3OHsdDXq2I91AKdS4bbNlNiHTTNWtBl3CfBfpRHsKqspzATBgpy
-CwwNDg8QEQEFAQH/BALK/jAMBgNVHRMBAf8EAjAAMA8GA1UdDwEB/wQFAwMHgAAw
-DQYJKoZIhvcNAQELBQADgYEAlL46Xhzomx9EkuBf2djeBEK8P3xx+5HSTcu2F/38
-D1F+VLNfvifFVcT9CgGz+xMGtXYzqyfeZ/FVGgZlIc4bZFML1A5DvdqpQUcqGFZZ
-sJdulRiQ9fhMUz1qwgovX7/Zpm+Xgfup++wPwyEFI3yu1mt6Krd3CY5o7woxUC28
-u5U=
+oACRr30hJ4nAC3OHsdDXq2I91AKdS4bbNlNiHTTNWtBl3CfBfpRHsKqspzANBgMY
+AQUEBgQEyv6+rzATBgpyCwwNDg8QEQEFAQH/BALK/jATBgQYAQUBAQH/BAgEBr6v
+yv76+jAMBgNVHRMBAf8EAjAAMA8GA1UdDwEB/wQFAwMHgAAwDQYJKoZIhvcNAQEL
+BQADgYEAI9e1q4TPDV4ahWqNIMo4rWLuZoPiuKbWi+xJfBXeZ+D+FEA4lOLudSV/
+Y3gVRJFONKfnTi7QpmdaGro70xEN2aaE53iTaf4QO4VmPBEVuzLaOURFYuDL4S51
+Mz2bUl/XaZazrxgLCT/o8CGSSpc2tJAMKWvCHiUQQU4MQh/SUT8=
 -----END NEW CERTIFICATE REQUEST-----
diff --git a/tests/cert-tests/data/arb-extensions.pem b/tests/cert-tests/data/arb-extensions.pem
index 32372d6619..100844da7a 100644
--- a/tests/cert-tests/data/arb-extensions.pem
+++ b/tests/cert-tests/data/arb-extensions.pem
@@ -1,5 +1,5 @@
 -----BEGIN CERTIFICATE-----
-MIIDqjCCAxOgAwIBAgIBCTANBgkqhkiG9w0BAQsFADB7MRUwEwYDVQQDEwxDaW5k
+MIIDzjCCAzegAwIBAgIBCTANBgkqhkiG9w0BAQsFADB7MRUwEwYDVQQDEwxDaW5k
 eSBMYXVwZXIxFzAVBgoJkiaJk/IsZAEBEwdjbGF1cGVyMRcwFQYDVQQLEw5zbGVl
 cGluZyBkZXB0LjESMBAGA1UEChMJS29rbyBpbmMuMQ8wDQYDVQQIEwZBdHRpa2kx
 CzAJBgNVBAYTAkdSMB4XDTA3MDQyMjAwMDAwMFoXDTE0MDUyNTAwMDAwMFowezEV
@@ -8,15 +8,16 @@ MBUGA1UECxMOc2xlZXBpbmcgZGVwdC4xEjAQBgNVBAoTCUtva28gaW5jLjEPMA0G
 A1UECBMGQXR0aWtpMQswCQYDVQQGEwJHUjCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
 gYkCgYEApcbOdUOEv2SeAicT8QNZ93ktku18L1CkA/EtebmGiwV+OrtEqq+EzxOY
 HhxKOPczLXqfctRrbSawMTdwEPtC6didGGV+GUn8BZYEaIMed4a/7fXlEjsT/jMY
-nBp6HWmvRwJgeh+56M/byDQwUZY9jJZcALxh3ggPsTYhf6kA4wUCAwEAAaOCATww
-ggE4MBIGAyoDBAQLAAECAwQFBgeqq80wEgYDzgcIBAsAAQIDBAUGB6qrzTAaBgYq
+nBp6HWmvRwJgeh+56M/byDQwUZY9jJZcALxh3ggPsTYhf6kA4wUCAwEAAaOCAWAw
+ggFcMBIGAyoDBAQLAAECAwQFBgeqq80wEgYDzgcIBAsAAQIDBAUGB6qrzTAaBgYq
 AwQFBgcEEB00zVrQZdwnwX6UR7CqrKcwXAYIKgOP////fwcEUBePDkE/BBzJ1kr2
 S/O2bHzqxvo0pNd+1kyWiybHYXCURfQNnKCgAJGvfSEnicALc4ex0NerYj3UAp1L
 hts2U2IdNM1a0GXcJ8F+lEewqqynMFIGBiqDmcsABwRI1kr2S/O2bHzqxvo0pNd+
 1kyWiybHYXCURfQNnKCgAJGvfSEnicALc4ex0NerYj3UAp1Lhts2U2IdNM1a0GXc
-J8F+lEewqqynMBMGCnILDA0ODxARAQUBAf8EAsr+MAwGA1UdEwEB/wQCMAAwHQYD
-VR0OBBYEFF1ArfDOlECVi36ZlB2SVCLKcjZfMA0GCSqGSIb3DQEBCwUAA4GBAInQ
-3geT53qgMB3Iix5rlpEAceXBkhmWND5eQhkAo9rEq/6rIubfvxrVM02XpFGFA7qU
-Es+19M0Hwf7LXdQRtJtGW2LXaqSQoXp/PL7FXbZUC9J11oOno1wuJhw6/Z4nKm2U
-5GgZbAlpJ7y0hwBunlZqF1viU9awFclhFbnVVRcG
+J8F+lEewqqynMA0GAxgBBQQGBATK/r6vMBMGCnILDA0ODxARAQUBAf8EAsr+MBMG
+BBgBBQEBAf8ECAQGvq/K/vr6MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFF1ArfDO
+lECVi36ZlB2SVCLKcjZfMA0GCSqGSIb3DQEBCwUAA4GBAIGsimh5r4PgCx1gQPqx
+4YnbyWLOFPolEzO2dvN5AQHl4bSLyR0VjBETmKLt7fbNWzsd8PYTf8hbX6Y5xZrf
+YTq8UXcDQptphDyOJck0XYhztk5ct4CEK/zU9wRMKAx+D7LA1dvUfB0Rj/uKUMQb
+zGTcVic26fPIQND5EQAkl8eu
 -----END CERTIFICATE-----
diff --git a/tests/cert-tests/templates/arb-extensions.tmpl b/tests/cert-tests/templates/arb-extensions.tmpl
index 698c1114fe..b812bd4362 100644
--- a/tests/cert-tests/templates/arb-extensions.tmpl
+++ b/tests/cert-tests/templates/arb-extensions.tmpl
@@ -32,3 +32,5 @@ add_extension = "1.2.3.4.5.6.7 1d34cd5ad065dc27c17e9447b0aaaca7"
 add_extension = "1.2.3.4294967295.7 178f0e413f041cc9d64af64bf3b66c7ceac6fa34a4d77ed64c968b26c761709445f40d9ca0a00091af7d212789c00b7387b1d0d7ab623dd4029d4b86db3653621d34cd5ad065dc27c17e9447b0aaaca7"
 add_critical_extension = "9.10.11.12.13.14.15.16.17.1.5 CAFE"
 add_extension = "1.2.6710656.7 d64af64bf3b66c7ceac6fa34a4d77ed64c968b26c761709445f40d9ca0a00091af7d212789c00b7387b1d0d7ab623dd4029d4b86db3653621d34cd5ad065dc27c17e9447b0aaaca7"
+add_extension = "7.0.1.5 octet_string(CAFEBEAF)"
+add_critical_extension = "7.0.1.5.1 octet_string(BEAFCAFEFAFA)"