X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=tests%2Ftest_crts.py;h=3f753e059013eabadeaa1c77fd67aed25d3a7133;hb=011b627453f5bfe82bdd160edbb249a73f21082a;hp=d8785294f1f6c6c0554b0105a0bab522819548e8;hpb=521a4868199657f49e0b20973dab53730b93fd54;p=pyderasn.git diff --git a/tests/test_crts.py b/tests/test_crts.py index d878529..3f753e0 100644 --- a/tests/test_crts.py +++ b/tests/test_crts.py @@ -27,6 +27,7 @@ from pyderasn import Any from pyderasn import BitString from pyderasn import Boolean from pyderasn import Choice +from pyderasn import encode_cer from pyderasn import GeneralizedTime from pyderasn import hexdec from pyderasn import IA5String @@ -45,25 +46,26 @@ from pyderasn import TeletexString from pyderasn import UTCTime -some_oids = { - "1.2.840.113549.1.1.1": "id-rsaEncryption", - "1.2.840.113549.1.1.5": "id-sha1WithRSAEncryption", - "1.2.840.113549.1.9.1": "id-emailAddress", - "2.5.29.14": "id-ce-subjectKeyIdentifier", - "2.5.29.15": "id-ce-keyUsage", - "2.5.29.17": "id-ce-subjectAltName", - "2.5.29.18": "id-ce-issuerAltName", - "2.5.29.19": "id-ce-basicConstraints", - "2.5.29.31": "id-ce-cRLDistributionPoints", - "2.5.29.35": "id-ce-authorityKeyIdentifier", - "2.5.29.37": "id-ce-extKeyUsage", - "2.5.4.3": "id-at-commonName", - "2.5.4.6": "id-at-countryName", - "2.5.4.7": "id-at-localityName", - "2.5.4.8": "id-at-stateOrProvinceName", - "2.5.4.10": "id-at-organizationName", - "2.5.4.11": "id-at-organizationalUnitName", +name2oid = { + "id-rsaEncryption": ObjectIdentifier("1.2.840.113549.1.1.1"), + "id-sha1WithRSAEncryption": ObjectIdentifier("1.2.840.113549.1.1.5"), + "id-emailAddress": ObjectIdentifier("1.2.840.113549.1.9.1"), + "id-ce-subjectKeyIdentifier": ObjectIdentifier("2.5.29.14"), + "id-ce-keyUsage": ObjectIdentifier("2.5.29.15"), + "id-ce-subjectAltName": ObjectIdentifier("2.5.29.17"), + "id-ce-issuerAltName": ObjectIdentifier("2.5.29.18"), + "id-ce-basicConstraints": ObjectIdentifier("2.5.29.19"), + "id-ce-cRLDistributionPoints": ObjectIdentifier("2.5.29.31"), + "id-ce-authorityKeyIdentifier": ObjectIdentifier("2.5.29.35"), + "id-ce-extKeyUsage": ObjectIdentifier("2.5.29.37"), + "id-at-commonName": ObjectIdentifier("2.5.4.3"), + "id-at-countryName": ObjectIdentifier("2.5.4.6"), + "id-at-localityName": ObjectIdentifier("2.5.4.7"), + "id-at-stateOrProvinceName": ObjectIdentifier("2.5.4.8"), + "id-at-organizationName": ObjectIdentifier("2.5.4.10"), + "id-at-organizationalUnitName": ObjectIdentifier("2.5.4.11"), } +stroid2name = {str(oid): name for name, oid in name2oid.items()} class Version(Integer): @@ -103,11 +105,11 @@ class OrganizationName(Choice): class AttributeTypeAndValue(Sequence): schema = ( ("type", AttributeType(defines=(((".", "value"), { - ObjectIdentifier("2.5.4.6"): PrintableString(), - ObjectIdentifier("2.5.4.8"): PrintableString(), - ObjectIdentifier("2.5.4.7"): PrintableString(), - ObjectIdentifier("2.5.4.10"): OrganizationName(), - ObjectIdentifier("2.5.4.3"): PrintableString(), + name2oid["id-at-countryName"]: PrintableString(), + name2oid["id-at-localityName"]: PrintableString(), + name2oid["id-at-stateOrProvinceName"]: PrintableString(), + name2oid["id-at-organizationName"]: OrganizationName(), + name2oid["id-at-commonName"]: PrintableString(), }),))), ("value", AttributeValue()), ) @@ -153,6 +155,15 @@ class UniqueIdentifier(BitString): pass +class KeyIdentifier(OctetString): + pass + + +class SubjectKeyIdentifier(KeyIdentifier): + pass + + + class Extension(Sequence): schema = ( ("extnID", ObjectIdentifier()), @@ -187,6 +198,7 @@ class Certificate(Sequence): ("signatureAlgorithm", AlgorithmIdentifier()), ("signatureValue", BitString()), ) + der_forced = True class TestGoSelfSignedVector(TestCase): @@ -225,7 +237,7 @@ class TestGoSelfSignedVector(TestCase): ) assert_raw_equals(tbs["serialNumber"], Integer(10143011886257155224)) algo_id = AlgorithmIdentifier(( - ("algorithm", ObjectIdentifier("1.2.840.113549.1.1.5")), + ("algorithm", name2oid["id-sha1WithRSAEncryption"]), ("parameters", Any(Null())), )) self.assertEqual(tbs["signature"], algo_id) @@ -263,7 +275,7 @@ class TestGoSelfSignedVector(TestCase): self.assertEqual(tbs["subject"], issuer) assert_raw_equals(tbs["subject"], issuer) spki = SubjectPublicKeyInfo() - algo_id["algorithm"] = ObjectIdentifier("1.2.840.113549.1.1.1") + algo_id["algorithm"] = name2oid["id-rsaEncryption"] spki["algorithm"] = algo_id spki["subjectPublicKey"] = BitString(hexdec("".join(( "3048024100cdb7639c3278f006aa277f6eaf42902b592d8cbcbe38a1c92ba4695", @@ -275,7 +287,7 @@ class TestGoSelfSignedVector(TestCase): self.assertNotIn("issuerUniqueID", tbs) self.assertNotIn("subjectUniqueID", tbs) self.assertNotIn("extensions", tbs) - algo_id["algorithm"] = ObjectIdentifier("1.2.840.113549.1.1.5") + algo_id["algorithm"] = name2oid["id-sha1WithRSAEncryption"] self.assertEqual(crt["signatureAlgorithm"], algo_id) self.assertEqual(crt["signatureValue"], BitString(hexdec("".join(( "a67b06ec5ece92772ca413cba3ca12568fdc6c7b4511cd40a7f659980402df2b", @@ -290,7 +302,7 @@ class TestGoSelfSignedVector(TestCase): tbs["serialNumber"] = CertificateSerialNumber(10143011886257155224) sign_algo_id = AlgorithmIdentifier(( - ("algorithm", ObjectIdentifier("1.2.840.113549.1.1.5")), + ("algorithm", name2oid["id-sha1WithRSAEncryption"]), ("parameters", Any(Null())), )) tbs["signature"] = sign_algo_id @@ -329,7 +341,7 @@ class TestGoSelfSignedVector(TestCase): spki = SubjectPublicKeyInfo() spki_algo_id = copy(sign_algo_id) - spki_algo_id["algorithm"] = ObjectIdentifier("1.2.840.113549.1.1.1") + spki_algo_id["algorithm"] = name2oid["id-rsaEncryption"] spki["algorithm"] = spki_algo_id spki["subjectPublicKey"] = BitString(hexdec("".join(( "3048024100cdb7639c3278f006aa277f6eaf42902b592d8cbcbe38a1c92ba4695", @@ -346,6 +358,10 @@ class TestGoSelfSignedVector(TestCase): "998bb9a4a8cbeb34c0f0a78cf8d91ede14a5ed76bf116fe360aafa8821490435", )))) self.assertSequenceEqual(crt.encode(), raw) + self.assertEqual( + Certificate().decod(encode_cer(crt), ctx={"bered": True}), + crt, + ) class TestGoPayPalVector(TestCase): @@ -407,3 +423,7 @@ class TestGoPayPalVector(TestCase): pprint(crt) repr(crt) pickle_loads(pickle_dumps(crt, pickle_proto)) + self.assertEqual( + Certificate().decod(encode_cer(crt), ctx={"bered": True}), + crt, + )