more work on proxy digest auth

core/java/src/net/i2p/data/DataHelper.java

@@ -361,12 +361,21 @@ public class DataHelper {
             throw new RuntimeException("IO error writing to memory?! " + ioe.getMessage());
         }
     }
-    
+
     /**
      * Pretty print the mapping, unsorted
      * (unless the options param is an OrderedProperties)
      */
     public static String toString(Properties options) {
+        return toString((Map) options);
+    }
+
+    /**
+     * Pretty print the mapping, unsorted
+     * (unless the options param is an OrderedProperties)
+     * @since 0.9.4
+     */
+    public static String toString(Map<?, ?> options) {
         StringBuilder buf = new StringBuilder();
         if (options != null) {
             for (Map.Entry entry : options.entrySet()) {
@@ -502,7 +511,7 @@ public class DataHelper {
     }
 
     /**
-     *  Hex with leading zeros.
+     *  Lower-case hex with leading zeros.
      *  Use toHexString(byte[]) to not get leading zeros
      *  @param buf may be null (returns "")
      *  @return String of length 2*buf.length
@@ -516,7 +525,7 @@ public class DataHelper {
     private static final byte[] EMPTY_BUFFER = "".getBytes();
     
     /**
-     *  Hex with leading zeros.
+     *  Lower-case hex with leading zeros.
      *  Use toHexString(byte[]) to not get leading zeros
      *  @param buf may be null
      *  @param len number of bytes. If greater than buf.length, additional zeros will be prepended
@@ -546,7 +555,7 @@ public class DataHelper {
     }
 
     /**
-     *  Hex without leading zeros.
+     *  Lower-case hex without leading zeros.
      *  Use toString(byte[] to get leading zeros
      *  @param data may be null (returns "00")
      */

core/java/src/net/i2p/util/PasswordManager.java

@@ -161,6 +161,18 @@ public class PasswordManager {
      */
     public static String md5Hex(String subrealm, String user, String pw) {
         String fullpw = user + ':' + subrealm + ':' + pw;
+        return md5Hex(fullpw);
+    }
+
+    /**
+     *  Straight MD5, no salt
+     *  Will return the MD5 sum of the data, compatible with Jetty
+     *  and RFC 2617.
+     *
+     *  @param fullpw non-null, plain text, already trimmed
+     *  @return lower-case hex with leading zeros, 32 chars, or null on error
+     */
+    public static String md5Hex(String fullpw) {
         try {
             byte[] data = fullpw.getBytes("ISO-8859-1");
             byte[] sum = md5Sum(data);