Move x509's OIDs to oid module

diff --git a/pygost/asn1schemas/oids.py b/pygost/asn1schemas/oids.py
index c40319ab81ac4f93d92e488de18ce2b054bfda30..2ec5936d1cebd65806668409dd26493b0e444231 100644 (file)
--- a/pygost/asn1schemas/oids.py
+++ b/pygost/asn1schemas/oids.py
@@ -1,6 +1,12 @@
 from pyderasn import ObjectIdentifier
 
 
+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_pkcs7 = ObjectIdentifier("1.2.840.113549.1.7")
 id_data = id_pkcs7 + (1,)
 id_signedData = id_pkcs7 + (2,)

diff --git a/pygost/asn1schemas/x509.py b/pygost/asn1schemas/x509.py
index a934a58d52413cafd51834ed6088e02dabd757e1..7977c31345ef4cc37e6fe0abe27c3d65114fc0cd 100644 (file)
--- a/pygost/asn1schemas/x509.py
+++ b/pygost/asn1schemas/x509.py
@@ -35,6 +35,12 @@ from pyderasn import tag_ctxp
 from pyderasn import TeletexString
 from pyderasn import UTCTime
 
+from pygost.asn1schemas.oids import id_at_commonName
+from pygost.asn1schemas.oids import id_at_countryName
+from pygost.asn1schemas.oids import id_at_localityName
+from pygost.asn1schemas.oids import id_at_organizationName
+from pygost.asn1schemas.oids import id_at_stateOrProvinceName
+
 
 class Version(Integer):
     schema = (
@@ -73,11 +79,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(),
+            id_at_countryName: PrintableString(),
+            id_at_stateOrProvinceName: PrintableString(),
+            id_at_localityName: PrintableString(),
+            id_at_organizationName: OrganizationName(),
+            id_at_commonName: PrintableString(),
         }),))),
         ("value", AttributeValue()),
     )