From 141ec28f940fbba3edb67252bc4e8707502b87ce Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Thu, 22 Apr 2021 21:39:07 +0300 Subject: [PATCH] Fix small lint errors --- pygost/asn1schemas/cms.py | 14 -------------- pygost/asn1schemas/prvkey.py | 2 +- pygost/test_pfx.py | 1 + 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/pygost/asn1schemas/cms.py b/pygost/asn1schemas/cms.py index c57f6f0..2df3633 100644 --- a/pygost/asn1schemas/cms.py +++ b/pygost/asn1schemas/cms.py @@ -389,20 +389,6 @@ 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()), diff --git a/pygost/asn1schemas/prvkey.py b/pygost/asn1schemas/prvkey.py index 6b9c493..fc9da6d 100644 --- a/pygost/asn1schemas/prvkey.py +++ b/pygost/asn1schemas/prvkey.py @@ -22,9 +22,9 @@ from pyderasn import Null from pyderasn import ObjectIdentifier from pyderasn import OctetString from pyderasn import Sequence +from pyderasn import SetOf from pyderasn import tag_ctxc from pyderasn import tag_ctxp -from pyderasn import SetOf from pygost.asn1schemas.oids import id_tc26_gost3410_2012_256 from pygost.asn1schemas.oids import id_tc26_gost3410_2012_512 diff --git a/pygost/test_pfx.py b/pygost/test_pfx.py index e9d8694..618799a 100644 --- a/pygost/test_pfx.py +++ b/pygost/test_pfx.py @@ -37,6 +37,7 @@ from pygost.wrap import kimp15 try: from pyderasn import OctetString + from pygost.asn1schemas.cms import EncryptedData from pygost.asn1schemas.cms import EnvelopedData from pygost.asn1schemas.cms import SignedAttributes -- 2.44.0