X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=tests%2Ftest_crts.py;h=d209f947207947f7b4698c53cabf78e0611ab4b6;hb=1285a47fd22a99a87354496ade8b392ff874d8b8;hp=3f753e059013eabadeaa1c77fd67aed25d3a7133;hpb=011b627453f5bfe82bdd160edbb249a73f21082a;p=pyderasn.git

diff --git a/tests/test_crts.py b/tests/test_crts.py
index 3f753e0..d209f94 100644
--- a/tests/test_crts.py
+++ b/tests/test_crts.py
@@ -1,5 +1,5 @@
 # coding: utf-8
-# PyDERASN -- Python ASN.1 DER codec with abstract structures
+# PyDERASN -- Python ASN.1 DER/CER/BER codec with abstract structures
 # Copyright (C) 2017-2020 Sergey Matveev <stargrave@stargrave.org>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -19,6 +19,7 @@ from copy import copy
 from datetime import datetime
 from unittest import TestCase
 
+from six import assertRaisesRegex
 from six.moves.cPickle import dumps as pickle_dumps
 from six.moves.cPickle import HIGHEST_PROTOCOL as pickle_proto
 from six.moves.cPickle import loads as pickle_loads
@@ -27,6 +28,7 @@ from pyderasn import Any
 from pyderasn import BitString
 from pyderasn import Boolean
 from pyderasn import Choice
+from pyderasn import DecodeError
 from pyderasn import encode_cer
 from pyderasn import GeneralizedTime
 from pyderasn import hexdec
@@ -44,6 +46,7 @@ from pyderasn import tag_ctxc
 from pyderasn import tag_ctxp
 from pyderasn import TeletexString
 from pyderasn import UTCTime
+from pyderasn import UTF8String
 
 
 name2oid = {
@@ -102,14 +105,21 @@ class OrganizationName(Choice):
     )
 
 
+class CommonName(Choice):
+    schema = (
+        ("printableString", PrintableString()),
+        ("utf8String", UTF8String()),
+    )
+
+
 class AttributeTypeAndValue(Sequence):
     schema = (
-        ("type", AttributeType(defines=(((".", "value"), {
+        ("type", AttributeType(defines=((("value",), {
             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(),
+            name2oid["id-at-commonName"]: CommonName(),
         }),))),
         ("value", AttributeValue()),
     )
@@ -365,6 +375,8 @@ class TestGoSelfSignedVector(TestCase):
 
 
 class TestGoPayPalVector(TestCase):
+    """PayPal certificate with "www.paypal.com\x00ssl.secureconnection.cc" name
+    """
     def runTest(self):
         raw = hexdec("".join((
             "30820644308205ada003020102020300f09b300d06092a864886f70d010105050",
@@ -418,12 +430,5 @@ class TestGoPayPalVector(TestCase):
             "07ba44cce54a2d723f9847f626dc054605076321ab469b9c78d5545b3d0c1ec86",
             "48cb55023826fdbb8221c439607a8bb",
         )))
-        crt = Certificate().decod(raw)
-        self.assertSequenceEqual(crt.encode(), raw)
-        pprint(crt)
-        repr(crt)
-        pickle_loads(pickle_dumps(crt, pickle_proto))
-        self.assertEqual(
-            Certificate().decod(encode_cer(crt), ctx={"bered": True}),
-            crt,
-        )
+        with assertRaisesRegex(self, DecodeError, "alphabet value"):
+            crt = Certificate().decod(raw)