pyasn1-alt-modules 0.4.3__py2.py3-none-any.whl → 0.4.4__py2.py3-none-any.whl

pyasn1_alt_modules/__init__.py

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

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/rfc9480.py

@@ -2,8 +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.
 #
-# Copyright (c) 2021-2024, Vigil Security, LLC
+# Copyright (c) 2021, Vigil Security, LLC
 # License: http://vigilsec.com/pyasn1_alt_modules_license.txt
 #
 # Updates to the Certificate Management Protocol (CMP)
@@ -143,7 +144,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))
     )
 

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.

{pyasn1_alt_modules-0.4.3.dist-info → pyasn1_alt_modules-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyasn1-alt-modules
-Version: 0.4.3
+Version: 0.4.4
 Summary: A alternate collection of ASN.1-based protocols modules.
 Home-page: https://github.com/russhousley/pyasn1-alt-modules
 Author: Russ Housley
@@ -21,18 +21,18 @@ 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: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*
 Description-Content-Type: text/plain
 License-File: LICENSE.txt
 Requires-Dist: pyasn1 >=0.4.7

{pyasn1_alt_modules-0.4.3.dist-info → pyasn1_alt_modules-0.4.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyasn1_alt_modules/__init__.py,sha256=u9WPG0pKKTbs8kj8x0-Gzkq13qU3i37wDkIRvsM40Hg,65
+pyasn1_alt_modules/__init__.py,sha256=R5AujzMhS5EDF6EOD-KovQxq3sEW8ezuFu1-xNcezP0,65
 pyasn1_alt_modules/opentypemap.py,sha256=6Z-NY-mf7sp0kPndmCVrQ0zNOEeyb4JcpDlYcBO4OMY,517
 pyasn1_alt_modules/pem.py,sha256=c-3lij6mTNWEXndSY-oKKDQw_wgV_ndbMC-ySJ2HVHw,2120
 pyasn1_alt_modules/rfc1155.py,sha256=WKxBJfYB4-bubjPp277FVYYpjn8IE41ALEM_MlvFuuo,2745
@@ -159,6 +159,7 @@ pyasn1_alt_modules/rfc8737.py,sha256=UoF03X06rhcGJBBQ6SEErzbtaQscfyrliXZsXiQbu_M
 pyasn1_alt_modules/rfc8769.py,sha256=9-krCfH8annRFPUk71sSPrCtgxggBNUMOIEjMjSNXlo,461
 pyasn1_alt_modules/rfc8894.py,sha256=3peY9iyW1BKnCW4Ou4ipzJc1dRQu73AgmiyV7mf4Nqg,1117
 pyasn1_alt_modules/rfc8951.py,sha256=XBFQce0AbKf5iqmKo2Ru4fk_Cz3W3aiBI1dvNQFueZs,967
+pyasn1_alt_modules/rfc8954.py,sha256=UmMhmTF0pozM6ArIhflP0A7W3W5_SvK63Bj1Cutuogo,8371
 pyasn1_alt_modules/rfc8994.py,sha256=Iu6AOUFaOSIfobBO82V9Knnug3dqfy7m6AaiJWcGyvU,1176
 pyasn1_alt_modules/rfc8995.py,sha256=luGJiaD2vmqmrl8s4QDNmz74gVCmII3LuF-q-H59ifE,862
 pyasn1_alt_modules/rfc9044.py,sha256=CSw7_POQuNFL137FfHuXc9P1Y-yKk7g3AgRVY47SDxA,2309
@@ -176,12 +177,13 @@ pyasn1_alt_modules/rfc9337.py,sha256=miqpySAcEpzFdZR7H98rbsu-nY9nYJvFHZu6qx5khzE
 pyasn1_alt_modules/rfc9345.py,sha256=8pVTYX0QAhtITQB7YZN55pwrxjoTY22r1K2AHtZAQ_M,827
 pyasn1_alt_modules/rfc9385.py,sha256=aWTi8CFSvDV48y2YMDU1q93Axl3WlXxYSji1_FGhAEU,554
 pyasn1_alt_modules/rfc9399.py,sha256=_LNS6F61VpnVCtiP6pilV76n-WWOvGDLPHEFgXl75J0,1306
-pyasn1_alt_modules/rfc9480.py,sha256=5bSOHiK1qFeCeE3nEcanODwit2etlQUm9fT0s6EHsKU,20442
+pyasn1_alt_modules/rfc9480.py,sha256=bgyNS3tFhMMXUe998BjjOay9QOtZAzP8wFPLhVb_X8I,20519
 pyasn1_alt_modules/rfc9481.py,sha256=Pynt79CcXab0dt7TjDTzakcEj5xWmBbtF9_MLe4xlNg,5125
 pyasn1_alt_modules/rfc9509.py,sha256=dOG1pqpco2lFPIC4f7TBc4G237uevN_F12bg6vRgeWY,510
-pyasn1_alt_modules-0.4.3.dist-info/LICENSE.txt,sha256=l7yNsFxZ6wGRhZS3Ev61Y4qKqhwCe9MIZ5YE6QQOB5A,1402
-pyasn1_alt_modules-0.4.3.dist-info/METADATA,sha256=8OmQ36iUlaws1wh6_2adtveiieabpEGvDqCyP0aQPe4,1877
-pyasn1_alt_modules-0.4.3.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-pyasn1_alt_modules-0.4.3.dist-info/top_level.txt,sha256=GLxbt54_9pWn-TXLirWGJ2PH7_RnEfi3V8TL0bsJIp8,19
-pyasn1_alt_modules-0.4.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pyasn1_alt_modules-0.4.3.dist-info/RECORD,,
+pyasn1_alt_modules/rfc9548.py,sha256=vNBxmJcFMeUv3_B_EnhwmvB7tVTxzJ_L6rrmaqVcnHU,522
+pyasn1_alt_modules-0.4.4.dist-info/LICENSE.txt,sha256=l7yNsFxZ6wGRhZS3Ev61Y4qKqhwCe9MIZ5YE6QQOB5A,1402
+pyasn1_alt_modules-0.4.4.dist-info/METADATA,sha256=ypv3EuxzbcZCFeHcXqXH1t1yf9OQHC_IWa1aQkz3_Fs,1887
+pyasn1_alt_modules-0.4.4.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
+pyasn1_alt_modules-0.4.4.dist-info/top_level.txt,sha256=GLxbt54_9pWn-TXLirWGJ2PH7_RnEfi3V8TL0bsJIp8,19
+pyasn1_alt_modules-0.4.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+pyasn1_alt_modules-0.4.4.dist-info/RECORD,,