ChangeLog:
2008-05-05 Andrew John Hughes <[EMAIL PROTECTED]>
PR classpath/21869
* gnu/javax/crypto/assembly/TransformerException.java,
* gnu/javax/crypto/cipher/BaseCipher.java,
* gnu/javax/crypto/jce/sig/DHParameters.java,
* gnu/javax/crypto/key/KeyAgreementException.java,
* gnu/javax/crypto/mode/BaseMode.java,
* gnu/javax/crypto/pad/BasePad.java,
* gnu/javax/crypto/sasl/crammd5/CramMD5Util.java,
* gnu/javax/crypto/sasl/crammd5/PasswordFile.java,
* gnu/javax/crypto/sasl/plain/PasswordFile.java,
* gnu/javax/crypto/sasl/plain/PlainClient.java,
* gnu/javax/crypto/sasl/srp/PasswordFile.java,
* gnu/javax/crypto/sasl/srp/SRPClient.java,
* gnu/javax/crypto/sasl/srp/SRPServer.java,
* gnu/javax/crypto/sasl/srp/ServerStore.java:
Swap use of StringBuffer for CPStringBuilder,
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: gnu/javax/crypto/assembly/TransformerException.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/crypto/assembly/TransformerException.java,v
retrieving revision 1.2
diff -u -r1.2 TransformerException.java
--- gnu/javax/crypto/assembly/TransformerException.java 25 Jun 2006 02:07:44
-0000 1.2
+++ gnu/javax/crypto/assembly/TransformerException.java 5 May 2008 21:25:46
-0000
@@ -38,6 +38,8 @@
package gnu.javax.crypto.assembly;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.PrintStream;
import java.io.PrintWriter;
@@ -129,7 +131,7 @@
*/
public String toString()
{
- StringBuffer sb = new StringBuffer(this.getClass().getName())
+ CPStringBuilder sb = new CPStringBuilder(this.getClass().getName())
.append(": ").append(super.toString());
if (_exception != null)
sb.append("; caused by: ").append(_exception.toString());
Index: gnu/javax/crypto/cipher/BaseCipher.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/cipher/BaseCipher.java,v
retrieving revision 1.5
diff -u -r1.5 BaseCipher.java
--- gnu/javax/crypto/cipher/BaseCipher.java 25 Jun 2006 22:45:26 -0000
1.5
+++ gnu/javax/crypto/cipher/BaseCipher.java 5 May 2008 21:25:46 -0000
@@ -38,6 +38,8 @@
package gnu.javax.crypto.cipher;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.security.Configuration;
import java.security.InvalidKeyException;
@@ -88,7 +90,7 @@
public String name()
{
- StringBuffer sb = new StringBuffer(name).append('-');
+ CPStringBuilder sb = new CPStringBuilder(name).append('-');
if (currentKey == null)
sb.append(String.valueOf(8 * defaultBlockSize));
else
Index: gnu/javax/crypto/jce/sig/DHParameters.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/crypto/jce/sig/DHParameters.java,v
retrieving revision 1.1
diff -u -r1.1 DHParameters.java
--- gnu/javax/crypto/jce/sig/DHParameters.java 23 Feb 2006 12:54:46 -0000
1.1
+++ gnu/javax/crypto/jce/sig/DHParameters.java 5 May 2008 21:25:46 -0000
@@ -38,6 +38,8 @@
package gnu.javax.crypto.jce.sig;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.security.Registry;
import gnu.java.security.der.DER;
import gnu.java.security.der.DERReader;
@@ -195,7 +197,7 @@
protected String engineToString()
{
- StringBuffer sb = new StringBuffer("p=");
+ CPStringBuilder sb = new CPStringBuilder("p=");
if (p == null)
sb.append("???");
else
Index: gnu/javax/crypto/key/KeyAgreementException.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/crypto/key/KeyAgreementException.java,v
retrieving revision 1.2
diff -u -r1.2 KeyAgreementException.java
--- gnu/javax/crypto/key/KeyAgreementException.java 1 Jul 2006 10:00:26
-0000 1.2
+++ gnu/javax/crypto/key/KeyAgreementException.java 5 May 2008 21:25:47
-0000
@@ -38,6 +38,8 @@
package gnu.javax.crypto.key;
+import gnu.java.lang.CPStringBuilder;
+
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.Serializable;
@@ -157,7 +159,7 @@
*/
public String toString()
{
- StringBuffer sb = new StringBuffer(this.getClass().getName()).append(": ")
+ CPStringBuilder sb = new
CPStringBuilder(this.getClass().getName()).append(": ")
.append(super.toString());
if (cause != null)
sb.append("; caused by: ").append(cause.toString());
Index: gnu/javax/crypto/mode/BaseMode.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/mode/BaseMode.java,v
retrieving revision 1.4
diff -u -r1.4 BaseMode.java
--- gnu/javax/crypto/mode/BaseMode.java 2 Jul 2006 01:17:56 -0000 1.4
+++ gnu/javax/crypto/mode/BaseMode.java 5 May 2008 21:25:47 -0000
@@ -38,6 +38,8 @@
package gnu.javax.crypto.mode;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.javax.crypto.cipher.IBlockCipher;
import java.security.InvalidKeyException;
@@ -110,7 +112,7 @@
public String name()
{
- return new StringBuffer(name).append('(').append(cipher.name()).append(')')
+ return new
CPStringBuilder(name).append('(').append(cipher.name()).append(')')
.toString();
}
Index: gnu/javax/crypto/pad/BasePad.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/pad/BasePad.java,v
retrieving revision 1.6
diff -u -r1.6 BasePad.java
--- gnu/javax/crypto/pad/BasePad.java 14 Jul 2006 02:29:28 -0000 1.6
+++ gnu/javax/crypto/pad/BasePad.java 5 May 2008 21:25:47 -0000
@@ -38,6 +38,8 @@
package gnu.javax.crypto.pad;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.security.Configuration;
import java.util.Map;
@@ -67,7 +69,7 @@
public String name()
{
- final StringBuffer sb = new StringBuffer(name);
+ final CPStringBuilder sb = new CPStringBuilder(name);
if (blockSize != -1)
sb.append('-').append(String.valueOf(8 * blockSize));
return sb.toString();
Index: gnu/javax/crypto/sasl/crammd5/CramMD5Util.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/crypto/sasl/crammd5/CramMD5Util.java,v
retrieving revision 1.2
diff -u -r1.2 CramMD5Util.java
--- gnu/javax/crypto/sasl/crammd5/CramMD5Util.java 3 Jul 2006 12:15:38
-0000 1.2
+++ gnu/javax/crypto/sasl/crammd5/CramMD5Util.java 5 May 2008 21:25:47
-0000
@@ -38,6 +38,8 @@
package gnu.javax.crypto.sasl.crammd5;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.security.Registry;
import gnu.java.security.util.Util;
import gnu.javax.crypto.mac.HMacFactory;
@@ -83,7 +85,7 @@
final byte[] result;
try
{
- result = new StringBuffer("<")
+ result = new CPStringBuilder("<")
.append(encoded.substring(0,encoded.length()))
.append(".").append(String.valueOf(System.currentTimeMillis()))
.append("@").append(hostname).append(">")
Index: gnu/javax/crypto/sasl/crammd5/PasswordFile.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/crypto/sasl/crammd5/PasswordFile.java,v
retrieving revision 1.2
diff -u -r1.2 PasswordFile.java
--- gnu/javax/crypto/sasl/crammd5/PasswordFile.java 3 Jul 2006 12:15:38
-0000 1.2
+++ gnu/javax/crypto/sasl/crammd5/PasswordFile.java 5 May 2008 21:25:47
-0000
@@ -38,6 +38,8 @@
package gnu.javax.crypto.sasl.crammd5;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.javax.crypto.sasl.NoSuchUserException;
import gnu.javax.crypto.sasl.UserAlreadyExistsException;
@@ -201,13 +203,13 @@
pw = new PrintWriter(fos);
String key;
String[] fields;
- StringBuffer sb;
+ CPStringBuilder sb;
int i;
for (Iterator it = entries.keySet().iterator(); it.hasNext();)
{
key = (String) it.next();
fields = (String[]) entries.get(key);
- sb = new StringBuffer(fields[0]);
+ sb = new CPStringBuilder(fields[0]);
for (i = 1; i < fields.length; i++)
sb.append(":").append(fields[i]);
pw.println(sb.toString());
Index: gnu/javax/crypto/sasl/plain/PasswordFile.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/crypto/sasl/plain/PasswordFile.java,v
retrieving revision 1.3
diff -u -r1.3 PasswordFile.java
--- gnu/javax/crypto/sasl/plain/PasswordFile.java 11 Jul 2006 16:03:59
-0000 1.3
+++ gnu/javax/crypto/sasl/plain/PasswordFile.java 5 May 2008 21:25:47
-0000
@@ -38,6 +38,8 @@
package gnu.javax.crypto.sasl.plain;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.security.action.GetPropertyAction;
import gnu.javax.crypto.sasl.NoSuchUserException;
import gnu.javax.crypto.sasl.UserAlreadyExistsException;
@@ -205,13 +207,13 @@
pw = new PrintWriter(fos);
String key;
String[] fields;
- StringBuffer sb;
+ CPStringBuilder sb;
Enumeration keys = entries.keys();
while (keys.hasMoreElements())
{
key = (String) keys.nextElement();
fields = (String[]) entries.get(key);
- sb = new StringBuffer(fields[0]);
+ sb = new CPStringBuilder(fields[0]);
for (int i = 1; i < fields.length; i++)
sb.append(":" + fields[i]);
pw.println(sb.toString());
Index: gnu/javax/crypto/sasl/plain/PlainClient.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/crypto/sasl/plain/PlainClient.java,v
retrieving revision 1.2
diff -u -r1.2 PlainClient.java
--- gnu/javax/crypto/sasl/plain/PlainClient.java 3 Jul 2006 12:15:39
-0000 1.2
+++ gnu/javax/crypto/sasl/plain/PlainClient.java 5 May 2008 21:25:48
-0000
@@ -38,6 +38,8 @@
package gnu.javax.crypto.sasl.plain;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.security.Registry;
import gnu.javax.crypto.sasl.ClientMechanism;
@@ -128,7 +130,7 @@
}
if (password == null)
throw new SaslException("null password supplied");
- final StringBuffer sb = new StringBuffer();
+ final CPStringBuilder sb = new CPStringBuilder();
if (authorizationID != null)
sb.append(authorizationID);
sb.append('\0');
Index: gnu/javax/crypto/sasl/srp/PasswordFile.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/crypto/sasl/srp/PasswordFile.java,v
retrieving revision 1.3
diff -u -r1.3 PasswordFile.java
--- gnu/javax/crypto/sasl/srp/PasswordFile.java 3 Jul 2006 12:15:39 -0000
1.3
+++ gnu/javax/crypto/sasl/srp/PasswordFile.java 5 May 2008 21:25:48 -0000
@@ -38,6 +38,8 @@
package gnu.javax.crypto.sasl.srp;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.security.Registry;
import gnu.java.security.util.Util;
import gnu.javax.crypto.key.srp6.SRPAlgorithm;
@@ -445,12 +447,12 @@
{
String ndx;
String[] mpi;
- StringBuffer sb;
+ CPStringBuilder sb;
for (Iterator it = configurations.keySet().iterator(); it.hasNext();)
{
ndx = (String) it.next();
mpi = (String[]) configurations.get(ndx);
- sb = new StringBuffer(ndx)
+ sb = new CPStringBuilder(ndx)
.append(":").append(mpi[0])
.append(":").append(mpi[1]);
pw.println(sb.toString());
@@ -591,7 +593,7 @@
{
String user, digestID;
HashMap fields, verifiers;
- StringBuffer sb1, sb2;
+ CPStringBuilder sb1, sb2;
Iterator j;
final Iterator i = entries.keySet().iterator();
while (i.hasNext())
@@ -601,7 +603,7 @@
if (! user.equals(fields.get(USER_FIELD)))
throw new IOException("Inconsistent SRP password data");
verifiers = (HashMap) fields.get(VERIFIERS_FIELD);
- sb1 = new StringBuffer(user)
+ sb1 = new CPStringBuilder(user)
.append(":").append((String) verifiers.get("0"))
.append(":").append((String) fields.get(SALT_FIELD))
.append(":").append((String) fields.get(CONFIG_FIELD));
@@ -614,7 +616,7 @@
if (! "0".equals(digestID))
{
// #0 is the default digest, already present in tpasswd!
- sb2 = new StringBuffer(digestID)
+ sb2 = new CPStringBuilder(digestID)
.append(":").append(user)
.append(":").append((String) verifiers.get(digestID));
pw2.println(sb2.toString());
Index: gnu/javax/crypto/sasl/srp/SRPClient.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/crypto/sasl/srp/SRPClient.java,v
retrieving revision 1.5
diff -u -r1.5 SRPClient.java
--- gnu/javax/crypto/sasl/srp/SRPClient.java 3 Jul 2006 12:15:39 -0000
1.5
+++ gnu/javax/crypto/sasl/srp/SRPClient.java 5 May 2008 21:25:50 -0000
@@ -38,6 +38,8 @@
package gnu.javax.crypto.sasl.srp;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.hash.MD5;
@@ -863,7 +865,7 @@
// For now we just select the defaults. Later we need to add support for
// properties (perhaps in a file) where a user can specify the list of
// algorithms they would prefer to use.
- final StringBuffer sb = new StringBuffer();
+ final CPStringBuilder sb = new CPStringBuilder();
sb.append(SRPRegistry.OPTION_SRP_DIGEST)
.append("=").append(mdName).append(",");
if (replayDetection)
Index: gnu/javax/crypto/sasl/srp/SRPServer.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/crypto/sasl/srp/SRPServer.java,v
retrieving revision 1.6
diff -u -r1.6 SRPServer.java
--- gnu/javax/crypto/sasl/srp/SRPServer.java 3 Jul 2006 12:15:39 -0000
1.6
+++ gnu/javax/crypto/sasl/srp/SRPServer.java 5 May 2008 21:25:50 -0000
@@ -38,6 +38,8 @@
package gnu.javax.crypto.sasl.srp;
+import gnu.java.lang.CPStringBuilder;
+
import gnu.java.security.Configuration;
import gnu.java.security.Registry;
import gnu.java.security.util.PRNG;
@@ -612,7 +614,7 @@
s = (String) properties.get(SRPRegistry.SRP_REPLAY_DETECTION);
final boolean replayDetection = (s == null ?
SRPRegistry.DEFAULT_REPLAY_DETECTION
:
Boolean.valueOf(s).booleanValue());
- final StringBuffer sb = new StringBuffer();
+ final CPStringBuilder sb = new CPStringBuilder();
sb.append(SRPRegistry.OPTION_SRP_DIGEST).append("=")
.append(srp.getAlgorithm()).append(",");
Index: gnu/javax/crypto/sasl/srp/ServerStore.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/javax/crypto/sasl/srp/ServerStore.java,v
retrieving revision 1.2
diff -u -r1.2 ServerStore.java
--- gnu/javax/crypto/sasl/srp/ServerStore.java 3 Jul 2006 12:15:39 -0000
1.2
+++ gnu/javax/crypto/sasl/srp/ServerStore.java 5 May 2008 21:25:50 -0000
@@ -38,6 +38,8 @@
package gnu.javax.crypto.sasl.srp;
+import gnu.java.lang.CPStringBuilder;
+
import java.util.HashMap;
/**
@@ -84,7 +86,7 @@
static synchronized final byte[] getNewSessionID()
{
final String sid = String.valueOf(++counter);
- return new StringBuffer("SID-")
+ return new CPStringBuilder("SID-")
.append("0000000000".substring(0, 10 - sid.length())).append(sid)
.toString().getBytes();
}
