aboutsummaryrefslogtreecommitdiff
path: root/pyasn1_modules
diff options
context:
space:
mode:
authorIlya Etingof <etingof@gmail.com>2019-04-25 08:26:08 +0200
committerIlya Etingof <etingof@gmail.com>2019-04-25 08:26:08 +0200
commit96bde16ef7049ac675189ab41d0bbb7982d732cf (patch)
tree73073090bd30609794beb76cb53b36e6ab83d53d /pyasn1_modules
parent000324619fc355b266a18f65e964198b9c60ae47 (diff)
downloadpyasn1-modules-96bde16ef7049ac675189ab41d0bbb7982d732cf.tar.gz
Fix up previous commit
Diffstat (limited to 'pyasn1_modules')
-rw-r--r--pyasn1_modules/rfc3565.py36
-rw-r--r--pyasn1_modules/rfc5649.py3
2 files changed, 37 insertions, 2 deletions
diff --git a/pyasn1_modules/rfc3565.py b/pyasn1_modules/rfc3565.py
new file mode 100644
index 0000000..2cac273
--- /dev/null
+++ b/pyasn1_modules/rfc3565.py
@@ -0,0 +1,36 @@
+# 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)
+#
+# ASN.1 source from:
+# https://www.rfc-editor.org/rfc/rfc3565.txt
+
+from pyasn1.type import constraint
+from pyasn1.type import univ
+
+from pyasn1_modules import rfc5280
+
+
+class AlgorithmIdentifier(rfc5280.AlgorithmIdentifier):
+ pass
+
+
+class AES_IV(univ.OctetString):
+ pass
+
+
+AES_IV.subtypeSpec = constraint.ValueSizeConstraint(16, 16)
+
+id_aes128_CBC = univ.ObjectIdentifier('2.16.840.1.101.3.4.1.2')
+
+id_aes192_CBC = univ.ObjectIdentifier('2.16.840.1.101.3.4.1.22')
+
+id_aes256_CBC = univ.ObjectIdentifier('2.16.840.1.101.3.4.1.42')
+
+id_aes128_wrap = univ.ObjectIdentifier('2.16.840.1.101.3.4.1.5')
+
+id_aes192_wrap = univ.ObjectIdentifier('2.16.840.1.101.3.4.1.25')
+
+id_aes256_wrap = univ.ObjectIdentifier('2.16.840.1.101.3.4.1.45')
diff --git a/pyasn1_modules/rfc5649.py b/pyasn1_modules/rfc5649.py
index 292bf1e..84809ee 100644
--- a/pyasn1_modules/rfc5649.py
+++ b/pyasn1_modules/rfc5649.py
@@ -10,8 +10,7 @@
# ASN.1 source from:
# https://www.rfc-editor.org/rfc/rfc5649.txt
-
-from pyasn1.type import univ, constraint
+from pyasn1.type import univ
from pyasn1_modules import rfc5280