pyasn1-alt-modules 0.4.3__tar.gz → 0.4.5__tar.gz

{pyasn1-alt-modules-0.4.3 → pyasn1_alt_modules-0.4.5}/CHANGES.txt

@@ -1,3 +1,24 @@
+Revision 0.4.5, released 02-09-2024
+-----------------------------------
+- Require pyasn1 0.5.0 to force people to the maintained version
+- Dropped support for EOL Python 2.7, 3.6, and 3.7
+- Added RFC9598 for Internationalized Email Addresses in X.509 Certificates
+- Added RFC9582 for RPKI Route Origin Authorizations (ROAs)
+- Added RFC9579 for Use of PBMAC1 in the PKCS #12 Syntax
+- Improve RFC9480 by updating the algorithm identifier map and fix typo
+- Improve RFC8708 by addressing errata eid7963, which only changes a comment
+- Added RFC9608 for the noRevAvail Certificate Extension
+- Improve RFC6401 by addressing errata eid3943, eid5931, and eid6571
+- Added RFC9629 for CMS KEMRecipientInfo
+- Added RFC9654 for Online Certificate Status Protocol (OCSP) Nonce Extension
+
+Revision 0.4.4, released 03-22-2024
+-----------------------------------
+- Added support for Python 3.12, and dropped support for Python 3.5.
+- Added RFC9548 for Generating Transport Key Containers Using the GOST Algorithms
+- Added RFC8964 for Online Certificate Status Protocol (OCSP) with Nonce constraints
+- Modified RFC9480 (CMP updates) to make InfoTypeAndValue['infoType'] optional
+
 Revision 0.4.3, released 08-02-2024
 -----------------------------------
 - Update the copyright comment lines for 2024
@@ -146,7 +167,6 @@ Revision 0.3.0, released 08-06-2021
 
 Revision 0.2.8, released 16-11-2019
 -----------------------------------
-
 - Improve test routines for modules that use certificate extensions
 - Improve test for RFC3709 with a real world certificate
 - Added RFC7633 providing TLS Features Certificate Extension
@@ -187,7 +207,6 @@ Revision 0.2.8, released 16-11-2019
 
 Revision 0.2.7, released 09-10-2019
 -----------------------------------
-
 - Added maps for use with openType to RFC 3565
 - Added RFC2985 providing PKCS#9 Attributes
 - Added RFC3770 providing Certificate Extensions and Attributes for
@@ -235,7 +254,6 @@ Revision 0.2.7, released 09-10-2019
 
 Revision 0.2.6, released 31-07-2019
 -----------------------------------
-
 - Added RFC3560 providing RSAES-OAEP Key Transport Algorithm
   in CMS
 - Added RFC6019 providing BinaryTime - an alternate format
@@ -278,7 +296,6 @@ Revision 0.2.6, released 31-07-2019
 
 Revision 0.2.5, released 24-04-2019
 -----------------------------------
-
 - Added module RFC5958 providing Asymmetric Key Packages,
   which is essentially version 2 of the PrivateKeyInfo
   structure in PKCS#8 in RFC 5208
@@ -298,68 +315,57 @@ Revision 0.2.5, released 24-04-2019
 
 Revision 0.2.4, released 26-01-2018
 -----------------------------------
-
 - Added modules for RFC8226 implementing JWT Claim Constraints
   and TN Authorization List for X.509 certificate extensions
 - Fixed bug in `rfc5280.AlgorithmIdentifier` ANY type definition
 
 Revision 0.2.3, released 30-12-2018
 -----------------------------------
-
 - Added modules for RFC5083 and RFC5084 (CMS)
 - Copyright notice extended to the year 2019
 
 Revision 0.2.2, released 28-06-2018
 -----------------------------------
-
 - Copyright notice extended to the year 2018
 - Migrated references from SourceForge
 - rfc2986 module added
 
 Revision 0.2.1, released 23-11-2017
 -----------------------------------
-
 - Allow ANY DEFINED BY objects expanding automatically if requested
 - Imports PEP8'ed
 
 Revision 0.1.5, released 10-10-2017
 -----------------------------------
-
 - OCSP response blob fixed in test
 - Fixed wrong OCSP ResponderID components tagging
 
 Revision 0.1.4, released 07-09-2017
 -----------------------------------
-
 - Typo fixed in the dependency spec
 
 Revision 0.1.3, released 07-09-2017
 -----------------------------------
-
 - Apparently, pip>=1.5.6 is still widely used and it is not PEP440
   compliant. Had to replace the `~=` version dependency spec with a
   sequence of simple comparisons to remain compatible with the aging pip.
 
 Revision 0.1.2, released 07-09-2017
 -----------------------------------
-
 - Pinned to pyasn1 ~0.3.4
 
 Revision 0.1.1, released 27-08-2017
 -----------------------------------
-
 - Tests refactored into proper unit tests
 - pem.readBase64fromText() convenience function added
 - Pinned to pyasn1 0.3.3
 
 Revision 0.0.11, released 04-08-2017
 ------------------------------------
-
 - Fixed typo in ASN.1 definitions at rfc2315.py
 
 Revision 0.0.10, released 27-07-2017
 ------------------------------------
-
 * Fixed SequenceOf initializer to pass now-mandatory componentType
   keyword argument (since pyasn1 0.3.1)
 * Temporarily fixed recursive ASN.1 type definition to work with
@@ -367,7 +373,6 @@ Revision 0.0.10, released 27-07-2017
 
 Revision 0.0.9, released 01-06-2017
 -----------------------------------
-
 * More CRL data structures added (RFC3279)
 * Added X.509 certificate extensions map
 * Added X.509 attribute type map
@@ -378,7 +383,6 @@ Revision 0.0.9, released 01-06-2017
 
 Revision 0.0.8, released 28-09-2015
 -----------------------------------
-
 - Wheel distribution format now supported
 - Fix to misspelled rfc2459.id_at_sutname variable
 - Fix to misspelled rfc2459.NameConstraints component tag ID
@@ -386,20 +390,17 @@ Revision 0.0.8, released 28-09-2015
 
 Revision 0.0.7, released 01-08-2015
 -----------------------------------
-
 - Extensions added to text files, CVS attic flushed.
 - Fix to rfc2459.BasicConstraints syntax.
 
 Revision 0.0.6, released 21-06-2015
 -----------------------------------
-
 - Typo fix to id_kp_serverAuth object value
 - A test case for indefinite length encoding eliminated as it's
   forbidden in DER.
 
 Revision 0.0.5
 --------------
-
 - License updated to vanilla BSD 2-Clause to ease package use
   (http://opensource.org/licenses/BSD-2-Clause).
 - Missing components added to rfc4210.PKIBody.
@@ -408,7 +409,6 @@ Revision 0.0.5
 
 Revision 0.0.4
 --------------
-
 - CMP structures (RFC4210), cmpdump.py tool and test case added.
 - SNMPv2c Message syntax (RFC1901) properly defined.
 - Package version established in form of __init__.__version__
@@ -417,7 +417,6 @@ Revision 0.0.4
 
 Revision 0.0.3
 --------------
-
 - Text cases implemented
 - X.509 CRMF structures (RFC2511) and crmfdump.py tool added
 - X.509 CRL structures and crldump.py tool added
@@ -430,10 +429,8 @@ Revision 0.0.3
 - PEM files read function generalized to be used more universally.
 - complete PKIX1 '88 code implemented at rfc2459.py
 
-
 Revision 0.0.2
 --------------
-
 - Require pyasn1 >= 0.1.1
 - Fixes towards Py3K compatibility
   + use either of existing urllib module
@@ -443,5 +440,4 @@ Revision 0.0.2
 
 Revision 0.0.1a
 ---------------
-
 - Initial revision, most code carried from pyasn1 examples.

{pyasn1-alt-modules-0.4.3/pyasn1_alt_modules.egg-info → pyasn1_alt_modules-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyasn1-alt-modules
-Version: 0.4.3
+Version: 0.4.5
 Summary: A alternate collection of ASN.1-based protocols modules.
 Home-page: https://github.com/russhousley/pyasn1-alt-modules
 Author: Russ Housley
@@ -18,22 +18,17 @@ Classifier: Intended Audience :: Telecommunications Industry
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Communications
-Classifier: Topic :: System :: Monitoring
-Classifier: Topic :: System :: Networking :: Monitoring
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
+Requires-Python: >=3.8
 Description-Content-Type: text/plain
 License-File: LICENSE.txt
+Requires-Dist: pyasn1>=0.5.0
 
 A collection of ASN.1 modules expressed in form of pyasn1 classes. Includes protocols PDUs definition (SNMP, LDAP, OCSP, and so on) as well as various data structures (X.509, PKCS, and so on).

{pyasn1-alt-modules-0.4.3 → pyasn1_alt_modules-0.4.5}/README.md

@@ -8,7 +8,7 @@ Alternative ASN.1 modules for pyasn1
 The `pyasn1-alt-modules` package contains a collection of
 [ASN.1](https://www.itu.int/rec/dologin_pub.asp?lang=e&id=T-REC-X.208-198811-W!!PDF-E&type=items)
 data structures expressed as Python classes based on [pyasn1](https://github.com/etingof/pyasn1)
-data model.
+data model. Maintenance of pyasn1 has shifted to [pyasn1-maint](https://github.com/pyasn1/pyasn1).
 
 It seems that [pyasn1-modules](https://github.com/etingof/pyasn1-modules) is no
 longer being maintained.  As a result, the `pyasn1-alt-modules` package was
@@ -25,7 +25,7 @@ Feedback
 --------
 
 If something does not work as expected, 
-[open an issue](https://github.com/russhousley/pyasn1-alt-modules/issues) at GitHub.
+[open an issue](https://github.com/russhousley/pyasn1-alt-modules/issues) on GitHub.
  
 Additional module contributions are welcome via GitHub pull requests.
 

{pyasn1-alt-modules-0.4.3 → pyasn1_alt_modules-0.4.5}/pyasn1_alt_modules/__init__.py

@@ -1,2 +1,2 @@
 # http://www.python.org/dev/peps/pep-0396/
-__version__ = '0.4.3'
+__version__ = '0.4.5'

{pyasn1-alt-modules-0.4.3 → pyasn1_alt_modules-0.4.5}/pyasn1_alt_modules/rfc6402.py

@@ -6,6 +6,7 @@
 # Modified by Russ Housley to add a maps for CMC Control Attributes
 #   and CMC Content Types for use with opentypes.
 # Modified by Russ Housley to include the opentypemap manager.
+# Modified by Russ Housley for errata 3943, 5931, and 6571.
 #
 # Copyright (c) 2005-2020, Ilya Etingof <etingof@gmail.com>
 # Copyright (c) 2021-2024, Vigil Security, LLC
@@ -15,6 +16,9 @@
 #
 # ASN.1 source from:
 # https://www.rfc-editor.org/rfc/rfc6402.txt
+# https://www.rfc-editor.org/errata/eid3943
+# https://www.rfc-editor.org/errata/eid5931
+# https://www.rfc-editor.org/errata/eid6571
 #
 from pyasn1.type import char
 from pyasn1.type import constraint
@@ -57,9 +61,11 @@ class ChangeSubjectName(univ.Sequence):
     pass
 
 
+# https://www.rfc-editor.org/errata/eid3943
 ChangeSubjectName.componentType = namedtype.NamedTypes(
     namedtype.OptionalNamedType('subject', rfc5280.Name()),
-    namedtype.OptionalNamedType('subjectAlt', rfc5280.GeneralNames())
+    namedtype.OptionalNamedType('subjectAlt', rfc5280.GeneralNames().subtype(
+        implicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 1)))
 )
 
 
@@ -159,7 +165,8 @@ CMCStatusInfoV2.componentType = namedtype.NamedTypes(
                     componentType=namedtype.NamedTypes(
                         namedtype.NamedType('failInfoOID', univ.ObjectIdentifier()),
                         namedtype.NamedType('failInfoValue', AttributeValue()))
-                    )
+                    ).subtype(implicitTag=tag.Tag(
+                        tag.tagClassContext, tag.tagFormatConstructed, 1))
                 )
             )
         )
@@ -501,7 +508,8 @@ class ExtensionReq(univ.SequenceOf):
 ExtensionReq.componentType = rfc5280.Extension()
 ExtensionReq.sizeSpec = constraint.ValueSizeConstraint(1, MAX)
 
-id_kp_cmcArchive = _buildOid(rfc5280.id_kp, 28)
+# https://www.rfc-editor.org/errata/eid5931
+id_kp_cmcArchive = _buildOid(rfc5280.id_kp, 29)
 
 id_cmc_publishCert = _buildOid(id_cmc, 30)
 

{pyasn1-alt-modules-0.4.3 → pyasn1_alt_modules-0.4.5}/pyasn1_alt_modules/rfc8708.py

@@ -9,6 +9,7 @@
 #
 # ASN.1 source from:
 # https://www.rfc-editor.org/rfc/rfc8708.txt
+# https://www.rfc-editor.org/errata/eid7963
 
 
 from pyasn1.type import univ
@@ -38,5 +39,5 @@ class HSS_LMS_HashSig_PublicKey(univ.OctetString):
 
 pk_HSS_LMS_HashSig = rfc5280.SubjectPublicKeyInfo()
 pk_HSS_LMS_HashSig['algorithm'] = sa_HSS_LMS_HashSig
-# pk_HSS_LMS_HashSig['subjectPublicKey'] CONTAINS a
-#     DER-encoded HSS_LMS_HashSig_PublicKey
+# pk_HSS_LMS_HashSig['subjectPublicKey'] CONTAINS the
+#     HSS/LMS public key without any ASN.1 encoding

pyasn1_alt_modules-0.4.5/pyasn1_alt_modules/rfc8954.py

@@ -0,0 +1,238 @@
+#
+# This file is part of pyasn1-alt-modules software.
+#
+# Created by Russ Housley.
+#
+# Copyright (c) 2024, Vigil Security, LLC
+# License: http://vigilsec.com/pyasn1-alt-modules-license.txt
+#
+# Online Certificate Status Protocol (OCSP) with nonce size constraints
+#
+# ASN.1 source from:
+# https://www.rfc-editor.org/rfc/rfc6960.txt
+# https://www.rfc-editor.org/rfc/rfc8954.txt
+#
+
+from pyasn1.type import char
+from pyasn1.type import constraint
+from pyasn1.type import namedtype
+from pyasn1.type import tag
+from pyasn1.type import univ
+from pyasn1.type import useful
+
+from pyasn1_alt_modules import rfc2560
+from pyasn1_alt_modules import rfc5280
+from pyasn1_alt_modules import opentypemap
+
+certificateExtensionsMap = opentypemap.get('certificateExtensionsMap')
+
+ocspResponseMap = opentypemap.get('ocspResponseMap')
+
+MAX = float('inf')
+
+
+# Imports from RFC 5280
+
+AlgorithmIdentifier = rfc5280.AlgorithmIdentifier
+AuthorityInfoAccessSyntax = rfc5280.AuthorityInfoAccessSyntax
+Certificate = rfc5280.Certificate
+CertificateSerialNumber = rfc5280.CertificateSerialNumber
+CRLReason = rfc5280.CRLReason
+Extensions = rfc5280.Extensions
+GeneralName = rfc5280.GeneralName
+Name = rfc5280.Name
+
+id_kp = rfc5280.id_kp
+
+id_ad_ocsp = rfc5280.id_ad_ocsp
+
+
+# Imports from the original OCSP module in RFC 2560
+
+AcceptableResponses = rfc2560.AcceptableResponses
+ArchiveCutoff = rfc2560.ArchiveCutoff
+CertStatus = rfc2560.CertStatus
+KeyHash = rfc2560.KeyHash
+OCSPResponse = rfc2560.OCSPResponse
+OCSPResponseStatus = rfc2560.OCSPResponseStatus
+ResponseBytes = rfc2560.ResponseBytes
+RevokedInfo = rfc2560.RevokedInfo
+UnknownInfo = rfc2560.UnknownInfo
+Version = rfc2560.Version
+
+id_kp_OCSPSigning = rfc2560.id_kp_OCSPSigning
+
+id_pkix_ocsp = rfc2560.id_pkix_ocsp
+id_pkix_ocsp_archive_cutoff = rfc2560.id_pkix_ocsp_archive_cutoff
+id_pkix_ocsp_basic = rfc2560.id_pkix_ocsp_basic
+id_pkix_ocsp_crl = rfc2560.id_pkix_ocsp_crl
+id_pkix_ocsp_nocheck = rfc2560.id_pkix_ocsp_nocheck
+id_pkix_ocsp_nonce = rfc2560.id_pkix_ocsp_nonce
+id_pkix_ocsp_response = rfc2560.id_pkix_ocsp_response
+id_pkix_ocsp_service_locator = rfc2560.id_pkix_ocsp_service_locator
+
+
+# Additional object identifiers
+
+id_pkix_ocsp_pref_sig_algs = id_pkix_ocsp + (8, )
+id_pkix_ocsp_extended_revoke = id_pkix_ocsp + (9, )
+
+
+# Updated structures (mostly to improve openTypes support)
+
+class CertID(univ.Sequence):
+    componentType = namedtype.NamedTypes(
+        namedtype.NamedType('hashAlgorithm', AlgorithmIdentifier()),
+        namedtype.NamedType('issuerNameHash', univ.OctetString()),
+        namedtype.NamedType('issuerKeyHash', univ.OctetString()),
+        namedtype.NamedType('serialNumber', CertificateSerialNumber())
+    )
+
+
+class SingleResponse(univ.Sequence):
+    componentType = namedtype.NamedTypes(
+        namedtype.NamedType('certID', CertID()),
+        namedtype.NamedType('certStatus', CertStatus()),
+        namedtype.NamedType('thisUpdate', useful.GeneralizedTime()),
+        namedtype.OptionalNamedType('nextUpdate', useful.GeneralizedTime().subtype(
+            explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 0))),
+        namedtype.OptionalNamedType('singleExtensions', Extensions().subtype(
+            explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 1)))
+    )
+
+
+class ResponderID(univ.Choice):
+    componentType = namedtype.NamedTypes(
+        namedtype.NamedType('byName', Name().subtype(
+            explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 1))),
+        namedtype.NamedType('byKey', KeyHash().subtype(
+            explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 2)))
+    )
+
+
+class ResponseData(univ.Sequence):
+    componentType = namedtype.NamedTypes(
+        namedtype.DefaultedNamedType('version', Version('v1').subtype(
+            explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 0))),
+        namedtype.NamedType('responderID', ResponderID()),
+        namedtype.NamedType('producedAt', useful.GeneralizedTime()),
+        namedtype.NamedType('responses', univ.SequenceOf(
+            componentType=SingleResponse())),
+        namedtype.OptionalNamedType('responseExtensions', Extensions().subtype(
+            explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 1)))
+    )
+
+
+class BasicOCSPResponse(univ.Sequence):
+    componentType = namedtype.NamedTypes(
+        namedtype.NamedType('tbsResponseData', ResponseData()),
+        namedtype.NamedType('signatureAlgorithm', AlgorithmIdentifier()),
+        namedtype.NamedType('signature', univ.BitString()),
+        namedtype.OptionalNamedType('certs', univ.SequenceOf(
+            componentType=Certificate()).subtype(explicitTag=tag.Tag(
+                tag.tagClassContext, tag.tagFormatSimple, 0)))
+    )
+
+
+class Request(univ.Sequence):
+    componentType = namedtype.NamedTypes(
+        namedtype.NamedType('reqCert', CertID()),
+        namedtype.OptionalNamedType('singleRequestExtensions', Extensions().subtype(
+            explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 0)))
+    )
+
+
+class Signature(univ.Sequence):
+    componentType = namedtype.NamedTypes(
+        namedtype.NamedType('signatureAlgorithm', AlgorithmIdentifier()),
+        namedtype.NamedType('signature', univ.BitString()),
+        namedtype.OptionalNamedType('certs', univ.SequenceOf(
+            componentType=Certificate()).subtype(explicitTag=tag.Tag(
+                tag.tagClassContext, tag.tagFormatSimple, 0)))
+    )
+
+
+class TBSRequest(univ.Sequence):
+    componentType = namedtype.NamedTypes(
+        namedtype.DefaultedNamedType('version', Version('v1').subtype(
+            explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 0))),
+        namedtype.OptionalNamedType('requestorName', GeneralName().subtype(
+            explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 1))),
+        namedtype.NamedType('requestList', univ.SequenceOf(
+            componentType=Request())),
+        namedtype.OptionalNamedType('requestExtensions', Extensions().subtype(
+            explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 2)))
+    )
+
+
+class OCSPRequest(univ.Sequence):
+    componentType = namedtype.NamedTypes(
+        namedtype.NamedType('tbsRequest', TBSRequest()),
+        namedtype.OptionalNamedType('optionalSignature', Signature().subtype(
+            explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 0)))
+    )
+
+
+# Previously omitted structure
+
+class ServiceLocator(univ.Sequence):
+    componentType = namedtype.NamedTypes(
+        namedtype.NamedType('issuer', Name()),
+        namedtype.NamedType('locator', AuthorityInfoAccessSyntax())
+    )
+
+
+# Additional structures
+
+class CrlID(univ.Sequence):
+    componentType = namedtype.NamedTypes(
+        namedtype.OptionalNamedType('crlUrl', char.IA5String().subtype(
+            explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 0))),
+        namedtype.OptionalNamedType('crlNum', univ.Integer().subtype(
+            explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 1))),
+        namedtype.OptionalNamedType('crlTime', useful.GeneralizedTime().subtype(
+            explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 2)))
+    )
+
+
+class PreferredSignatureAlgorithm(univ.Sequence):
+    componentType = namedtype.NamedTypes(
+        namedtype.NamedType('sigIdentifier', AlgorithmIdentifier()),
+        namedtype.OptionalNamedType('certIdentifier', AlgorithmIdentifier())
+    )
+
+
+class PreferredSignatureAlgorithms(univ.SequenceOf):
+    componentType = PreferredSignatureAlgorithm()
+
+
+class Nonce(univ.OctetString):
+    subtypeSpec = constraint.ValueSizeConstraint(1, 32)
+
+
+# Update the OCSP Response Map
+
+_ocspResponseMapUpdate = {
+    id_pkix_ocsp_basic: BasicOCSPResponse(),
+}
+
+ocspResponseMap.update(_ocspResponseMapUpdate)
+
+
+# Update the Certificate Extension Extensions Map
+
+_certificateExtensionsMapUpdate = {
+    # Certificate Extension
+    id_pkix_ocsp_nocheck: univ.Null(""),
+    # OCSP Request Extensions
+    id_pkix_ocsp_nonce: Nonce(),
+    id_pkix_ocsp_response: AcceptableResponses(),
+    id_pkix_ocsp_service_locator: ServiceLocator(),
+    id_pkix_ocsp_pref_sig_algs: PreferredSignatureAlgorithms(),
+    # OCSP Response Extensions
+    id_pkix_ocsp_crl: CrlID(),
+    id_pkix_ocsp_archive_cutoff: ArchiveCutoff(),
+    id_pkix_ocsp_extended_revoke: univ.Null(""),
+}
+
+certificateExtensionsMap.update(_certificateExtensionsMapUpdate)

{pyasn1-alt-modules-0.4.3 → pyasn1_alt_modules-0.4.5}/pyasn1_alt_modules/rfc9480.py

@@ -2,6 +2,9 @@
 # This file is part of pyasn1_alt_modules software.
 #
 # Created by Russ Housley with minor assistance from asn1ate v.0.6.0.
+# Modified by Russ Housley to make InfoTypeAndValue['infoType'] optional.
+# Modified by Russ Housley to update the algorithmIdentifierMap.
+# Modified bt Russ Housley to correct typo in SignKeyPairTypesValue.
 #
 # Copyright (c) 2021-2024, Vigil Security, LLC
 # License: http://vigilsec.com/pyasn1_alt_modules_license.txt
@@ -29,6 +32,8 @@ from pyasn1_alt_modules import rfc5652
 from pyasn1_alt_modules import rfc6402
 from pyasn1_alt_modules import opentypemap
 
+algorithmIdentifierMap = opentypemap.get('algorithmIdentifierMap')
+
 cmpInfoTypeAndValueMap = opentypemap.get('cmpInfoTypeAndValueMap')
 
 cmsAttributesMap = opentypemap.get('cmsAttributesMap')
@@ -143,7 +148,7 @@ RevReqContent = rfc4210.RevReqContent
 class InfoTypeAndValue(univ.Sequence):
     componentType = namedtype.NamedTypes(
         namedtype.NamedType('infoType', univ.ObjectIdentifier()),
-        namedtype.NamedType('infoValue', univ.Any(),
+        namedtype.OptionalNamedType('infoValue', univ.Any(),
             openType=opentype.OpenType('infoType', cmpInfoTypeAndValueMap))
     )
 
@@ -536,7 +541,7 @@ class CAProtEncCertValue(CMPCertificate):
 
 id_it_signKeyPairTypes = id_it + (2,)
 
-class SignKeyPairTypesValueclass(univ.SequenceOf):
+class SignKeyPairTypesValue(univ.SequenceOf):
     componentType = AlgorithmIdentifier()
 
 
@@ -674,7 +679,7 @@ class CRLsValue(univ.SequenceOf):
 
 _cmpInfoTypeAndValueMapUpdate = {
     id_it_caProtEncCert: CAProtEncCertValue(),
-    id_it_signKeyPairTypes: SignKeyPairTypesValueclass(),
+    id_it_signKeyPairTypes: SignKeyPairTypesValue(),
     id_it_encKeyPairTypes: EncKeyPairTypesValue(),
     id_it_preferredSymmAlg: PreferredSymmAlgValue(),
     id_it_caKeyUpdateInfo: CAKeyUpdateInfoValue(),
@@ -710,6 +715,16 @@ _cmsAttributesMapUpdate = {
 cmsAttributesMap.update(_cmsAttributesMapUpdate)
 
 
+# Update the Algorithm Identifier map
+
+_algorithmIdentifierMapUpdate = {
+    id_PasswordBasedMac: PBMParameter(),
+    id_DHBasedMac: DHBMParameter(),
+}
+
+algorithmIdentifierMap.update(_algorithmIdentifierMapUpdate)
+
+
 # Since pyasn1 does not naturally handle recursive definitions, this hack:
 #
 NestedMessageContent._componentType = PKIMessages()

pyasn1_alt_modules-0.4.5/pyasn1_alt_modules/rfc9548.py

@@ -0,0 +1,23 @@
+#
+# This file is part of pyasn1-alt-modules software.
+#
+# Created by Russ Housley.
+#
+# Copyright (c) 2024, Vigil Security, LLC
+# License: http://vigilsec.com/pyasn1-alt-modules-license.txt
+#
+# Generating Transport Key Containers Using the GOST Algorithms
+#
+# ASN.1 source from:
+# https://www.rfc-editor.org/rfc/rfc9548.txt
+#
+
+from pyasn1_alt_modules import rfc9215
+
+
+# Import from RFC 9215
+
+GostR3410_2012_PublicKey = rfc9215.GostR3410_2012_PublicKey
+
+
+# The Algorithm Identifier Map update was done by importing rfc9215.