diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-01-29 22:53:21 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-01-29 22:53:21 -0600 |
| commit | 8207318116eba08b45d3abe85451383a2461b099 (patch) | |
| tree | af0d53b017f758b1557aa4dd53e2e9e365e94021 | |
| parent | a63879cddd5590542fe54844691c78d93b46f6a8 (diff) | |
| parent | e783fabd175dbdeac734cf537ec2b6b9a9d67cee (diff) | |
| download | cryptography-8207318116eba08b45d3abe85451383a2461b099.tar.gz cryptography-8207318116eba08b45d3abe85451383a2461b099.tar.bz2 cryptography-8207318116eba08b45d3abe85451383a2461b099.zip | |
Merge pull request #2696 from queenp/OAEP-doctweak
Minor doc tweak per issue #2694
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/rsa.rst | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/hazmat/primitives/asymmetric/rsa.rst b/docs/hazmat/primitives/asymmetric/rsa.rst index bc2402de..1e18915c 100644 --- a/docs/hazmat/primitives/asymmetric/rsa.rst +++ b/docs/hazmat/primitives/asymmetric/rsa.rst @@ -271,7 +271,7 @@ Padding Pass this attribute to ``salt_length`` to get the maximum salt length available. -.. class:: OAEP(mgf, label) +.. class:: OAEP(mgf, algorithm, label) .. versionadded:: 0.4 @@ -283,6 +283,10 @@ Padding :param mgf: A mask generation function object. At this time the only supported MGF is :class:`MGF1`. + :param algorithm: An instance of a + :class:`~cryptography.hazmat.primitives.hashes.HashAlgorithm` + provider. + :param bytes label: A label to apply. This is a rarely used field and should typically be set to ``None`` or ``b""``, which are equivalent. |