diff options
| author | Alex Stapleton <alexs@prol.etari.at> | 2014-07-08 15:32:35 +0100 |
|---|---|---|
| committer | Alex Stapleton <alexs@prol.etari.at> | 2014-07-08 15:32:35 +0100 |
| commit | ab8d3eb82b9faaf1d3a2792cf4a10cc054b86165 (patch) | |
| tree | 817657e96f2fb7e7a90239af1682c9914623822d /docs/hazmat | |
| parent | e5ac40c01af9a5e326217a4231fc917f05154889 (diff) | |
| parent | 1658f948a5641d27a50f09dbd7b1cbf44408c34e (diff) | |
| download | cryptography-ab8d3eb82b9faaf1d3a2792cf4a10cc054b86165.tar.gz cryptography-ab8d3eb82b9faaf1d3a2792cf4a10cc054b86165.tar.bz2 cryptography-ab8d3eb82b9faaf1d3a2792cf4a10cc054b86165.zip | |
Merge pull request #1225 from alex/deprecation
Advanced and remove the deprecated MGF1 sale length code
Diffstat (limited to 'docs/hazmat')
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/padding.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/hazmat/primitives/asymmetric/padding.rst b/docs/hazmat/primitives/asymmetric/padding.rst index 40084799..00c77590 100644 --- a/docs/hazmat/primitives/asymmetric/padding.rst +++ b/docs/hazmat/primitives/asymmetric/padding.rst @@ -63,8 +63,8 @@ Mask generation functions .. versionadded:: 0.3 - .. versionchanged:: 0.4 - Deprecated the ``salt_length`` parameter. + .. versionchanged:: 0.6 + Removed the deprecated ``salt_length`` parameter. MGF1 (Mask Generation Function 1) is used as the mask generation function in :class:`PSS` padding. It takes a hash algorithm and a salt length. |