diff options
| author | Eli Collins <elic@assurancetechnologies.com> | 2011-07-08 16:12:53 -0400 |
|---|---|---|
| committer | Eli Collins <elic@assurancetechnologies.com> | 2011-07-08 16:12:53 -0400 |
| commit | 1cea29b9f5d957aca436031f770f9f27d505ae43 (patch) | |
| tree | ea84595b809fae1b423bb3cb4bc393745ad6c1f8 /docs/lib | |
| parent | 4475fba1e1f6b5fc22283fcf4011c17dcd2f85f8 (diff) | |
| download | passlib-1cea29b9f5d957aca436031f770f9f27d505ae43.tar.gz | |
stripped trailing whitespace from a bunch of files
Diffstat (limited to 'docs/lib')
| -rw-r--r-- | docs/lib/passlib.apps.rst | 6 | ||||
| -rw-r--r-- | docs/lib/passlib.hash.atlassian_pbkdf2_sha1.rst | 2 | ||||
| -rw-r--r-- | docs/lib/passlib.hash.cta_pbkdf2_sha1.rst | 2 | ||||
| -rw-r--r-- | docs/lib/passlib.hash.dlitz_pbkdf2_sha1.rst | 2 | ||||
| -rw-r--r-- | docs/lib/passlib.hash.fshp.rst | 12 | ||||
| -rw-r--r-- | docs/lib/passlib.hash.oracle10.rst | 2 | ||||
| -rw-r--r-- | docs/lib/passlib.utils.handlers.rst | 2 | ||||
| -rw-r--r-- | docs/lib/passlib.utils.pbkdf2.rst | 2 |
8 files changed, 15 insertions, 15 deletions
diff --git a/docs/lib/passlib.apps.rst b/docs/lib/passlib.apps.rst index 1273094..b5da280 100644 --- a/docs/lib/passlib.apps.rst +++ b/docs/lib/passlib.apps.rst @@ -111,7 +111,7 @@ It is found in a wide range of PHP applications, including Drupal and Wordpress. BCrypt is used as the default if support is available, otherwise the Portable Hash will be used as the default. - + .. versionchanged:: 1.5 Now uses Portable Hash as fallback if BCrypt isn't available. Previously used BSDI-Crypt as fallback @@ -163,8 +163,8 @@ The following contexts are available for reading Roundup password hash fields: .. data:: roundup15_context Roundup 1.4.17 adds support for :class:`~passlib.hash.ldap_pbkdf2_sha1` - as it's preferred hash format. - This context supports all the :data:`roundup10_context` hashes, + as it's preferred hash format. + This context supports all the :data:`roundup10_context` hashes, but adds that hash as well (and uses it as the default). .. data:: roundup_context diff --git a/docs/lib/passlib.hash.atlassian_pbkdf2_sha1.rst b/docs/lib/passlib.hash.atlassian_pbkdf2_sha1.rst index d6edadb..a2a0a05 100644 --- a/docs/lib/passlib.hash.atlassian_pbkdf2_sha1.rst +++ b/docs/lib/passlib.hash.atlassian_pbkdf2_sha1.rst @@ -4,7 +4,7 @@ .. index:: pair: atlassian; pbkdf2 hash - + .. currentmodule:: passlib.hash This class provides an implementation of diff --git a/docs/lib/passlib.hash.cta_pbkdf2_sha1.rst b/docs/lib/passlib.hash.cta_pbkdf2_sha1.rst index 2814764..526c408 100644 --- a/docs/lib/passlib.hash.cta_pbkdf2_sha1.rst +++ b/docs/lib/passlib.hash.cta_pbkdf2_sha1.rst @@ -15,7 +15,7 @@ variable length salts, variable number of rounds. :doc:`passlib.hash.pbkdf2_digest <passlib.hash.pbkdf2_digest>` for some other PBKDF2-based hashes. - + :doc:`passlib.hash.dlitz_pbkdf2_sha1 <passlib.hash.dlitz_pbkdf2_sha1>` for another hash which looks almost exactly like this one. diff --git a/docs/lib/passlib.hash.dlitz_pbkdf2_sha1.rst b/docs/lib/passlib.hash.dlitz_pbkdf2_sha1.rst index 9967385..3151b23 100644 --- a/docs/lib/passlib.hash.dlitz_pbkdf2_sha1.rst +++ b/docs/lib/passlib.hash.dlitz_pbkdf2_sha1.rst @@ -15,7 +15,7 @@ variable length salts, variable number of rounds. :doc:`passlib.hash.pbkdf2_digest <passlib.hash.pbkdf2_digest>` for some other PBKDF2-based hashes. - + :doc:`passlib.hash.cta_pbkdf2_sha1 <passlib.hash.cta_pbkdf2_sha1>` for another hash which looks almost exactly like this one. diff --git a/docs/lib/passlib.hash.fshp.rst b/docs/lib/passlib.hash.fshp.rst index 69a8c4e..95f52fb 100644 --- a/docs/lib/passlib.hash.fshp.rst +++ b/docs/lib/passlib.hash.fshp.rst @@ -3,10 +3,10 @@ ========================================================== .. index:: fshp - + .. currentmodule:: passlib.hash -The Fairly Secure Hashed Password (FSHP) scheme [#home]_ +The Fairly Secure Hashed Password (FSHP) scheme [#home]_ is a cross-platform hash based on PBKDF1 [#pbk]_, and uses an LDAP-style hash format. It features a variable length salt, variable rounds, and support for cryptographic hashes from SHA-1 up to SHA-512. @@ -26,7 +26,7 @@ as well as a special digest keyword for selecting the variant of FSHP to use. This class can be used directly as follows:: >>> from passlib.hash import fshp - + >>> #generate new salt, encrypt password >>> h = fshp.encrypt("password") >>> h @@ -72,7 +72,7 @@ A example hash (of ``password``) is: * :samp:`<rounds>` is a decimal integer identifying the number of rounds to apply when calculating the checksum (see below). ``16384`` in the example. - + * :samp:`<data>` is a base64-encoded string which, when decoded, contains a salt string of the specified size, followed by the checksum. In the example, the data portion decodes to @@ -89,7 +89,7 @@ The checksum is calculated using :func:`~passlib.utils.pbkdf2.pbkdf1`, passing in the password, the decoded salt string, the number of rounds, and hash function specified by the variant identifier. FSHP has one quirk in that the password is passed in as the pbkdf1 salt, -and the salt is passed in as the pbkdf1 password. +and the salt is passed in as the pbkdf1 password. Security Issues =============== @@ -97,7 +97,7 @@ Security Issues from what is described in the PBKDF1 standard. This issue is mainly noted in order to dismiss it: while the swap permits an attacker to pre-calculate part of the initial digest, - the impact of this is negligible when a large number of rounds is used. + the impact of this is negligible when a large number of rounds is used. * Since PBKDF1 is based on repeated composition of a hash, it is vulnerable to any first-preimage attacks on the underlying hash. diff --git a/docs/lib/passlib.hash.oracle10.rst b/docs/lib/passlib.hash.oracle10.rst index 832082f..06941ff 100644 --- a/docs/lib/passlib.hash.oracle10.rst +++ b/docs/lib/passlib.hash.oracle10.rst @@ -112,7 +112,7 @@ References PassLib uses ``utf-16-be``, as this is both compatible with existing test vectors and supports unicode input. -.. [#flaws] Whitepaper analyzing flaws in this algorithm - +.. [#flaws] Whitepaper analyzing flaws in this algorithm - `<http://www.isg.rhul.ac.uk/~ccid/publications/oracle_passwd.pdf>`_. .. [#] Description of Oracle10g and Oracle11g algorithms - diff --git a/docs/lib/passlib.utils.handlers.rst b/docs/lib/passlib.utils.handlers.rst index 4670fe7..301448c 100644 --- a/docs/lib/passlib.utils.handlers.rst +++ b/docs/lib/passlib.utils.handlers.rst @@ -103,7 +103,7 @@ Some additional notes: For faster identification purposes, subclasses may fill in the :attr:`~GenericHandler.ident` attribute with the hash's identifying prefix, which :meth:`~GenericHandler.identify` will then test for instead of calling :meth:`~GenericHandler.from_string`. - For more complex situations, a custom implementation should be used; + For more complex situations, a custom implementation should be used; the :class:`HasManyIdents` mixin may also be helpful. * This class does not support context kwds of any type, diff --git a/docs/lib/passlib.utils.pbkdf2.rst b/docs/lib/passlib.utils.pbkdf2.rst index d4fb46e..7e7904d 100644 --- a/docs/lib/passlib.utils.pbkdf2.rst +++ b/docs/lib/passlib.utils.pbkdf2.rst @@ -27,6 +27,6 @@ Helper Functions ================ .. autofunction:: get_prf -.. +.. given how this module is expanding in scope, perhaps it should be renamed "kdf"? |
