X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=tests%2Ftestx509.py;h=82b6d55f817615e7dcbf606d87aae96032f12df6;hb=ff669c32aa77c9ebfb9c5371b2c8a9d41de614f8;hp=2a09e78b562b869a8deea528333d34ab4126fbf5;hpb=55c10d02095c6d708c72753f9915ae0076cf5d02;p=oss%2Fctypescrypto.git

diff --git a/tests/testx509.py b/tests/testx509.py
index 2a09e78..82b6d55 100644
--- a/tests/testx509.py
+++ b/tests/testx509.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 # -*- encoding: utf-8 -*-
 
-from ctypescrypto.x509 import X509,X509Store
+from ctypescrypto.x509 import X509,X509Store,utc
 from ctypescrypto.oid import Oid
 from tempfile import NamedTemporaryFile
+import datetime
 import unittest
 
 
@@ -117,6 +118,12 @@ zVMSW4SOwg/H7ZMZ2cn6j1g0djIvruFQFGHUqFijyDATI+/GJYw2jxyA
 	def test_subject(self):
 		c=X509(self.cert1)
 		self.assertEqual(unicode(c.subject),u'C=RU,ST=Москва,L=Москва,O=Частное лицо,CN=Виктор Вагнер')
+	def test_subject_str(self):
+		c=X509(self.cert1)
+		self.assertEqual(str(c.subject),b'C=RU,ST=\\D0\\9C\\D0\\BE\\D1\\81\\D0\\BA\\D0\\B2\\D0\\B0,L=\\D0\\9C\\D0\\BE\\D1\\81\\D0\\BA\\D0\\B2\\D0\\B0,O=\\D0\\A7\\D0\\B0\\D1\\81\\D1\\82\\D0\\BD\\D0\\BE\\D0\\B5 \\D0\\BB\\D0\\B8\\D1\\86\\D0\\BE,CN=\\D0\\92\\D0\\B8\\D0\\BA\\D1\\82\\D0\\BE\\D1\\80 \\D0\\92\\D0\\B0\\D0\\B3\\D0\\BD\\D0\\B5\\D1\\80')
+	def test_subject_len(self):
+		c=X509(self.cert1)
+		self.assertEqual(len(c.subject),5)
 	def test_issuer(self):
 		c=X509(self.cert1)
 		self.assertEqual(unicode(c.issuer),u'C=RU,ST=Москва,O=Удостоверяющий центр,CN=Виктор Вагнер,emailAddress=vitus@wagner.pp.ru')
@@ -124,6 +131,25 @@ zVMSW4SOwg/H7ZMZ2cn6j1g0djIvruFQFGHUqFijyDATI+/GJYw2jxyA
 		c=X509(self.cert1)
 		self.assertEqual(c.subject[Oid("C")],"RU")
 		self.assertEqual(c.subject[Oid("L")],u'\u041c\u043e\u0441\u043a\u0432\u0430')
+	def test_subjectbadsubfield(self):
+		c=X509(self.cert1)
+		with self.assertRaises(KeyError):
+			x=c.subject[Oid("streetAddress")]
+	def test_subjectfieldindex(self):
+		c=X509(self.cert1)
+		self.assertEqual(repr(c.subject[0]),repr((Oid('C'),u'RU')))
+	def test_subjectbadindex(self):
+		c=X509(self.cert1)
+		with self.assertRaises(IndexError):
+			x=c.subject[11]
+		with self.assertRaises(IndexError):
+			x=c.subject[-1]
+	def test_notBefore(self):
+		c=X509(self.cert1)
+		self.assertEqual(c.startDate,datetime.datetime(2014,10,26,19,07,17,0,utc))
+	def test_notAfter(self):
+		c=X509(self.cert1)
+		self.assertEqual(c.endDate,datetime.datetime(2024,10,23,19,7,17,0,utc))
 	def test_namecomp(self):
 		c=X509(self.cert1)
 		ca=X509(self.ca_cert)
@@ -133,11 +159,53 @@ zVMSW4SOwg/H7ZMZ2cn6j1g0djIvruFQFGHUqFijyDATI+/GJYw2jxyA
 	def test_serial(self):
 		c=X509(self.cert1)
 		self.assertEqual(c.serial,0xDF448E69DADC927CL)
+	def test_version(self):
+		c=X509(self.cert1)
+		self.assertEqual(c.version,3)
 	def test_ca_cert(self):
 		ca=X509(self.ca_cert)
 		self.assertTrue(ca.check_ca())
 		notca=X509(self.cert1)
 		self.assertFalse(notca.check_ca())
+	def test_extension_count(self):
+		cert=X509(self.cert1)
+		self.assertTrue(len(cert.extensions),4)
+		ca_cert=X509(self.ca_cert)
+		self.assertEqual(len(ca_cert.extensions),3)
+	def test_extension_outofrange(self):
+		cert=X509(self.cert1)
+		with self.assertRaises(IndexError):
+			cert.extensions[4]
+		with self.assertRaises(IndexError):
+			cert.extensions[-1]
+	def test_extension_oid(self):
+		cert=X509(self.cert1)
+		ext=cert.extensions[0]
+		ext_id=ext.oid
+		self.assertTrue(isinstance(ext_id,Oid))
+		self.assertEqual(ext_id,Oid('basicConstraints'))
+	def text_extension_text(self):
+		cert=X509(self.cert1)
+		ext=cert.extensions[0]
+		self.assertEqual(str(ext),'CA:FALSE')
+		self.assertEqual(unicode(ext),u'CA:FALSE')
+	def test_extenson_find(self):
+		cert=X509(self.cert1)
+		exts=cert.extensions.find(Oid('subjectAltName'))
+		self.assertEqual(len(exts),1)
+		self.assertEqual(exts[0].oid,Oid('subjectAltName'))
+	def test_extension_bad_find(self):
+		cert=X509(self.cert1)
+		with self.assertRaises(TypeError):
+			exts=cert.extensions.find('subjectAltName')
+	def test_extenson_critical(self):
+		cert=X509(self.digicert_cert)
+		crit_exts=cert.extensions.find_critical()
+		self.assertEqual(len(crit_exts),2)
+		other_exts=cert.extensions.find_critical(False)
+		self.assertEqual(len(crit_exts)+len(other_exts),len(cert.extensions))
+		self.assertEqual(crit_exts[0].critical,True)
+		self.assertEqual(other_exts[0].critical,False)
 	def test_verify_by_key(self):
 		ca=X509(self.ca_cert)
 		pubkey=ca.pubkey
@@ -146,6 +214,9 @@ zVMSW4SOwg/H7ZMZ2cn6j1g0djIvruFQFGHUqFijyDATI+/GJYw2jxyA
 		pk2=c.pubkey
 		self.assertFalse(c.verify(key=pk2))
 		self.assertTrue(c.verify(key=pubkey))
+	def test_verify_self_singed(self):
+		ca=X509(self.ca_cert)
+		self.assertTrue(ca.verify())
 	def test_default_filestore(self):
 		store=X509Store(default=True)
 		c1=X509(self.cert1)
@@ -171,7 +242,6 @@ zVMSW4SOwg/H7ZMZ2cn6j1g0djIvruFQFGHUqFijyDATI+/GJYw2jxyA
 		# signed by some commercial CA should be rejected too
 		self.assertFalse(gitcert.verify(store))
 		trusted.close()
-		pass
 	def test_verify_by_dirstore(self):
 		pass
 if __name__ == '__main__':