Revert r1.57 and r1.58 per Will Rowe's veto.

(I intend to add this back in if/when mod_authn_file can support the
{algo} password semantics, but we can't do a release with this code in
place.)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96817 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 22344d10a40c8ccf4f621483d133768e0cd0a205..352974ef1f85ef198b6aec2ca384d12a0cc5f6f0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -22,9 +22,6 @@ Changes with Apache 2.0.41
 
   *) Fix memory leak in core_output_filter.  [Justin Erenkrantz]
 
-  *) Add ability to htpasswd (via -5) to produce non-obfuscated MD5 hashes.
-     [Justin Erenkrantz]
-
   *) Rewrite of aaa modules to an authn/authz model.
      [Dirk-Willem van Gulik, Justin Erenkrantz]
   

diff --git a/support/htpasswd.c b/support/htpasswd.c
index 986407870554385657acce7358c07a81104ec84c..34e6219cfd2a1e30494928ff40f2e61e1eb390f9 100644 (file)
--- a/support/htpasswd.c
+++ b/support/htpasswd.c
@@ -126,7 +126,6 @@
 #define ALG_CRYPT 1
 #define ALG_APMD5 2
 #define ALG_APSHA 3 
-#define ALG_APMD5_TRUE 4
 
 #define ERR_FILEPERM 1
 #define ERR_SYNTAX 2
@@ -207,23 +206,6 @@ static int mkrecord(char *user, char *record, apr_size_t rlen, char *passwd,
         apr_md5_encode((const char *)pw, (const char *)salt,
                      cpw, sizeof(cpw));
         break;
-    case ALG_APMD5_TRUE:
-    {
-        const char *hex = "0123456789abcdef";
-        unsigned char hash[MD5_DIGESTSIZE];
-        char *r;
-        int i;
-
-        /* Take the MD5 hash of the string argument.  */
-        apr_md5(hash, (const unsigned char*)pw, strlen(pw));
-
-        for (i = 0, r = cpw; i < MD5_DIGESTSIZE; i++) {
-            *r++ = hex[hash[i] >> 4];
-            *r++ = hex[hash[i] & 0xF];
-        }
-        *r = '\0';
-        break;
-    }
 
     case ALG_PLAIN:
         /* XXX this len limitation is not in sync with any HTTPd len. */
@@ -274,8 +256,6 @@ static void usage(void)
         " (default)"
 #endif
         ".\n");
-    apr_file_printf(errfile, " -5  Force true MD5 encryption of the "
-                             "password.\n");
     apr_file_printf(errfile, " -d  Force CRYPT encryption of the password"
 #if (!(defined(WIN32) || defined(TPF) || defined(NETWARE)))
             " (default)"
@@ -364,9 +344,6 @@ static void check_args(apr_pool_t *pool, int argc, const char *const argv[],
             else if (*arg == 'm') {
                 *alg = ALG_APMD5;
             }
-            else if (*arg == '5') {
-                *alg = ALG_APMD5_TRUE;
-            }
             else if (*arg == 's') {
                 *alg = ALG_APSHA;
             }