From 15a1b59e9c4bb8f5e450cb619d5885b948b10aee Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 4 Jul 2015 12:46:50 -0500 Subject: move PublicKeyWithSerialization methods to PublicKey --- docs/hazmat/primitives/asymmetric/dsa.rst | 14 +++++++------- docs/hazmat/primitives/asymmetric/ec.rst | 14 +++++++------- docs/hazmat/primitives/asymmetric/rsa.rst | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) (limited to 'docs/hazmat/primitives/asymmetric') diff --git a/docs/hazmat/primitives/asymmetric/dsa.rst b/docs/hazmat/primitives/asymmetric/dsa.rst index e16974d5..d60fd882 100644 --- a/docs/hazmat/primitives/asymmetric/dsa.rst +++ b/docs/hazmat/primitives/asymmetric/dsa.rst @@ -367,13 +367,6 @@ Key interfaces :returns: :class:`~cryptography.hazmat.primitives.asymmetric.AsymmetricVerificationContext` - -.. class:: DSAPublicKeyWithSerialization - - .. versionadded:: 0.8 - - Extends :class:`DSAPublicKey`. - .. method:: public_numbers() Create a @@ -402,6 +395,13 @@ Key interfaces :return bytes: Serialized key. +.. class:: DSAPublicKeyWithSerialization + + .. versionadded:: 0.8 + + Alias of :class:`DSAPublicKey`. + + .. _`DSA`: https://en.wikipedia.org/wiki/Digital_Signature_Algorithm .. _`public-key`: https://en.wikipedia.org/wiki/Public-key_cryptography .. _`FIPS 186-4`: http://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-4.pdf diff --git a/docs/hazmat/primitives/asymmetric/ec.rst b/docs/hazmat/primitives/asymmetric/ec.rst index daec5df3..4569f6d4 100644 --- a/docs/hazmat/primitives/asymmetric/ec.rst +++ b/docs/hazmat/primitives/asymmetric/ec.rst @@ -386,13 +386,6 @@ Key Interfaces The elliptic curve for this key. - -.. class:: EllipticCurvePublicKeyWithSerialization - - .. versionadded:: 0.6 - - Extends :class:`EllipticCurvePublicKey`. - .. method:: public_numbers() Create a :class:`EllipticCurvePublicNumbers` object. @@ -417,6 +410,13 @@ Key Interfaces :return bytes: Serialized key. +.. class:: EllipticCurvePublicKeyWithSerialization + + .. versionadded:: 0.6 + + Alias of :class:`EllipticCurvePublicKey`. + + .. _`FIPS 186-3`: http://csrc.nist.gov/publications/fips/fips186-3/fips_186-3.pdf .. _`FIPS 186-4`: http://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-4.pdf .. _`some concern`: https://crypto.stackexchange.com/questions/10263/should-we-trust-the-nist-recommended-ecc-parameters diff --git a/docs/hazmat/primitives/asymmetric/rsa.rst b/docs/hazmat/primitives/asymmetric/rsa.rst index 8689bad3..ed7f66b2 100644 --- a/docs/hazmat/primitives/asymmetric/rsa.rst +++ b/docs/hazmat/primitives/asymmetric/rsa.rst @@ -608,13 +608,6 @@ Key interfaces The bit length of the modulus. - -.. class:: RSAPublicKeyWithSerialization - - .. versionadded:: 0.8 - - Extends :class:`RSAPublicKey`. - .. method:: public_numbers() Create a @@ -645,6 +638,13 @@ Key interfaces :return bytes: Serialized key. +.. class:: RSAPublicKeyWithSerialization + + .. versionadded:: 0.8 + + Alias of :class:`RSAPublicKey`. + + .. _`RSA`: https://en.wikipedia.org/wiki/RSA_(cryptosystem) .. _`public-key`: https://en.wikipedia.org/wiki/Public-key_cryptography .. _`specific mathematical properties`: https://en.wikipedia.org/wiki/RSA_(cryptosystem)#Key_generation -- cgit v1.2.3 From 4cfd01d783baead0fbf3916d963ef17030443351 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 4 Jul 2015 12:53:34 -0500 Subject: relink some things --- docs/hazmat/primitives/asymmetric/rsa.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'docs/hazmat/primitives/asymmetric') diff --git a/docs/hazmat/primitives/asymmetric/rsa.rst b/docs/hazmat/primitives/asymmetric/rsa.rst index ed7f66b2..affdaa88 100644 --- a/docs/hazmat/primitives/asymmetric/rsa.rst +++ b/docs/hazmat/primitives/asymmetric/rsa.rst @@ -113,10 +113,8 @@ It is also possible to serialize without encryption using >>> pem.splitlines()[0] '-----BEGIN RSA PRIVATE KEY-----' -Similarly, if your public key implements -:class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPublicKeyWithSerialization` -interface you can use -:meth:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPublicKeyWithSerialization.public_bytes` +For public keys you can use +:meth:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPublicKey.public_bytes` to serialize the key. .. doctest:: -- cgit v1.2.3 From 8ea90ef486632b71736c53083a8d93134c96c2db Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 4 Jul 2015 16:26:58 -0500 Subject: docs changes based on feedback --- docs/hazmat/primitives/asymmetric/dsa.rst | 2 +- docs/hazmat/primitives/asymmetric/ec.rst | 2 +- docs/hazmat/primitives/asymmetric/rsa.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/hazmat/primitives/asymmetric') diff --git a/docs/hazmat/primitives/asymmetric/dsa.rst b/docs/hazmat/primitives/asymmetric/dsa.rst index d60fd882..2ceb7d7d 100644 --- a/docs/hazmat/primitives/asymmetric/dsa.rst +++ b/docs/hazmat/primitives/asymmetric/dsa.rst @@ -399,7 +399,7 @@ Key interfaces .. versionadded:: 0.8 - Alias of :class:`DSAPublicKey`. + Alias for :class:`DSAPublicKey`. .. _`DSA`: https://en.wikipedia.org/wiki/Digital_Signature_Algorithm diff --git a/docs/hazmat/primitives/asymmetric/ec.rst b/docs/hazmat/primitives/asymmetric/ec.rst index 4569f6d4..e0abe0ab 100644 --- a/docs/hazmat/primitives/asymmetric/ec.rst +++ b/docs/hazmat/primitives/asymmetric/ec.rst @@ -414,7 +414,7 @@ Key Interfaces .. versionadded:: 0.6 - Alias of :class:`EllipticCurvePublicKey`. + Alias for :class:`EllipticCurvePublicKey`. .. _`FIPS 186-3`: http://csrc.nist.gov/publications/fips/fips186-3/fips_186-3.pdf diff --git a/docs/hazmat/primitives/asymmetric/rsa.rst b/docs/hazmat/primitives/asymmetric/rsa.rst index affdaa88..e8bbf5ce 100644 --- a/docs/hazmat/primitives/asymmetric/rsa.rst +++ b/docs/hazmat/primitives/asymmetric/rsa.rst @@ -640,7 +640,7 @@ Key interfaces .. versionadded:: 0.8 - Alias of :class:`RSAPublicKey`. + Alias for :class:`RSAPublicKey`. .. _`RSA`: https://en.wikipedia.org/wiki/RSA_(cryptosystem) -- cgit v1.2.3