X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=pygost%2Fasn1schemas%2Fcms.py;h=e3f3244b4c9148e3cb1d8364587688eb13029830;hb=5ecaafbe1a87f9a311a18574653e6dbc75a776b9;hp=187850bbb03c7309f211e0bd5b153f60c4319d65;hpb=5013b980d53a9969649a59535b7566f73f11521e;p=pygost.git

diff --git a/pygost/asn1schemas/cms.py b/pygost/asn1schemas/cms.py
index 187850b..e3f3244 100644
--- a/pygost/asn1schemas/cms.py
+++ b/pygost/asn1schemas/cms.py
@@ -1,11 +1,10 @@
 # coding: utf-8
 # PyGOST -- Pure Python GOST cryptographic functions library
-# Copyright (C) 2015-2018 Sergey Matveev <stargrave@stargrave.org>
+# Copyright (C) 2015-2019 Sergey Matveev <stargrave@stargrave.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# the Free Software Foundation, version 3 of the License.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,7 +28,14 @@ from pyderasn import SetOf
 from pyderasn import tag_ctxc
 from pyderasn import tag_ctxp
 
+from pygost.asn1schemas.oids import id_digestedData
+from pygost.asn1schemas.oids import id_envelopedData
+from pygost.asn1schemas.oids import id_Gost28147_89
+from pygost.asn1schemas.oids import id_signedData
+from pygost.asn1schemas.oids import id_tc26_gost3410_2012_256
+from pygost.asn1schemas.oids import id_tc26_gost3410_2012_512
 from pygost.asn1schemas.x509 import AlgorithmIdentifier
+from pygost.asn1schemas.x509 import Certificate
 from pygost.asn1schemas.x509 import SubjectPublicKeyInfo
 
 
@@ -48,8 +54,57 @@ class RecipientIdentifier(Choice):
     )
 
 
+class Gost2814789Key(OctetString):
+    bounds = (32, 32)
+
+
+class Gost2814789MAC(OctetString):
+    bounds = (4, 4)
+
+
+class Gost2814789EncryptedKey(Sequence):
+    schema = (
+        ("encryptedKey", Gost2814789Key()),
+        ("maskKey", Gost2814789Key(impl=tag_ctxp(0), optional=True)),
+        ("macKey", Gost2814789MAC()),
+    )
+
+
+class GostR34102001TransportParameters(Sequence):
+    schema = (
+        ("encryptionParamSet", ObjectIdentifier()),
+        ("ephemeralPublicKey", SubjectPublicKeyInfo(
+            impl=tag_ctxc(0),
+            optional=True,
+        )),
+        ("ukm", OctetString()),
+    )
+
+
+class GostR3410KeyTransport(Sequence):
+    schema = (
+        ("sessionEncryptedKey", Gost2814789EncryptedKey()),
+        ("transportParameters", GostR34102001TransportParameters(
+            impl=tag_ctxc(0),
+            optional=True,
+        )),
+    )
+
+
 class KeyEncryptionAlgorithmIdentifier(AlgorithmIdentifier):
-    pass
+    schema = (
+        ("algorithm", ObjectIdentifier(defines=(
+            (("..", "encryptedKey"), {
+                id_tc26_gost3410_2012_256: GostR3410KeyTransport(),
+                id_tc26_gost3410_2012_512: GostR3410KeyTransport(),
+            }),
+            (("..", "recipientEncryptedKeys", any, "encryptedKey"), {
+                id_tc26_gost3410_2012_256: Gost2814789EncryptedKey(),
+                id_tc26_gost3410_2012_512: Gost2814789EncryptedKey(),
+            }),
+        ))),
+        ("parameters", Any(optional=True)),
+    )
 
 
 class EncryptedKey(OctetString):
@@ -127,8 +182,24 @@ class RecipientInfos(SetOf):
     bounds = (1, float("+inf"))
 
 
+class Gost2814789IV(OctetString):
+    bounds = (8, 8)
+
+
+class Gost2814789Parameters(Sequence):
+    schema = (
+        ("iv", Gost2814789IV()),
+        ("encryptionParamSet", ObjectIdentifier()),
+    )
+
+
 class ContentEncryptionAlgorithmIdentifier(AlgorithmIdentifier):
-    pass
+    schema = (
+        ("algorithm", ObjectIdentifier(defines=(
+            (("parameters",), {id_Gost28147_89: Gost2814789Parameters()}),
+        ))),
+        ("parameters", Any(optional=True)),
+    )
 
 
 class EncryptedContent(OctetString):
@@ -153,61 +224,6 @@ class EnvelopedData(Sequence):
     )
 
 
-class ContentInfo(Sequence):
-    schema = (
-        ("contentType", ContentType()),
-        ("content", Any(expl=tag_ctxc(0))),
-    )
-
-
-class Gost2814789IV(OctetString):
-    bounds = (8, 8)
-
-
-class Gost2814789Parameters(Sequence):
-    schema = (
-        ("iv", Gost2814789IV()),
-        ("encryptionParamSet", ObjectIdentifier()),
-    )
-
-
-class Gost2814789Key(OctetString):
-    bounds = (32, 32)
-
-
-class Gost2814789MAC(OctetString):
-    bounds = (4, 4)
-
-
-class Gost2814789EncryptedKey(Sequence):
-    schema = (
-        ("encryptedKey", Gost2814789Key()),
-        ("maskKey", Gost2814789Key(impl=tag_ctxp(0), optional=True)),
-        ("macKey", Gost2814789MAC()),
-    )
-
-
-class GostR34102001TransportParameters(Sequence):
-    schema = (
-        ("encryptionParamSet", ObjectIdentifier()),
-        ("ephemeralPublicKey", SubjectPublicKeyInfo(
-            impl=tag_ctxc(0),
-            optional=True,
-        )),
-        ("ukm", OctetString()),
-    )
-
-
-class GostR3410KeyTransport(Sequence):
-    schema = (
-        ("sessionEncryptedKey", Gost2814789EncryptedKey()),
-        ("transportParameters", GostR34102001TransportParameters(
-            impl=tag_ctxc(0),
-            optional=True,
-        )),
-    )
-
-
 class EncapsulatedContentInfo(Sequence):
     schema = (
         ("eContentType", ContentType()),
@@ -254,12 +270,26 @@ class SignerInfos(SetOf):
     schema = SignerInfo()
 
 
+class CertificateChoices(Choice):
+    schema = (
+        ('certificate', Certificate()),
+        # ('extendedCertificate', ExtendedCertificate(impl=tag_ctxp(0))),
+        # ('v1AttrCert', AttributeCertificateV1(impl=tag_ctxc(1))),  # V1 is osbolete
+        # ('v2AttrCert', AttributeCertificateV2(impl=tag_ctxc(2))),
+        # ('other', OtherCertificateFormat(impl=tag_ctxc(3))),
+    )
+
+
+class CertificateSet(SetOf):
+    schema = CertificateChoices()
+
+
 class SignedData(Sequence):
     schema = (
         ("version", CMSVersion()),
         ("digestAlgorithms", DigestAlgorithmIdentifiers()),
         ("encapContentInfo", EncapsulatedContentInfo()),
-        # ("certificates", CertificateSet(impl=tag_ctxc(0), optional=True)),
+        ("certificates", CertificateSet(impl=tag_ctxc(0), optional=True)),
         # ("crls", RevocationInfoChoices(impl=tag_ctxc(1), optional=True)),
         ("signerInfos", SignerInfos()),
     )
@@ -276,3 +306,16 @@ class DigestedData(Sequence):
         ("encapContentInfo", EncapsulatedContentInfo()),
         ("digest", Digest()),
     )
+
+
+class ContentInfo(Sequence):
+    schema = (
+        ("contentType", ContentType(defines=(
+            (("content",), {
+                id_digestedData: DigestedData(),
+                id_envelopedData: EnvelopedData(),
+                id_signedData: SignedData(),
+            }),
+        ))),
+        ("content", Any(expl=tag_ctxc(0))),
+    )