aboutsummaryrefslogtreecommitdiff
path: root/pyasn1_modules/rfc6402.py
diff options
context:
space:
mode:
Diffstat (limited to 'pyasn1_modules/rfc6402.py')
-rw-r--r--pyasn1_modules/rfc6402.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/pyasn1_modules/rfc6402.py b/pyasn1_modules/rfc6402.py
index dbb699a..b5f0d48 100644
--- a/pyasn1_modules/rfc6402.py
+++ b/pyasn1_modules/rfc6402.py
@@ -41,7 +41,8 @@ def _buildOid(*components):
return univ.ObjectIdentifier(output)
-cmcControlAttributesMap = { }
+# Since CMS Attributes and CMC Controls both use 'attrType', one map is used
+cmcControlAttributesMap = rfc5652.cmsAttributesMap
class ChangeSubjectName(univ.Sequence):
@@ -615,10 +616,13 @@ _cmcControlAttributesMapUpdate = {
cmcControlAttributesMap.update(_cmcControlAttributesMapUpdate)
-# Map of CMC Content Type OIDs to CMC Content Types
-# To be added to the ones that are in rfc5652.py
+# Map of CMC Content Type OIDs to CMC Content Types are added to
+# the ones that are in rfc5652.py
-cmsContentTypesMapUpdate = {
+_cmsContentTypesMapUpdate = {
id_cct_PKIData: PKIData(),
id_cct_PKIResponse: PKIResponse(),
-} \ No newline at end of file
+}
+
+rfc5652.cmsContentTypesMap.update(_cmsContentTypesMapUpdate)
+