diff options
| author | Kris Jurka | 2004-02-10 01:58:48 +0000 |
|---|---|---|
| committer | Kris Jurka | 2004-02-10 01:58:48 +0000 |
| commit | 24bd490369e39162d328e7d7172c65081c8c2b92 (patch) | |
| tree | e8c54ca9ac308c3db2a2bc2725eb77fb17aebd6d | |
| parent | 2194ed88de490e303811debd454199ba0fd69558 (diff) | |
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.
| -rw-r--r-- | src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java index 1f6b8e53272..a607eb00dab 100644 --- a/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java +++ b/src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java @@ -9,7 +9,7 @@ * Copyright (c) 2003, PostgreSQL Global Development Group * * 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[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 |