1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't try to turn the random bytes from a md5 salt into a String

Browse Source 
because it may not be a valid String depending on the encoding.

Per report from Nadeem Bitar.
This commit is contained in:
Kris Jurka 2004-02-10 01:58:48 +00:00
parent 2194ed88de
commit 24bd490369
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
View File

@ -9,7 +9,7 @@
* Copyright (c) 2003, PostgreSQL Global Development Group * Copyright (c) 2003, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v 1.27.2.1 2003/12/18 03:29:12 davec Exp $ * $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v 1.27.2.2 2004/02/10 01:58:48 jurka Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -349,9 +349,13 @@ public abstract class AbstractJdbc1Connection implements BaseConnection
md5Salt[1] = (byte)pgStream.ReceiveChar(); md5Salt[1] = (byte)pgStream.ReceiveChar();
md5Salt[2] = (byte)pgStream.ReceiveChar(); md5Salt[2] = (byte)pgStream.ReceiveChar();
md5Salt[3] = (byte)pgStream.ReceiveChar(); md5Salt[3] = (byte)pgStream.ReceiveChar();
salt = new String(md5Salt, 0, 4); if (Driver.logDebug) {
if (Driver.logDebug) String md5SaltString = "";
Driver.debug("MD5 salt=" + salt); for (int i=0; i<md5Salt.length; i++) {
md5SaltString += " " + md5Salt[i];
}
Driver.debug("MD5 salt=" + md5SaltString);
}
} }
// now send the auth packet // now send the auth packet
@ -631,9 +635,13 @@ public abstract class AbstractJdbc1Connection implements BaseConnection
md5Salt[1] = (byte)pgStream.ReceiveChar(); md5Salt[1] = (byte)pgStream.ReceiveChar();
md5Salt[2] = (byte)pgStream.ReceiveChar(); md5Salt[2] = (byte)pgStream.ReceiveChar();
md5Salt[3] = (byte)pgStream.ReceiveChar(); md5Salt[3] = (byte)pgStream.ReceiveChar();
salt = new String(md5Salt, 0, 4); if (Driver.logDebug) {
if (Driver.logDebug) String md5SaltString = "";
Driver.debug("MD5 salt=" + salt); for (int i=0; i<md5Salt.length; i++) {
md5SaltString += " " + md5Salt[i];
}
Driver.debug("MD5 salt=" + md5SaltString);
}
} }
// now send the auth packet // now send the auth packet