Index: org/postgresql/jdbc1/AbstractJdbc1Connection.java =================================================================== RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Connection.java,v retrieving revision 1.27.2.1 diff -c -r1.27.2.1 AbstractJdbc1Connection.java *** org/postgresql/jdbc1/AbstractJdbc1Connection.java 18 Dec 2003 03:29:12 -0000 1.27.2.1 --- org/postgresql/jdbc1/AbstractJdbc1Connection.java 6 Feb 2004 21:47:07 -0000 *************** *** 336,342 **** byte[] rst = new byte[2]; rst[0] = (byte)pgStream.ReceiveChar(); rst[1] = (byte)pgStream.ReceiveChar(); ! salt = new String(rst, 0, 2); if (Driver.logDebug) Driver.debug("Crypt salt=" + salt); } --- 336,342 ---- byte[] rst = new byte[2]; rst[0] = (byte)pgStream.ReceiveChar(); rst[1] = (byte)pgStream.ReceiveChar(); ! salt = new String(rst, 0, 2, "US-ASCII"); if (Driver.logDebug) Driver.debug("Crypt salt=" + salt); } *************** *** 349,357 **** 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); } // now send the auth packet --- 349,356 ---- md5Salt[1] = (byte)pgStream.ReceiveChar(); md5Salt[2] = (byte)pgStream.ReceiveChar(); md5Salt[3] = (byte)pgStream.ReceiveChar(); if (Driver.logDebug) ! Driver.debug("MD5 salt=" + md5Salt); } // now send the auth packet *************** *** 618,624 **** byte[] rst = new byte[2]; rst[0] = (byte)pgStream.ReceiveChar(); rst[1] = (byte)pgStream.ReceiveChar(); ! salt = new String(rst, 0, 2); if (Driver.logDebug) Driver.debug("Crypt salt=" + salt); } --- 617,623 ---- byte[] rst = new byte[2]; rst[0] = (byte)pgStream.ReceiveChar(); rst[1] = (byte)pgStream.ReceiveChar(); ! salt = new String(rst, 0, 2, "US-ASCII"); if (Driver.logDebug) Driver.debug("Crypt salt=" + salt); } *************** *** 631,639 **** 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); } // now send the auth packet --- 630,637 ---- md5Salt[1] = (byte)pgStream.ReceiveChar(); md5Salt[2] = (byte)pgStream.ReceiveChar(); md5Salt[3] = (byte)pgStream.ReceiveChar(); if (Driver.logDebug) ! Driver.debug("MD5 salt=" + md5Salt); } // now send the auth packet