aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2018-11-11 23:07:54 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2018-11-11 23:07:54 -0500
commita30013b4dc53729ca48abee682106a2ed27819a5 (patch)
tree2af8ee9e02015d274cdc04b44b967bc4c9f7f1a9
parent6654329097ad35e451453f14391c04e44c1d060e (diff)
downloadcryptography-a30013b4dc53729ca48abee682106a2ed27819a5.tar.gz
cryptography-a30013b4dc53729ca48abee682106a2ed27819a5.tar.bz2
cryptography-a30013b4dc53729ca48abee682106a2ed27819a5.zip
add a few more EC OIDs (#4572)
* add a few more EC OIDs * spaces matter
-rw-r--r--docs/hazmat/primitives/asymmetric/ec.rst78
-rw-r--r--src/cryptography/hazmat/primitives/asymmetric/ec.py13
2 files changed, 91 insertions, 0 deletions
diff --git a/docs/hazmat/primitives/asymmetric/ec.rst b/docs/hazmat/primitives/asymmetric/ec.rst
index 08a4999b..5936cf44 100644
--- a/docs/hazmat/primitives/asymmetric/ec.rst
+++ b/docs/hazmat/primitives/asymmetric/ec.rst
@@ -808,6 +808,84 @@ Elliptic Curve Object Identifiers
Corresponds to the dotted string ``"1.3.132.0.35"``.
+ .. attribute:: BRAINPOOLP256R1
+
+ .. versionadded:: 2.5
+
+ Corresponds to the dotted string ``"1.3.36.3.3.2.8.1.1.7"``.
+
+ .. attribute:: BRAINPOOLP384R1
+
+ .. versionadded:: 2.5
+
+ Corresponds to the dotted string ``"1.3.36.3.3.2.8.1.1.11"``.
+
+ .. attribute:: BRAINPOOLP512R1
+
+ .. versionadded:: 2.5
+
+ Corresponds to the dotted string ``"1.3.36.3.3.2.8.1.1.13"``.
+
+ .. attribute:: SECT163K1
+
+ .. versionadded:: 2.5
+
+ Corresponds to the dotted string ``"1.3.132.0.1"``.
+
+ .. attribute:: SECT163R2
+
+ .. versionadded:: 2.5
+
+ Corresponds to the dotted string ``"1.3.132.0.15"``.
+
+ .. attribute:: SECT233K1
+
+ .. versionadded:: 2.5
+
+ Corresponds to the dotted string ``"1.3.132.0.26"``.
+
+ .. attribute:: SECT233R1
+
+ .. versionadded:: 2.5
+
+ Corresponds to the dotted string ``"1.3.132.0.27"``.
+
+ .. attribute:: SECT283K1
+
+ .. versionadded:: 2.5
+
+ Corresponds to the dotted string ``"1.3.132.0.16"``.
+
+ .. attribute:: SECT283R1
+
+ .. versionadded:: 2.5
+
+ Corresponds to the dotted string ``"1.3.132.0.17"``.
+
+ .. attribute:: SECT409K1
+
+ .. versionadded:: 2.5
+
+ Corresponds to the dotted string ``"1.3.132.0.36"``.
+
+ .. attribute:: SECT409R1
+
+ .. versionadded:: 2.5
+
+ Corresponds to the dotted string ``"1.3.132.0.37"``.
+
+ .. attribute:: SECT571K1
+
+ .. versionadded:: 2.5
+
+ Corresponds to the dotted string ``"1.3.132.0.38"``.
+
+ .. attribute:: SECT571R1
+
+ .. versionadded:: 2.5
+
+ Corresponds to the dotted string ``"1.3.132.0.39"``.
+
.. _`FIPS 186-3`: https://csrc.nist.gov/csrc/media/publications/fips/186/3/archive/2009-06-25/documents/fips_186-3.pdf
.. _`FIPS 186-4`: https://csrc.nist.gov/publications/detail/fips/186/4/final
diff --git a/src/cryptography/hazmat/primitives/asymmetric/ec.py b/src/cryptography/hazmat/primitives/asymmetric/ec.py
index 431ecb79..1d709d33 100644
--- a/src/cryptography/hazmat/primitives/asymmetric/ec.py
+++ b/src/cryptography/hazmat/primitives/asymmetric/ec.py
@@ -19,6 +19,19 @@ class EllipticCurveOID(object):
SECP256R1 = ObjectIdentifier("1.2.840.10045.3.1.7")
SECP384R1 = ObjectIdentifier("1.3.132.0.34")
SECP521R1 = ObjectIdentifier("1.3.132.0.35")
+ BRAINPOOLP256R1 = ObjectIdentifier("1.3.36.3.3.2.8.1.1.7")
+ BRAINPOOLP384R1 = ObjectIdentifier("1.3.36.3.3.2.8.1.1.11")
+ BRAINPOOLP512R1 = ObjectIdentifier("1.3.36.3.3.2.8.1.1.13")
+ SECT163K1 = ObjectIdentifier("1.3.132.0.1")
+ SECT163R2 = ObjectIdentifier("1.3.132.0.15")
+ SECT233K1 = ObjectIdentifier("1.3.132.0.26")
+ SECT233R1 = ObjectIdentifier("1.3.132.0.27")
+ SECT283K1 = ObjectIdentifier("1.3.132.0.16")
+ SECT283R1 = ObjectIdentifier("1.3.132.0.17")
+ SECT409K1 = ObjectIdentifier("1.3.132.0.36")
+ SECT409R1 = ObjectIdentifier("1.3.132.0.37")
+ SECT571K1 = ObjectIdentifier("1.3.132.0.38")
+ SECT571R1 = ObjectIdentifier("1.3.132.0.39")
@six.add_metaclass(abc.ABCMeta)