diff options
author | Russ Housley <housley@vigilsec.com> | 2019-05-23 16:41:06 -0400 |
---|---|---|
committer | Ilya Etingof <etingof@gmail.com> | 2019-05-23 22:41:06 +0200 |
commit | 96451d80749a1da28417d2ed5324c0274e4c1865 (patch) | |
tree | 382c1d0fe9b0b2786ffdea3b21df524324bcc9aa /pyasn1_modules | |
parent | ec5cd996e045730472813d260fa5e1ffe9fde903 (diff) | |
download | pyasn1-modules-96451d80749a1da28417d2ed5324c0274e4c1865.tar.gz |
Add support for RFC 3274 (#36)
* Add support for RFC 3274
Diffstat (limited to 'pyasn1_modules')
-rw-r--r-- | pyasn1_modules/rfc3274.py | 48 | ||||
-rw-r--r-- | pyasn1_modules/rfc3565.py | 4 |
2 files changed, 50 insertions, 2 deletions
diff --git a/pyasn1_modules/rfc3274.py b/pyasn1_modules/rfc3274.py new file mode 100644 index 0000000..bf8a7a6 --- /dev/null +++ b/pyasn1_modules/rfc3274.py @@ -0,0 +1,48 @@ +# +# This file is part of pyasn1-modules software. +# +# Created by Russ Housley with assistance from asn1ate v.0.6.0. +# +# Copyright (c) 2019, Vigil Security, LLC +# License: http://snmplabs.com/pyasn1/license.html +# +# CMS Compressed Data Content Type +# +# ASN.1 source from: +# https://www.rfc-editor.org/rfc/rfc3274.txt +# + +from pyasn1.type import namedtype +from pyasn1.type import univ + +from pyasn1_modules import rfc5280 +from pyasn1_modules import rfc5652 + + +class CompressionAlgorithmIdentifier(rfc5280.AlgorithmIdentifier): + pass + + +# The CMS Compressed Data Content Type + +id_ct_compressedData = univ.ObjectIdentifier('1.2.840.113549.1.9.16.1.9') + +class CompressedData(univ.Sequence): + pass + +CompressedData.componentType = namedtype.NamedTypes( + namedtype.NamedType('version', rfc5652.CMSVersion()), # Always set to 0 + namedtype.NamedType('compressionAlgorithm', CompressionAlgorithmIdentifier()), + namedtype.NamedType('encapContentInfo', rfc5652.EncapsulatedContentInfo()) +) + + +# Algorithm identifier for the zLib Compression Algorithm +# This includes cpa_zlibCompress as defined in RFC 6268, +# from https://www.rfc-editor.org/rfc/rfc6268.txt + +id_alg_zlibCompress = univ.ObjectIdentifier('1.2.840.113549.1.9.16.3.8') + +cpa_zlibCompress = rfc5280.AlgorithmIdentifier() +cpa_zlibCompress['algorithm'] = id_alg_zlibCompress +# cpa_zlibCompress['parameters'] are absent
\ No newline at end of file diff --git a/pyasn1_modules/rfc3565.py b/pyasn1_modules/rfc3565.py index 2cac273..c4b742d 100644 --- a/pyasn1_modules/rfc3565.py +++ b/pyasn1_modules/rfc3565.py @@ -1,8 +1,8 @@ # Copyright (c) 2019, Vigil Security, LLC # License: http://snmplabs.com/pyasn1/license.html # -# Use of the Elliptic Curve Diffie-Hellman Key Agreement Algorithm -# with X25519 and X448 in the Cryptographic Message Syntax (CMS) +# Use of the Advanced Encryption Standard (AES) Encryption +# Algorithm in the Cryptographic Message Syntax (CMS) # # ASN.1 source from: # https://www.rfc-editor.org/rfc/rfc3565.txt |