Update SMIMECapabilityIdentifier to use EncryptionAlgorithmId

wbond · Mar 5, 2022 · 4791c1e · 4791c1e
1 parent 976dbba
commit 4791c1e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/asn1crypto/cms.py b/asn1crypto/cms.py
@@ -30,6 +30,7 @@
     _ForceNullParameters,
     DigestAlgorithm,
     EncryptionAlgorithm,
+    EncryptionAlgorithmId,
     HmacAlgorithm,
     KdfAlgorithm,
     RSAESOAEPParams,
@@ -950,7 +951,7 @@ class SMIMEEncryptionKeyPreferences(SetOf):
 
 class SMIMECapabilityIdentifier(Sequence):
     _fields = [
-        ('capability_id', ObjectIdentifier),
+        ('capability_id', EncryptionAlgorithmId),
         ('parameters', Any, {'optional': True}),
     ]
 

diff --git a/tests/test_cms.py b/tests/test_cms.py
@@ -935,31 +935,31 @@ def test_parse_content_info_smime_capabilities(self):
             [capability.native for capability in smime_capabilities['values'][0]],
             [
                 util.OrderedDict([
-                    ('capability_id', '2.16.840.1.101.3.4.1.42'),
+                    ('capability_id', 'aes256_cbc'),
                     ('parameters', None),
                 ]),
                 util.OrderedDict([
-                    ('capability_id', '2.16.840.1.101.3.4.1.2'),
+                    ('capability_id', 'aes128_cbc'),
                     ('parameters', None),
                 ]),
                 util.OrderedDict([
-                    ('capability_id', '1.2.840.113549.3.7'),
+                    ('capability_id', 'tripledes_3key'),
                     ('parameters', None),
                 ]),
                 util.OrderedDict([
-                    ('capability_id', '1.2.840.113549.3.2'),
+                    ('capability_id', 'rc2'),
                     ('parameters', 128),
                 ]),
                 util.OrderedDict([
-                    ('capability_id', '1.2.840.113549.3.2'),
+                    ('capability_id', 'rc2'),
                     ('parameters', 64),
                 ]),
                 util.OrderedDict([
-                    ('capability_id', '1.3.14.3.2.7'),
+                    ('capability_id', 'des'),
                     ('parameters', None),
                 ]),
                 util.OrderedDict([
-                    ('capability_id', '1.2.840.113549.3.2'),
+                    ('capability_id', 'rc2'),
                     ('parameters', 40),
                 ]),
             ]