2 files changed, 10 insertions, 6 deletions
diff --git a/libjava/classpath/gnu/java/security/util/ByteArray.java b/libjava/classpath/gnu/java/security/util/ByteArray.java
index 0d04d9127ae..51449204397 100644
--- a/libjava/classpath/gnu/java/security/util/ByteArray.java
+++ b/libjava/classpath/gnu/java/security/util/ByteArray.java
@@ -38,6 +38,8 @@ exception statement from your version. */
 
 package gnu.java.security.util;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
@@ -86,7 +88,7 @@ public final class ByteArray
 
   public static String toHexString (byte[] buf, int off, int len, char sep)
   {
-    StringBuffer str = new StringBuffer();
+    CPStringBuilder str = new CPStringBuilder();
     for (int i = 0; i < len; i++)
       {
 	str.append (Character.forDigit (buf[i+off] >>> 4 & 0x0F, 16));
@@ -100,7 +102,7 @@ public final class ByteArray
   public static String formatInt (int value, int radix, int len)
   {
     String s = Integer.toString (value, radix);
-    StringBuffer buf = new StringBuffer ();
+    CPStringBuilder buf = new CPStringBuilder ();
     for (int j = 0; j < len - s.length(); j++)
       buf.append ("0");
     buf.append (s);
diff --git a/libjava/classpath/gnu/java/security/util/Util.java b/libjava/classpath/gnu/java/security/util/Util.java
index c7a6810fba3..50d4466d539 100644
--- a/libjava/classpath/gnu/java/security/util/Util.java
+++ b/libjava/classpath/gnu/java/security/util/Util.java
@@ -38,6 +38,8 @@ exception statement from your version.  */
 
 package gnu.java.security.util;
 
+import gnu.java.lang.CPStringBuilder;
+
 import java.math.BigInteger;
 
 /**
@@ -296,7 +298,7 @@ public class Util
    */
   public static final String toUnicodeString(byte[] ba, int offset, int length)
   {
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     int i = 0;
     int j = 0;
     int k;
@@ -328,7 +330,7 @@ public class Util
    */
   public static String toUnicodeString(int[] ia)
   {
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     int i = 0;
     int j = 0;
     int k;
@@ -385,7 +387,7 @@ public class Util
   {
     if (data == null)
       return m + "null\n";
-    StringBuffer sb = new StringBuffer(length * 3);
+    CPStringBuilder sb = new CPStringBuilder(length * 3);
     if (length > 32)
       sb.append(m).append("Hexadecimal dump of ")
           .append(length).append(" bytes...\n");
@@ -466,7 +468,7 @@ public class Util
         b2 = buffer[1];
         break;
       }
-    StringBuffer sb = new StringBuffer();
+    CPStringBuilder sb = new CPStringBuilder();
     int c;
     boolean notleading = false;
     do