From 4791c1edac3dda76d9a718f2a35347f10ba35028 Mon Sep 17 00:00:00 2001
From: wbond <will@wbond.net>
Date: Sat, 5 Mar 2022 08:26:08 -0500
Subject: [PATCH] Update SMIMECapabilityIdentifier to use EncryptionAlgorithmId

---
 asn1crypto/cms.py |  3 ++-
 tests/test_cms.py | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/asn1crypto/cms.py b/asn1crypto/cms.py
index 9c8b6db..c395b22 100644
--- 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
index 2f503fc..8f9b1e6 100644
--- 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),
                 ]),
             ]