From: Eric Covener <covener@apache.org>
Date: Mon, 28 Dec 2015 18:27:27 +0000 (+0000)
Subject: Merge r1721975 from trunk:
X-Git-Tag: 2.4.19~330
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c9227b8eec7864e0f2978a78b22c59989a8899c;p=apache

Merge r1721975 from trunk:

PR58764: python example for sha1 password hashes

Submitted By: Dave Hall <skwashd gmail.com>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1721976 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/misc/password_encryptions.xml b/docs/manual/misc/password_encryptions.xml
index 63df11a8dc..e9acfe60a5 100644
--- a/docs/manual/misc/password_encryptions.xml
+++ b/docs/manual/misc/password_encryptions.xml
@@ -161,6 +161,12 @@
       Use the APR function: apr_sha1_base64
       </example>
 
+      <example><title>Python</title>
+      import base64<br />
+      import hashlib<br />
+      "{SHA}" + format(base64.b64encode(hashlib.sha1(password).digest()))
+      </example>
+
       <example>
         <title>PostgreSQL (with the contrib/pgcrypto functions
                installed)</title>
diff --git a/docs/manual/misc/password_encryptions.xml.fr b/docs/manual/misc/password_encryptions.xml.fr
index 05e54086f5..7667ecb057 100644
--- a/docs/manual/misc/password_encryptions.xml.fr
+++ b/docs/manual/misc/password_encryptions.xml.fr
@@ -174,6 +174,12 @@
       Utilisez la fonction APR : apr_sha1_base64
       </example>
 
+      <example><title>Python</title>
+      import base64<br />
+      import hashlib<br />
+      "{SHA}" + format(base64.b64encode(hashlib.sha1(password).digest()))
+      </example>
+
       <example>
         <title>PostgreSQL (avec les fonctions contrib/pgcrypto
                install&eacute;es)</title>