From ece7442a50c016631d912d558add9d07147ddfe4 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Mon, 29 Oct 2018 02:06:02 +0800 Subject: reorder curves to put binary (SECT) curves down at the bottom (#4529) also add a disclaimer that you shouldn't use them --- docs/hazmat/primitives/asymmetric/ec.rst | 107 +++++++++++++++++-------------- 1 file changed, 59 insertions(+), 48 deletions(-) (limited to 'docs/hazmat/primitives/asymmetric') diff --git a/docs/hazmat/primitives/asymmetric/ec.rst b/docs/hazmat/primitives/asymmetric/ec.rst index 7f27b5f3..8d03a093 100644 --- a/docs/hazmat/primitives/asymmetric/ec.rst +++ b/docs/hazmat/primitives/asymmetric/ec.rst @@ -310,138 +310,149 @@ Tanja Lange. All named curves are instances of :class:`EllipticCurve`. -.. class:: SECT571K1 +.. class:: SECP256R1 .. versionadded:: 0.5 - SECG curve ``sect571k1``. Also called NIST K-571. + SECG curve ``secp256r1``. Also called NIST P-256. -.. class:: SECT409K1 +.. class:: SECP384R1 .. versionadded:: 0.5 - SECG curve ``sect409k1``. Also called NIST K-409. + SECG curve ``secp384r1``. Also called NIST P-384. -.. class:: SECT283K1 +.. class:: SECP521R1 .. versionadded:: 0.5 - SECG curve ``sect283k1``. Also called NIST K-283. + SECG curve ``secp521r1``. Also called NIST P-521. -.. class:: SECT233K1 +.. class:: SECP224R1 .. versionadded:: 0.5 - SECG curve ``sect233k1``. Also called NIST K-233. + SECG curve ``secp224r1``. Also called NIST P-224. -.. class:: SECT163K1 +.. class:: SECP192R1 .. versionadded:: 0.5 - SECG curve ``sect163k1``. Also called NIST K-163. + SECG curve ``secp192r1``. Also called NIST P-192. -.. class:: SECT571R1 +.. class:: SECP256K1 - .. versionadded:: 0.5 + .. versionadded:: 0.9 - SECG curve ``sect571r1``. Also called NIST B-571. + SECG curve ``secp256k1``. -.. class:: SECT409R1 +.. class:: BrainpoolP256R1 - .. versionadded:: 0.5 + .. versionadded:: 2.2 - SECG curve ``sect409r1``. Also called NIST B-409. + Brainpool curve specified in :rfc:`5639`. These curves are discouraged + for new systems. +.. class:: BrainpoolP384R1 -.. class:: SECT283R1 + .. versionadded:: 2.2 - .. versionadded:: 0.5 + Brainpool curve specified in :rfc:`5639`. These curves are discouraged + for new systems. - SECG curve ``sect283r1``. Also called NIST B-283. +.. class:: BrainpoolP512R1 + .. versionadded:: 2.2 -.. class:: SECT233R1 + Brainpool curve specified in :rfc:`5639`. These curves are discouraged + for new systems. + +.. class:: SECT571K1 .. versionadded:: 0.5 - SECG curve ``sect233r1``. Also called NIST B-233. + SECG curve ``sect571k1``. Also called NIST K-571. These binary curves are + discouraged for new systems. -.. class:: SECT163R2 +.. class:: SECT409K1 .. versionadded:: 0.5 - SECG curve ``sect163r2``. Also called NIST B-163. + SECG curve ``sect409k1``. Also called NIST K-409. These binary curves are + discouraged for new systems. -.. class:: SECP521R1 +.. class:: SECT283K1 .. versionadded:: 0.5 - SECG curve ``secp521r1``. Also called NIST P-521. + SECG curve ``sect283k1``. Also called NIST K-283. These binary curves are + discouraged for new systems. -.. class:: SECP384R1 +.. class:: SECT233K1 .. versionadded:: 0.5 - SECG curve ``secp384r1``. Also called NIST P-384. + SECG curve ``sect233k1``. Also called NIST K-233. These binary curves are + discouraged for new systems. -.. class:: SECP256R1 +.. class:: SECT163K1 .. versionadded:: 0.5 - SECG curve ``secp256r1``. Also called NIST P-256. + SECG curve ``sect163k1``. Also called NIST K-163. These binary curves are + discouraged for new systems. -.. class:: SECP224R1 +.. class:: SECT571R1 .. versionadded:: 0.5 - SECG curve ``secp224r1``. Also called NIST P-224. + SECG curve ``sect571r1``. Also called NIST B-571. These binary curves are + discouraged for new systems. -.. class:: SECP192R1 +.. class:: SECT409R1 .. versionadded:: 0.5 - SECG curve ``secp192r1``. Also called NIST P-192. + SECG curve ``sect409r1``. Also called NIST B-409. These binary curves are + discouraged for new systems. -.. class:: SECP256K1 +.. class:: SECT283R1 - .. versionadded:: 0.9 + .. versionadded:: 0.5 - SECG curve ``secp256k1``. + SECG curve ``sect283r1``. Also called NIST B-283. These binary curves are + discouraged for new systems. -.. class:: BrainpoolP256R1 +.. class:: SECT233R1 - .. versionadded:: 2.2 + .. versionadded:: 0.5 - Brainpool curve specified in :rfc:`5639`. These curves are discouraged - for new systems. + SECG curve ``sect233r1``. Also called NIST B-233. These binary curves are + discouraged for new systems. -.. class:: BrainpoolP384R1 - .. versionadded:: 2.2 +.. class:: SECT163R2 - Brainpool curve specified in :rfc:`5639`. These curves are discouraged - for new systems. + .. versionadded:: 0.5 -.. class:: BrainpoolP512R1 + SECG curve ``sect163r2``. Also called NIST B-163. These binary curves are + discouraged for new systems. - .. versionadded:: 2.2 - Brainpool curve specified in :rfc:`5639`. These curves are discouraged - for new systems. Key Interfaces -- cgit v1.2.3