aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Housley <housley@vigilsec.com>2019-10-24 14:50:08 -0400
committerIlya Etingof <etingof@gmail.com>2019-10-24 20:50:08 +0200
commit13343c7a40a06f20bdf59bbc1ff2b83f6a26db97 (patch)
treeb337cc5ab2bc3e9e61edcdad60ac6faa12adc059
parent03eb527270dea65311ef9a00cd7b351590769263 (diff)
downloadpyasn1-modules-13343c7a40a06f20bdf59bbc1ff2b83f6a26db97.tar.gz
Add support for RFC 6170 (#93)
-rw-r--r--CHANGES.txt2
-rw-r--r--pyasn1_modules/rfc3709.py5
-rw-r--r--pyasn1_modules/rfc6170.py17
3 files changed, 23 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 4d9074d..1bc631f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,8 @@ Revision 0.2.8, released XX-XX-2019
- Updated the handling of maps for use with openType for RFC 3279
- Added RFC6486 providing RPKI Manifests
- Added RFC6487 providing Profile for X.509 PKIX Resource Certificates
+- Added RFC6170 providing Certificate Image in the Internet X.509 Public
+ Key Infrastructure, and import the object identifier into RFC3709.
Revision 0.2.7, released 09-10-2019
-----------------------------------
diff --git a/pyasn1_modules/rfc3709.py b/pyasn1_modules/rfc3709.py
index f26ba33..aa1d5b6 100644
--- a/pyasn1_modules/rfc3709.py
+++ b/pyasn1_modules/rfc3709.py
@@ -21,6 +21,7 @@ from pyasn1.type import tag
from pyasn1.type import univ
from pyasn1_modules import rfc5280
+from pyasn1_modules import rfc6170
MAX = float('inf')
@@ -162,6 +163,8 @@ id_logo_background = univ.ObjectIdentifier('1.3.6.1.5.5.7.20.2')
id_logo_loyalty = univ.ObjectIdentifier('1.3.6.1.5.5.7.20.1')
+id_logo_certImage = rfc6170.id_logo_certImage
+
class OtherLogotypeInfo(univ.Sequence):
pass
@@ -201,4 +204,4 @@ _certificateExtensionsMapUpdate = {
id_pe_logotype: LogotypeExtn(),
}
-rfc5280.certificateExtensionsMap.update(_certificateExtensionsMapUpdate) \ No newline at end of file
+rfc5280.certificateExtensionsMap.update(_certificateExtensionsMapUpdate)
diff --git a/pyasn1_modules/rfc6170.py b/pyasn1_modules/rfc6170.py
new file mode 100644
index 0000000..e287616
--- /dev/null
+++ b/pyasn1_modules/rfc6170.py
@@ -0,0 +1,17 @@
+#
+# This file is part of pyasn1-modules software.
+#
+# Created by Russ Housley.
+#
+# Copyright (c) 2019, Vigil Security, LLC
+# License: http://snmplabs.com/pyasn1/license.html
+#
+# Certificate Image in the Internet X.509 Public Key Infrastructure
+#
+# ASN.1 source from:
+# https://www.rfc-editor.org/rfc/rfc6170.txt
+#
+
+from pyasn1.type import univ
+
+id_logo_certImage = univ.ObjectIdentifier('1.3.6.1.5.5.7.20.3')