diff options
| author | Mohammed Attia <skeuomorf@gmail.com> | 2014-03-03 21:08:47 +0200 |
|---|---|---|
| committer | Mohammed Attia <skeuomorf@gmail.com> | 2014-03-03 21:08:47 +0200 |
| commit | fb0b5c8924f0546df3862be9f6d39f5cc195b9d9 (patch) | |
| tree | 4e973989e16ed0473d0191f7998e74bf84bdea29 /docs | |
| parent | 61b47b989dc87cdc760c9d297fd45f219b64efd1 (diff) | |
| parent | c898e8d1328e6c0c65c13923a9581f7b41911ae3 (diff) | |
| download | cryptography-fb0b5c8924f0546df3862be9f6d39f5cc195b9d9.tar.gz cryptography-fb0b5c8924f0546df3862be9f6d39f5cc195b9d9.tar.bz2 cryptography-fb0b5c8924f0546df3862be9f6d39f5cc195b9d9.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/hazmat/primitives/twofactor.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/hazmat/primitives/twofactor.rst b/docs/hazmat/primitives/twofactor.rst index 0e781439..3912d483 100644 --- a/docs/hazmat/primitives/twofactor.rst +++ b/docs/hazmat/primitives/twofactor.rst @@ -50,7 +50,8 @@ codes (HMAC). :raises TypeError: This is raised if the provided ``algorithm`` is not :class:`~cryptography.hazmat.primitives.hashes.SHA1()`, :class:`~cryptography.hazmat.primitives.hashes.SHA256()` or - :class:`~cryptography.hazmat.primitives.hashes.SHA512()`. + :class:`~cryptography.hazmat.primitives.hashes.SHA512()` or if the + ``length`` parameter is not an integer. .. method:: generate(counter) @@ -145,7 +146,8 @@ similar to the following code. :raises TypeError: This is raised if the provided ``algorithm`` is not :class:`~cryptography.hazmat.primitives.hashes.SHA1()`, :class:`~cryptography.hazmat.primitives.hashes.SHA256()` or - :class:`~cryptography.hazmat.primitives.hashes.SHA512()`. + :class:`~cryptography.hazmat.primitives.hashes.SHA512()` or if the + ``length`` parameter is not an integer. .. method:: generate(time) |