Work around V2Form tagging issue in asn1crypto

See wbond/asn1crypto#220.
MatthiasValvekens · Dec 22, 2021 · ca3cf24 · ca3cf24
1 parent 4bcdf66
commit ca3cf24
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 0 deletions.
diff --git a/pyhanko_certvalidator/asn1_types.py b/pyhanko_certvalidator/asn1_types.py
@@ -82,9 +82,18 @@ def _make_tag_explicit(field_decl):
     del tag_dict['implicit']
 
 
+def _make_tag_implicit(field_decl):
+    tag_dict = field_decl[2]
+    if 'implicit' in tag_dict:
+        return
+    tag_dict['implicit'] = tag_dict['explicit']
+    del tag_dict['explicit']
+
 # Deal with wbond/asn1crypto#218
 _make_tag_explicit(cms.RoleSyntax._fields[1])
 _make_tag_explicit(cms.SecurityCategory._fields[1])
+# Deal with wbond/asn1crypto#220
+_make_tag_implicit(cms.AttCertIssuer._alternatives[1])
 
 # patch in attribute certificate extensions
 # Note: unlike in Certomancer, we don't do this one conditionally, since

diff --git a/tests/fixtures/attribute-certs/basic-aa/aa/alice-norev-targeted.attr.crt b/tests/fixtures/attribute-certs/basic-aa/aa/alice-norev-targeted.attr.crt
diff --git a/tests/fixtures/attribute-certs/basic-aa/aa/alice-role-norev.attr.crt b/tests/fixtures/attribute-certs/basic-aa/aa/alice-role-norev.attr.crt
diff --git a/tests/fixtures/attribute-certs/basic-aa/aa/alice-role-with-rev.attr.crt b/tests/fixtures/attribute-certs/basic-aa/aa/alice-role-with-rev.attr.crt
diff --git a/tests/fixtures/attribute-certs/basic-aa/aa/badsig.attr.crt b/tests/fixtures/attribute-certs/basic-aa/aa/badsig.attr.crt