diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-05-15 14:43:00 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-05-15 14:43:00 -0400 |
| commit | d1c0fb8bbe0984d54ba0f4b7a8861bca0e446e19 (patch) | |
| tree | 908e336dcd1ef61c773e366f390c0dfb563580bf /docs/hazmat | |
| parent | a6112133d6797313ea8fe741daf25178b2abe25c (diff) | |
| parent | af075f0e1e80d5ceb55f20dc95a305a741678469 (diff) | |
| download | cryptography-d1c0fb8bbe0984d54ba0f4b7a8861bca0e446e19.tar.gz cryptography-d1c0fb8bbe0984d54ba0f4b7a8861bca0e446e19.tar.bz2 cryptography-d1c0fb8bbe0984d54ba0f4b7a8861bca0e446e19.zip | |
Merge pull request #1042 from alex/improve-docs
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.rst | 10 |
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..234a5c66 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` |