aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-05-14 23:16:53 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-05-14 23:16:53 -0400
commit388f92ab5cfd5c60fcd8712e5889c4ded300959b (patch)
tree4ed919a89157fbf80ef9fbfd7abe56bc58dddd91 /docs/hazmat
parent4e1dd2e0e35ce3880380af2c6fa278de87b0df2f (diff)
parentf9531ada2f09accdb42156bca7917af5266220c6 (diff)
downloadcryptography-388f92ab5cfd5c60fcd8712e5889c4ded300959b.tar.gz
cryptography-388f92ab5cfd5c60fcd8712e5889c4ded300959b.tar.bz2
cryptography-388f92ab5cfd5c60fcd8712e5889c4ded300959b.zip
Merge branch 'master' into macstadium-travis
Diffstat (limited to 'docs/hazmat')
-rw-r--r--docs/hazmat/primitives/asymmetric/ec.rst8
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/hazmat/primitives/asymmetric/ec.rst b/docs/hazmat/primitives/asymmetric/ec.rst
index 6f4afe7d..71f6e6fd 100644
--- a/docs/hazmat/primitives/asymmetric/ec.rst
+++ b/docs/hazmat/primitives/asymmetric/ec.rst
@@ -251,6 +251,14 @@ All named curves are providers of :class:`EllipticCurve`.
SECG curve ``secp192r1``. Also called NIST P-192.
+
+.. class:: SECP256K1
+
+ .. versionadded:: 0.9
+
+ SECG curve ``secp256k1``.
+
+
Key Interfaces
~~~~~~~~~~~~~~