postgresql-jdbc.git / summary / log / commit / refs
commit dfa9bb1de805be4d8422504d830c8a3116c808dc
Author: Kris Jurka <books@ejurka.com>
Date: Tue Feb 10 01:56:46 2004 +0000
Don't try to turn the random bytes from a md5 salt into a String
because it may not be a valid String depending on the encoding.
Per report from Nadeem Bitar.
org/postgresql/jdbc1/AbstractJdbc1Connection.java | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/org/postgresql/jdbc1/AbstractJdbc1Connection.java b/org/postgresql/jdbc1/AbstractJdbc1Connection.java
index 623dbc17..3ff42c1d 100644
--- a/org/postgresql/jdbc1/AbstractJdbc1Connection.java
+++ b/org/postgresql/jdbc1/AbstractJdbc1Connection.java
@@ -349,9 +349,13 @@ public abstract class AbstractJdbc1Connection implements BaseConnection
md5Salt[1] = (byte)pgStream.ReceiveChar();
md5Salt[2] = (byte)pgStream.ReceiveChar();
md5Salt[3] = (byte)pgStream.ReceiveChar();
- salt = new String(md5Salt, 0, 4);
- if (Driver.logDebug)
- Driver.debug("MD5 salt=" + salt);
+ if (Driver.logDebug) {
+ String md5SaltString = "";
+ for (int i=0; i<md5Salt.length; i++) {
+ md5SaltString += " " + md5Salt[i];
+ }
+ Driver.debug("MD5 salt=" + md5SaltString);
+ }
}
// now send the auth packet
@@ -631,9 +635,13 @@ public abstract class AbstractJdbc1Connection implements BaseConnection
md5Salt[1] = (byte)pgStream.ReceiveChar();
md5Salt[2] = (byte)pgStream.ReceiveChar();
md5Salt[3] = (byte)pgStream.ReceiveChar();
- salt = new String(md5Salt, 0, 4);
- if (Driver.logDebug)
- Driver.debug("MD5 salt=" + salt);
+ if (Driver.logDebug) {
+ String md5SaltString = "";
+ for (int i=0; i<md5Salt.length; i++) {
+ md5SaltString += " " + md5Salt[i];
+ }
+ Driver.debug("MD5 salt=" + md5SaltString);
+ }
}
// now send the auth packet
[parent: 14b7043d04d4]