Added test for escaping rules.

3 files changed, 118 insertions, 1 deletions

diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am
index f0d60fd76d..ccc29ee97f 100644
--- a/tests/cert-tests/Makefile.am
+++ b/tests/cert-tests/Makefile.am
@@ -23,7 +23,7 @@ EXTRA_DIST = ca-no-pathlen.pem no-ca-or-pathlen.pem aki-cert.pem \
 	template-test.key template-test.pem template-test.tmpl \
 	funny-spacing.pem ca-certs.pem dane-test.rr cert-ecc256.pem \
 	bmpstring.pem template-utf8.pem template-utf8.tmpl \
-	template-dn.tmpl template-dn.pem
+	template-dn.tmpl template-dn.pem complex-cert.pem
 
 dist_check_SCRIPTS = pathlen aki template-test pem-decoding dane
 
diff --git a/tests/cert-tests/complex-cert.pem b/tests/cert-tests/complex-cert.pem
new file mode 100644
index 0000000000..abac197715
--- /dev/null
+++ b/tests/cert-tests/complex-cert.pem
@@ -0,0 +1,102 @@
+X.509 Certificate Information:
+	Version: 3
+	Serial Number (hex): 07
+	Issuer: OU=nounit\,O=org,O=Koko \,EMAIL=test@me,ST=\#8013\,,title=Dr.,pseudonym=jackal.
+	Validity:
+		Not Before: Sat Apr 27 19:04:49 UTC 2013
+		Not After: Tue Sep 11 19:04:49 UTC 2040
+	Subject: OU=nounit\,O=org,O=Koko \,EMAIL=test@me,ST=\#8013\,,title=Dr.,pseudonym=jackal.
+	Subject Public Key Algorithm: RSA
+	Algorithm Security Level: Normal (2432 bits)
+		Modulus (bits 2432):
+			00:ca:a5:55:c5:da:1e:ab:cb:93:df:36:7f:df:21:af
+			5e:84:d0:23:76:69:8c:4f:82:fb:32:07:d9:15:7c:99
+			d3:bb:33:5f:e4:7e:ff:8b:cd:ca:3a:7f:00:c7:52:cc
+			4a:8b:55:ac:af:bd:25:8b:ff:9a:9f:bb:a2:50:db:24
+			28:4f:38:08:cb:6c:bc:64:a0:29:56:72:31:71:53:f1
+			5e:ff:8d:db:97:15:22:16:1e:af:2b:b0:1a:d3:bc:2c
+			ee:4d:4f:f8:50:df:24:a9:a0:51:86:80:d1:8f:57:43
+			bb:31:fb:d0:59:dd:ea:b8:a7:e5:41:0b:61:2b:23:8b
+			e1:76:4c:a5:d1:f8:4d:a9:64:3c:83:84:bd:2e:36:e9
+			59:a7:dc:a4:6f:ff:70:0b:10:02:26:87:18:cf:b4:54
+			de:1c:ed:cd:cc:bf:d7:5b:92:53:bd:de:48:a5:60:07
+			00:58:ba:d7:0d:be:3a:f1:98:1c:90:05:6a:4f:35:c7
+			c3:8a:ee:62:41:6d:49:76:d8:09:64:da:da:26:17:52
+			cf:18:84:76:cb:6d:8d:b0:3f:32:91:11:96:5a:53:d1
+			df:1f:26:2f:db:c0:85:13:bb:88:4e:de:f5:45:45:59
+			ff:c5:a0:d7:4a:05:5b:bd:3f:9e:b0:f5:05:10:dd:af
+			24:e4:01:a4:97:d6:a0:3d:85:e0:83:21:26:6f:de:c8
+			e8:bd:33:2c:32:81:2e:8e:cb:f7:10:71:b8:0c:93:02
+			8c:0b:ca:00:53:88:47:26:bf:ae:a4:a8:b1:e8:94:d8
+			b3
+		Exponent (bits 24):
+			01:00:01
+	Extensions:
+		Basic Constraints (critical):
+			Certificate Authority (CA): FALSE
+		Key Usage (critical):
+			Digital signature.
+		Subject Key Identifier (not critical):
+			1f1df37c58ffae0157ffccd8aae234092017a090
+	Signature Algorithm: RSA-SHA256
+	Signature:
+		a4:db:8f:4e:d2:47:f7:e6:74:ab:09:2b:49:a9:a0:1b
+		51:28:0f:8e:a5:95:38:55:7a:b3:6a:99:55:cf:b3:51
+		ac:87:84:fc:dd:8d:08:9a:9f:90:4d:bb:62:07:5b:54
+		18:b2:08:fc:a7:18:de:26:80:53:92:63:e0:26:86:b1
+		61:a1:2a:d8:52:e7:ea:ed:ce:9a:3a:f0:81:e0:45:21
+		39:d3:bd:05:4c:ad:a0:ff:83:5e:cd:07:32:ed:a6:c1
+		ea:02:bf:8b:7f:51:76:24:39:51:71:a7:f4:92:1c:7f
+		b3:b0:06:5d:51:3a:18:05:85:1e:a2:f6:ef:9f:2b:dd
+		c5:23:4d:34:8e:c9:0b:cc:6e:66:19:8d:04:86:f1:fc
+		08:1b:2d:f3:31:db:86:72:4c:b9:29:b7:13:46:65:57
+		58:c0:1b:c1:4a:4c:f6:72:d6:5f:29:b4:78:61:17:05
+		fe:94:28:7a:33:c1:b3:df:89:8a:55:d9:6a:68:93:f6
+		cc:18:c5:a9:41:7a:da:6b:90:32:d9:09:de:1c:23:29
+		c8:55:a5:31:11:42:89:97:d5:9b:a5:84:a3:83:f7:ef
+		c3:f7:c6:ee:1c:17:29:f8:59:3b:ca:53:c1:43:6d:4d
+		17:4c:9c:ee:5f:94:31:2c:92:bb:da:ac:3c:6e:7a:b3
+		2a:a9:2b:a7:2a:7b:2b:37:b5:2e:ad:cb:2a:dd:4b:a4
+		f9:e2:ad:9b:18:e9:38:93:44:b6:db:e2:37:c0:9d:e8
+		53:e2:8e:e6:67:ac:3f:61:f7:4e:47:84:5c:f3:d8:44
+Other Information:
+	SHA-1 fingerprint:
+		5bf859ec9395b73f5ed5adfdfaa9c1add2ec23ff
+	Public Key Id:
+		1f1df37c58ffae0157ffccd8aae234092017a090
+	Public key's random art:
+		+--[ RSA 2432]----+
+		|..  ...          |
+		|E. .   .         |
+		|  . . o     o   o|
+		|     o .   . = +o|
+		|        S . o = +|
+		|         o o o *o|
+		|          =   o *|
+		|         ...   + |
+		|         .....o..|
+		+-----------------+
+
+-----BEGIN CERTIFICATE-----
+MIID6zCCAqOgAwIBAgIBBzANBgkqhkiG9w0BAQsFADBmMRUwEwYDVQQLEwxub3Vu
+aXQsTz1vcmcxHDAaBgNVBAoME0tva28gLEVNQUlMPXRlc3RAbWUxDzANBgNVBAgM
+BiM4MDEzLDEMMAoGA1UEDBMDRHIuMRAwDgYDVQRBEwdqYWNrYWwuMCIYDzIwMTMw
+NDI3MTkwNDQ5WhgPMjA0MDA5MTExOTA0NDlaMGYxFTATBgNVBAsTDG5vdW5pdCxP
+PW9yZzEcMBoGA1UECgwTS29rbyAsRU1BSUw9dGVzdEBtZTEPMA0GA1UECAwGIzgw
+MTMsMQwwCgYDVQQMEwNEci4xEDAOBgNVBEETB2phY2thbC4wggFSMA0GCSqGSIb3
+DQEBAQUAA4IBPwAwggE6AoIBMQDKpVXF2h6ry5PfNn/fIa9ehNAjdmmMT4L7MgfZ
+FXyZ07szX+R+/4vNyjp/AMdSzEqLVayvvSWL/5qfu6JQ2yQoTzgIy2y8ZKApVnIx
+cVPxXv+N25cVIhYeryuwGtO8LO5NT/hQ3ySpoFGGgNGPV0O7MfvQWd3quKflQQth
+KyOL4XZMpdH4TalkPIOEvS426Vmn3KRv/3ALEAImhxjPtFTeHO3NzL/XW5JTvd5I
+pWAHAFi61w2+OvGYHJAFak81x8OK7mJBbUl22Alk2tomF1LPGIR2y22NsD8ykRGW
+WlPR3x8mL9vAhRO7iE7e9UVFWf/FoNdKBVu9P56w9QUQ3a8k5AGkl9agPYXggyEm
+b97I6L0zLDKBLo7L9xBxuAyTAowLygBTiEcmv66kqLHolNizAgMBAAGjQDA+MAwG
+A1UdEwEB/wQCMAAwDwYDVR0PAQH/BAUDAweAADAdBgNVHQ4EFgQUHx3zfFj/rgFX
+/8zYquI0CSAXoJAwDQYJKoZIhvcNAQELBQADggExAKTbj07SR/fmdKsJK0mpoBtR
+KA+OpZU4VXqzaplVz7NRrIeE/N2NCJqfkE27YgdbVBiyCPynGN4mgFOSY+AmhrFh
+oSrYUufq7c6aOvCB4EUhOdO9BUytoP+DXs0HMu2mweoCv4t/UXYkOVFxp/SSHH+z
+sAZdUToYBYUeovbvnyvdxSNNNI7JC8xuZhmNBIbx/AgbLfMx24ZyTLkptxNGZVdY
+wBvBSkz2ctZfKbR4YRcF/pQoejPBs9+JilXZamiT9swYxalBetprkDLZCd4cIynI
+VaUxEUKJl9WbpYSjg/fvw/fG7hwXKfhZO8pTwUNtTRdMnO5flDEskrvarDxuerMq
+qSunKnsrN7Uurcsq3Uuk+eKtmxjpOJNEttviN8Cd6FPijuZnrD9h905HhFzz2EQ=
+-----END CERTIFICATE-----
diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding
index 715488e2ec..9fc4836401 100755
--- a/tests/cert-tests/pem-decoding
+++ b/tests/cert-tests/pem-decoding
@@ -49,6 +49,21 @@ if test "$rc" != "0"; then
   exit $rc
 fi
 
+#check whether complex-cert is decoded as expected
+$CERTTOOL --certificate-info --infile $srcdir/complex-cert.pem >tmp-pem.pem
+rc=$?
+
+if test "$rc" != "0"; then
+  exit $rc
+fi
+
+diff $srcdir/complex-cert.pem tmp-pem.pem
+rc=$?
+
+if test "$rc" != "0"; then
+  exit $rc
+fi
+
 rm -f tmp-pem.pem
 
 exit 0