aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-05-15 13:42:41 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2014-05-15 13:42:41 -0400
commitaabc5a1386a75239418981742e85cd235f7d4a53 (patch)
tree212586a0cb5fef8a9bd58e429e36b43f1a238cf5 /docs/hazmat
parenta6112133d6797313ea8fe741daf25178b2abe25c (diff)
downloadcryptography-aabc5a1386a75239418981742e85cd235f7d4a53.tar.gz
cryptography-aabc5a1386a75239418981742e85cd235f7d4a53.tar.bz2
cryptography-aabc5a1386a75239418981742e85cd235f7d4a53.zip
Fixed #1039 -- provide links to PSS and PKCS1v15 in the RSA docs
Diffstat (limited to 'docs/hazmat')
-rw-r--r--docs/hazmat/primitives/asymmetric/rsa.rst10
1 files changed, 8 insertions, 2 deletions
diff --git a/docs/hazmat/primitives/asymmetric/rsa.rst b/docs/hazmat/primitives/asymmetric/rsa.rst
index 7bae7142..0f7e4093 100644
--- a/docs/hazmat/primitives/asymmetric/rsa.rst
+++ b/docs/hazmat/primitives/asymmetric/rsa.rst
@@ -85,7 +85,10 @@ RSA
:param padding: An instance of a
:class:`~cryptography.hazmat.primitives.interfaces.AsymmetricPadding`
- provider.
+ provider. Valid values are
+ :class:~cryptography.hazmat.primitives.asymmetric.padding.PSS` and
+ :class:~cryptography.hazmat.primitives.asymmetric.padding.PKCS1v15`
+ (``PSS`` is recommended for all new applications).
:param algorithm: An instance of a
:class:`~cryptography.hazmat.primitives.interfaces.HashAlgorithm`
@@ -254,7 +257,10 @@ RSA
:param padding: An instance of a
:class:`~cryptography.hazmat.primitives.interfaces.AsymmetricPadding`
- provider.
+ provider. Valid values are
+ :class:~cryptography.hazmat.primitives.asymmetric.padding.PSS` and
+ :class:~cryptography.hazmat.primitives.asymmetric.padding.PKCS1v15`
+ (``PSS`` is recommended for all new applications).
:param algorithm: An instance of a
:class:`~cryptography.hazmat.primitives.interfaces.HashAlgorithm`