Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 14 Sep 2002 23:05:42 -0000
Message-ID: <20020914230542.53442.qmail@icarus.apache.org>
From: jerenkrantz@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/support htpasswd.c

jerenkrantz    2002/09/14 16:05:42

  Modified:    .        CHANGES
               support  htpasswd.c
  Log:
  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.)
  
  Revision  Changes    Path
  1.926     +0 -3      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.925
  retrieving revision 1.926
  diff -u -u -r1.925 -r1.926
  --- CHANGES	14 Sep 2002 04:51:55 -0000	1.925
  +++ CHANGES	14 Sep 2002 23:05:41 -0000	1.926
  @@ -22,9 +22,6 @@
   
     *) 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]
     
  
  
  
  1.65      +0 -23     httpd-2.0/support/htpasswd.c
  
  Index: htpasswd.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/htpasswd.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -u -r1.64 -r1.65
  --- htpasswd.c	14 Sep 2002 17:49:37 -0000	1.64
  +++ htpasswd.c	14 Sep 2002 23:05:42 -0000	1.65
  @@ -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 @@
           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 @@
           " (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)"
  @@ -363,9 +343,6 @@
               }
               else if (*arg == 'm') {
                   *alg = ALG_APMD5;
  -            }
  -            else if (*arg == '5') {
  -                *alg = ALG_APMD5_TRUE;
               }
               else if (*arg == 's') {
                   *alg = ALG_APSHA;