diff options
| author | Eli Collins <elic@assurancetechnologies.com> | 2017-01-30 21:24:25 -0500 |
|---|---|---|
| committer | Eli Collins <elic@assurancetechnologies.com> | 2017-01-30 21:24:25 -0500 |
| commit | 39b8e96a1ff27462dcf8ed90d8747b31abc7b53f (patch) | |
| tree | 417abf683d07e39e1d945500df910f7e792ad407 | |
| parent | 724af9c14f7ccee0e2f09d06600b244d79931cdf (diff) | |
| download | passlib-39b8e96a1ff27462dcf8ed90d8747b31abc7b53f.tar.gz | |
passlib.apache: updated internal comments
| -rw-r--r-- | docs/lib/passlib.apache.rst | 2 | ||||
| -rw-r--r-- | passlib/apache.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/lib/passlib.apache.rst b/docs/lib/passlib.apache.rst index 6274159..b87eb63 100644 --- a/docs/lib/passlib.apache.rst +++ b/docs/lib/passlib.apache.rst @@ -16,7 +16,7 @@ htpasswd and htdigest files; though the use of two helper classes. .. versionchanged:: 1.7 - These classes will now preserve blank lines & "#" comments when updating + These classes will now preserve blank lines and "#" comments when updating htpasswd files; previous releases would throw a parse error. .. index:: Apache; htpasswd diff --git a/passlib/apache.py b/passlib/apache.py index af1fb8b..04a64d0 100644 --- a/passlib/apache.py +++ b/passlib/apache.py @@ -482,8 +482,8 @@ def _init_htpasswd_context(): # (https://bz.apache.org/bugzilla/show_bug.cgi?id=49288) "bcrypt", - # not supported by apache (unless natively), but useful for editing htpasswd under - # windows and then deploying under unix. + # support not "builtin" to apache, instead it requires support through host's crypt(). + # adding them here to allow editing htpasswd under windows and then deploying under unix. "sha256_crypt", "sha512_crypt", "des_crypt", @@ -499,8 +499,8 @@ def _init_htpasswd_context(): ] # apache can verify anything supported by the native crypt(), - # though htpasswd can only generate des_crypt hashes. - # (may overlap w/ builtin apache schemes) + # though htpasswd tool can only generate a limited set of hashes. + # (this list may overlap w/ builtin apache schemes) schemes.extend(registry.get_supported_os_crypt_schemes()) # hack to remove dups and sort into preferred order |