diff options
Diffstat (limited to 'docs/manual/misc')
| -rw-r--r-- | docs/manual/misc/password_encryptions.xml | 80 | ||||
| -rw-r--r-- | docs/manual/misc/perf-tuning.xml | 4 | ||||
| -rw-r--r-- | docs/manual/misc/relevant_standards.xml | 4 |
3 files changed, 44 insertions, 44 deletions
diff --git a/docs/manual/misc/password_encryptions.xml b/docs/manual/misc/password_encryptions.xml index 912de895a8..fa6fc4e4ea 100644 --- a/docs/manual/misc/password_encryptions.xml +++ b/docs/manual/misc/password_encryptions.xml @@ -22,31 +22,31 @@ <manualpage metafile="password_encryptions.xml.meta"> <parentdocument href="./">Miscellaneous Documentation</parentdocument> - + <title>Password Formats</title> - + <summary> <p>Notes about the password encryption formats generated and understood by Apache.</p> </summary> - + <section id="basic"><title>Basic Authentication</title> <p>There are four formats that Apache recognizes for basic-authentication passwords. Note that not all formats work on every platform:</p> - + <dl> <dt>PLAIN TEXT (i.e. <em>unencrypted</em>)</dt> <dd>Windows & Netware only.</dd> - + <dt>CRYPT</dt> <dd>Unix only. Uses the traditional Unix <code>crypt(3)</code> function with a randomly-generated 32-bit salt (only 12 bits used) and the first 8 characters of the password.</dd> - + <dt>SHA1</dt> <dd>"{SHA}" + Base64-encoded SHA-1 digest of the password.</dd> - + <dt>MD5</dt> <dd>"$apr1$" + the result of an Apache-specific algorithm using an iterated (1,000 times) MD5 digest of various combinations of a @@ -54,32 +54,32 @@ <a href="http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_md5.c?view=markup">apr_md5.c</a> for the details of the algorithm.</dd> </dl> - + <section><title>Generating values with htpasswd</title> - + <example><title>MD5</title> $ htpasswd -nbm myName myPassword<br /> myName:$apr1$r31.....$HqJZimcKQFAMYayBlzkrA/ </example> - + <example><title>SHA1</title> $ htpasswd -nbs myName myPassword<br /> myName:{SHA}VBPuJHI7uixaa6LQGWx4s+5GKNE= </example> - + <example><title>CRYPT</title> $ htpasswd -nbd myName myPassword<br /> myName:rqXexS6ZhobKA </example> - + </section> - + <section> <title>Generating CRYPT and MD5 values with the OpenSSL command-line program</title> - + <p>OpenSSL knows the Apache-specific MD5 algorithm.</p> - + <example><title>MD5</title> $ openssl passwd -apr1 myPassword<br /> $apr1$qHDFfhPC$nITSVHgYbDAK1Y0acGRnY0 @@ -90,75 +90,75 @@ qQ5vTYO3c8dsU </example> </section> - + <section> <title>Validating CRYPT or MD5 passwords with the OpenSSL command line program</title> <p>The salt for a CRYPT password is the first two characters (converted to a binary value). To validate <code>myPassword</code> against <code>rqXexS6ZhobKA</code></p> - + <example><title>CRYPT</title> $ openssl passwd -crypt -salt rq myPassword<br /> Warning: truncating password to 8 characters<br /> rqXexS6ZhobKA </example> - + <p>Note that using <code>myPasswo</code> instead of <code>myPassword</code> will produce the same result because only the first 8 characters of CRYPT passwords are considered.</p> - + <p>The salt for an MD5 password is between <code>$apr1$</code> and the following <code>$</code> (as a Base64-encoded binary value - max 8 chars). To validate <code>myPassword</code> against <code>$apr1$r31.....$HqJZimcKQFAMYayBlzkrA/</code></p> - + <example><title>MD5</title> $ openssl passwd -apr1 -salt r31..... myPassword<br /> $apr1$r31.....$HqJZimcKQFAMYayBlzkrA/ </example> </section> - + <section><title>Database password fields for mod_dbd</title> <p>The SHA1 variant is probably the most useful format for DBD authentication. Since the SHA1 and Base64 functions are commonly available, other software can populate a database with encrypted passwords that are usable by Apache basic authentication.</p> - + <p>To create Apache SHA1-variant basic-authentication passwords in various languages:</p> - + <example><title>PHP</title> '{SHA}' . base64_encode(sha1($password, TRUE)) </example> - + <example><title>Java</title> "{SHA}" + new sun.misc.BASE64Encoder().encode(java.security.MessageDigest.getInstance("SHA1").digest(password.getBytes())) </example> - + <example><title>ColdFusion</title> "{SHA}" & ToBase64(BinaryDecode(Hash(password, "SHA1"), "Hex")) </example> - + <example><title>Ruby</title> require 'digest/sha1'<br /> require 'base64'<br /> '{SHA}' + Base64.encode64(Digest::SHA1.digest(password)) </example> - + <example><title>C or C++</title> Use the APR function: apr_sha1_base64 </example> - + <example> <title>PostgreSQL (with the contrib/pgcrypto functions installed)</title> '{SHA}'||encode(digest(password,'sha1'),'base64') </example> </section> - + </section> - + <section id="digest"><title>Digest Authentication</title> <p>Apache recognizes one format for digest-authentication passwords - the MD5 hash of the string @@ -166,20 +166,20 @@ digits. <code>realm</code> is the Authorization Realm argument to the <directive module="mod_authn_core">AuthName</directive> directive in httpd.conf.</p> - + <section><title>Database password fields for mod_dbd</title> - + <p>Since the MD5 function is commonly available, other software can populate a database with encrypted passwords that are usable by Apache digest authentication.</p> - + <p>To create Apache digest-authentication passwords in various languages:</p> - + <example><title>PHP</title> md5($user . ':' . $realm . ':' .$password) </example> - + <example><title>Java</title> byte b[] = java.security.MessageDigest.getInstance("MD5").digest( (user + ":" + realm + ":" + password ).getBytes());<br /> java.math.BigInteger bi = new java.math.BigInteger(1, b);<br /> @@ -190,22 +190,22 @@ </indent> // String s is the encrypted password </example> - + <example><title>ColdFusion</title> LCase(Hash( (user & ":" & realm & ":" & password) , "MD5")) </example> - + <example><title>Ruby</title> require 'digest/md5'<br /> Digest::MD5.hexdigest(user + ':' + realm + ':' + password) </example> - + <example> <title>PostgreSQL (with the contrib/pgcrypto functions installed)</title> encode(digest( user || ':' || realm || ':' || password , 'md5'), 'hex') </example> - + </section> </section> - + </manualpage> diff --git a/docs/manual/misc/perf-tuning.xml b/docs/manual/misc/perf-tuning.xml index 32aebeeec8..c9630446cf 100644 --- a/docs/manual/misc/perf-tuning.xml +++ b/docs/manual/misc/perf-tuning.xml @@ -706,9 +706,9 @@ directives.</p> <p>The <directive module="core">Mutex</directive> directive can - be used to change the mutex implementation of the + be used to change the mutex implementation of the <code>mpm-accept</code> mutex at run-time. Special considerations - for different mutex implementations are documented with that + for different mutex implementations are documented with that directive.</p> <p>Another solution that has been considered but never diff --git a/docs/manual/misc/relevant_standards.xml b/docs/manual/misc/relevant_standards.xml index 17903e0673..21dfae1730 100644 --- a/docs/manual/misc/relevant_standards.xml +++ b/docs/manual/misc/relevant_standards.xml @@ -24,7 +24,7 @@ <parentdocument href="./">Miscellaneous Documentation</parentdocument> <title>Relevant Standards</title> - + <summary> <p>This page documents all the relevant standards that the Apache HTTP Server follows, along with brief descriptions.</p> @@ -53,7 +53,7 @@ </note> </summary> - + <section id="http_recommendations"><title>HTTP Recommendations</title> <p>Regardless of what modules are compiled and used, Apache as a |