Skip to content
Snippets Groups Projects
Commit b3766d9f authored by Dave Cramer's avatar Dave Cramer
Browse files

applied patch to fix encoding bug supplied by Jun Kawai

parent 369e2b6a
Branches
Tags
No related merge requests found
...@@ -4,7 +4,7 @@ package org.postgresql.util; ...@@ -4,7 +4,7 @@ package org.postgresql.util;
* MD5-based utility function to obfuscate passwords before network transmission * MD5-based utility function to obfuscate passwords before network transmission
* *
* @author Jeremy Wohl * @author Jeremy Wohl
* $Id: MD5Digest.java,v 1.3 2001/11/25 23:26:59 barry Exp $ * $Id: MD5Digest.java,v 1.4 2002/08/16 19:35:46 davec Exp $
*/ */
import java.security.*; import java.security.*;
...@@ -21,11 +21,11 @@ public class MD5Digest ...@@ -21,11 +21,11 @@ public class MD5Digest
* *
* @param user The connecting user. * @param user The connecting user.
* @param password The connecting user's password. * @param password The connecting user's password.
* @param salt A four-character string sent by the server. * @param salt A four-salt sent by the server.
* *
* @return A 35-byte array, comprising the string "md5" and an MD5 digest. * @return A 35-byte array, comprising the string "md5" and an MD5 digest.
*/ */
public static byte[] encode(String user, String password, String salt) public static byte[] encode(String user, String password, byte []salt)
{ {
MessageDigest md; MessageDigest md;
byte[] temp_digest, pass_digest; byte[] temp_digest, pass_digest;
...@@ -41,7 +41,7 @@ public class MD5Digest ...@@ -41,7 +41,7 @@ public class MD5Digest
bytesToHex(temp_digest, hex_digest, 0); bytesToHex(temp_digest, hex_digest, 0);
md.update(hex_digest, 0, 32); md.update(hex_digest, 0, 32);
md.update(salt.getBytes()); md.update(salt);
pass_digest = md.digest(); pass_digest = md.digest();
bytesToHex(pass_digest, hex_digest, 3); bytesToHex(pass_digest, hex_digest, 3);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment