diff options
Diffstat (limited to 'libjava/classpath/gnu/java/security')
19 files changed, 79 insertions, 42 deletions
diff --git a/libjava/classpath/gnu/java/security/Engine.java b/libjava/classpath/gnu/java/security/Engine.java index 2cb21832152..6c39d46acc6 100644 --- a/libjava/classpath/gnu/java/security/Engine.java +++ b/libjava/classpath/gnu/java/security/Engine.java @@ -37,6 +37,8 @@ exception statement from your version. */ package gnu.java.security; +import gnu.java.lang.CPStringBuilder; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -150,7 +152,7 @@ public final class Engine String alias; int count = 0; boolean algorithmFound = false; - StringBuilder sb = new StringBuilder(); + CPStringBuilder sb = new CPStringBuilder(); while (enumer.hasMoreElements()) { key = (String) enumer.nextElement(); diff --git a/libjava/classpath/gnu/java/security/OID.java b/libjava/classpath/gnu/java/security/OID.java index f61cf0fc37c..a3d70e22019 100644 --- a/libjava/classpath/gnu/java/security/OID.java +++ b/libjava/classpath/gnu/java/security/OID.java @@ -38,6 +38,8 @@ exception statement from your version. */ package gnu.java.security; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.der.DEREncodingException; import java.io.ByteArrayOutputStream; @@ -359,7 +361,7 @@ public class OID implements Cloneable, Comparable, java.io.Serializable return strRep; else { - StringBuffer buf = new StringBuffer(); + CPStringBuilder buf = new CPStringBuilder(); for (int i = 0; i < components.length; i++) { buf.append((long) components[i] & 0xFFFFFFFFL); diff --git a/libjava/classpath/gnu/java/security/PolicyFile.java b/libjava/classpath/gnu/java/security/PolicyFile.java index 8da3a7d72fe..e9c811644df 100644 --- a/libjava/classpath/gnu/java/security/PolicyFile.java +++ b/libjava/classpath/gnu/java/security/PolicyFile.java @@ -39,6 +39,8 @@ package gnu.java.security; import gnu.classpath.debug.Component; import gnu.classpath.debug.SystemLogger; + +import gnu.java.lang.CPStringBuilder; import gnu.java.security.action.GetPropertyAction; import java.io.File; @@ -150,7 +152,7 @@ public final class PolicyFile extends Policy protected static final Logger logger = SystemLogger.SYSTEM; // Added to cut redundant AccessController.doPrivileged calls - private static GetPropertyAction prop = new GetPropertyAction("file.seperator"); + private static GetPropertyAction prop = new GetPropertyAction("file.separator"); private static final String fs = (String) AccessController.doPrivileged(prop); private static final String DEFAULT_POLICY = @@ -629,8 +631,8 @@ public final class PolicyFile extends Policy */ private static String expand(final String s) { - final StringBuffer result = new StringBuffer(); - final StringBuffer prop = new StringBuffer(); + final CPStringBuilder result = new CPStringBuilder(); + final CPStringBuilder prop = new CPStringBuilder(); int state = 0; for (int i = 0; i < s.length(); i++) { diff --git a/libjava/classpath/gnu/java/security/der/BitString.java b/libjava/classpath/gnu/java/security/der/BitString.java index 02b1c037762..ac10be22e6b 100644 --- a/libjava/classpath/gnu/java/security/der/BitString.java +++ b/libjava/classpath/gnu/java/security/der/BitString.java @@ -38,6 +38,8 @@ exception statement from your version. */ package gnu.java.security.der; +import gnu.java.lang.CPStringBuilder; + import java.math.BigInteger; import java.util.Arrays; @@ -314,7 +316,7 @@ public class BitString implements Cloneable, Comparable public String toString() { - StringBuffer sb = new StringBuffer(); + CPStringBuilder sb = new CPStringBuilder(); for (int i = 0, j = 7, k = 0; i < size(); i++) { sb.append((bytes[k] & 1 << j) != 0 ? "1" : "0"); diff --git a/libjava/classpath/gnu/java/security/der/DERReader.java b/libjava/classpath/gnu/java/security/der/DERReader.java index 09ec1e2dff0..cd552c8bedd 100644 --- a/libjava/classpath/gnu/java/security/der/DERReader.java +++ b/libjava/classpath/gnu/java/security/der/DERReader.java @@ -38,6 +38,8 @@ exception statement from your version. */ package gnu.java.security.der; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.OID; import java.io.BufferedInputStream; @@ -286,7 +288,7 @@ public class DERReader implements DER private static String fromIso88591(byte[] bytes) { - StringBuffer str = new StringBuffer(bytes.length); + CPStringBuilder str = new CPStringBuilder(bytes.length); for (int i = 0; i < bytes.length; i++) str.append((char) (bytes[i] & 0xFF)); return str.toString(); @@ -296,7 +298,7 @@ public class DERReader implements DER { if ((bytes.length & 0x01) != 0) throw new IOException("UTF-16 bytes are odd in length"); - StringBuffer str = new StringBuffer(bytes.length / 2); + CPStringBuilder str = new CPStringBuilder(bytes.length / 2); for (int i = 0; i < bytes.length; i += 2) { char c = (char) ((bytes[i] << 8) & 0xFF); @@ -308,7 +310,7 @@ public class DERReader implements DER private static String fromUtf8(byte[] bytes) throws IOException { - StringBuffer str = new StringBuffer((int)(bytes.length / 1.5)); + CPStringBuilder str = new CPStringBuilder((int)(bytes.length / 1.5)); for (int i = 0; i < bytes.length; ) { char c = 0; diff --git a/libjava/classpath/gnu/java/security/hash/Whirlpool.java b/libjava/classpath/gnu/java/security/hash/Whirlpool.java index 89df5c51bf3..aebe1acb699 100644 --- a/libjava/classpath/gnu/java/security/hash/Whirlpool.java +++ b/libjava/classpath/gnu/java/security/hash/Whirlpool.java @@ -38,6 +38,8 @@ exception statement from your version. */ package gnu.java.security.hash; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Configuration; import gnu.java.security.Registry; import gnu.java.security.util.Util; @@ -177,10 +179,10 @@ public final class Whirlpool { log.fine("Static data"); log.fine("T0[]:"); - StringBuilder sb; + CPStringBuilder sb; for (i = 0; i < 64; i++) { - sb = new StringBuilder(); + sb = new CPStringBuilder(); for (j = 0; j < 4; j++) sb.append("0x").append(Util.toString(T0[i * 4 + j])).append(", "); @@ -189,7 +191,7 @@ public final class Whirlpool log.fine("T1[]:"); for (i = 0; i < 64; i++) { - sb = new StringBuilder(); + sb = new CPStringBuilder(); for (j = 0; j < 4; j++) sb.append("0x").append(Util.toString(T1[i * 4 + j])).append(", "); @@ -198,7 +200,7 @@ public final class Whirlpool log.fine("T2[]:"); for (i = 0; i < 64; i++) { - sb = new StringBuilder(); + sb = new CPStringBuilder(); for (j = 0; j < 4; j++) sb.append("0x").append(Util.toString(T2[i * 4 + j])).append(", "); @@ -207,7 +209,7 @@ public final class Whirlpool log.fine("T3[]:"); for (i = 0; i < 64; i++) { - sb = new StringBuilder(); + sb = new CPStringBuilder(); for (j = 0; j < 4; j++) sb.append("0x").append(Util.toString(T3[i * 4 + j])).append(", "); @@ -216,7 +218,7 @@ public final class Whirlpool log.fine("\nT4[]:"); for (i = 0; i < 64; i++) { - sb = new StringBuilder(); + sb = new CPStringBuilder(); for (j = 0; j < 4; j++) sb.append("0x").append(Util.toString(T4[i * 4 + j])).append(", "); @@ -225,7 +227,7 @@ public final class Whirlpool log.fine("T5[]:"); for (i = 0; i < 64; i++) { - sb = new StringBuilder(); + sb = new CPStringBuilder(); for (j = 0; j < 4; j++) sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", "); @@ -234,7 +236,7 @@ public final class Whirlpool log.fine("T6[]:"); for (i = 0; i < 64; i++) { - sb = new StringBuilder(); + sb = new CPStringBuilder(); for (j = 0; j < 4; j++) sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", "); @@ -243,7 +245,7 @@ public final class Whirlpool log.fine("T7[]:"); for (i = 0; i < 64; i++) { - sb = new StringBuilder(); + sb = new CPStringBuilder(); for (j = 0; j < 4; j++) sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", "); diff --git a/libjava/classpath/gnu/java/security/jce/sig/DSSParameters.java b/libjava/classpath/gnu/java/security/jce/sig/DSSParameters.java index eaccb009551..8a1cb4ca502 100644 --- a/libjava/classpath/gnu/java/security/jce/sig/DSSParameters.java +++ b/libjava/classpath/gnu/java/security/jce/sig/DSSParameters.java @@ -38,6 +38,8 @@ exception statement from your version. */ package gnu.java.security.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 @@ public class DSSParameters protected String engineToString() { - StringBuffer sb = new StringBuffer("p="); + CPStringBuilder sb = new CPStringBuilder("p="); if (p == null) sb.append("???"); else diff --git a/libjava/classpath/gnu/java/security/key/dss/DSSKey.java b/libjava/classpath/gnu/java/security/key/dss/DSSKey.java index 657de8dd02d..d4cf36513eb 100644 --- a/libjava/classpath/gnu/java/security/key/dss/DSSKey.java +++ b/libjava/classpath/gnu/java/security/key/dss/DSSKey.java @@ -38,6 +38,8 @@ exception statement from your version. */ package gnu.java.security.key.dss; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Registry; import gnu.java.security.action.GetPropertyAction; import gnu.java.security.util.FormatUtil; @@ -181,7 +183,7 @@ public abstract class DSSKey if (str == null) { String ls = (String) AccessController.doPrivileged(new GetPropertyAction("line.separator")); - StringBuilder sb = new StringBuilder(ls) + CPStringBuilder sb = new CPStringBuilder(ls) .append("defaultFormat=").append(defaultFormat).append(",") .append(ls); if (hasInheritedParameters()) diff --git a/libjava/classpath/gnu/java/security/key/dss/DSSPrivateKey.java b/libjava/classpath/gnu/java/security/key/dss/DSSPrivateKey.java index 6ed8de8460d..633fcf7ce08 100644 --- a/libjava/classpath/gnu/java/security/key/dss/DSSPrivateKey.java +++ b/libjava/classpath/gnu/java/security/key/dss/DSSPrivateKey.java @@ -38,6 +38,8 @@ exception statement from your version. */ package gnu.java.security.key.dss; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Configuration; import gnu.java.security.Registry; import gnu.java.security.action.GetPropertyAction; @@ -191,7 +193,7 @@ public class DSSPrivateKey { String ls = (String) AccessController.doPrivileged (new GetPropertyAction("line.separator")); - str = new StringBuilder(this.getClass().getName()).append("(") + str = new CPStringBuilder(this.getClass().getName()).append("(") .append(super.toString()).append(",").append(ls) .append("x=0x").append(Configuration.DEBUG ? x.toString(16) : "**...*").append(ls) diff --git a/libjava/classpath/gnu/java/security/key/dss/DSSPublicKey.java b/libjava/classpath/gnu/java/security/key/dss/DSSPublicKey.java index 9e1c4cf0a04..e5c53467176 100644 --- a/libjava/classpath/gnu/java/security/key/dss/DSSPublicKey.java +++ b/libjava/classpath/gnu/java/security/key/dss/DSSPublicKey.java @@ -38,6 +38,8 @@ exception statement from your version. */ package gnu.java.security.key.dss; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Registry; import gnu.java.security.action.GetPropertyAction; import gnu.java.security.key.IKeyPairCodec; @@ -190,7 +192,7 @@ public class DSSPublicKey { String ls = (String) AccessController.doPrivileged (new GetPropertyAction("line.separator")); - str = new StringBuilder(this.getClass().getName()).append("(") + str = new CPStringBuilder(this.getClass().getName()).append("(") .append(super.toString()).append(",").append(ls) .append("y=0x").append(y.toString(16)).append(ls) .append(")") diff --git a/libjava/classpath/gnu/java/security/key/rsa/GnuRSAKey.java b/libjava/classpath/gnu/java/security/key/rsa/GnuRSAKey.java index 4bdce4011a5..0419ac96ee4 100644 --- a/libjava/classpath/gnu/java/security/key/rsa/GnuRSAKey.java +++ b/libjava/classpath/gnu/java/security/key/rsa/GnuRSAKey.java @@ -38,6 +38,8 @@ exception statement from your version. */ package gnu.java.security.key.rsa; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Registry; import gnu.java.security.action.GetPropertyAction; import gnu.java.security.util.FormatUtil; @@ -163,7 +165,7 @@ public abstract class GnuRSAKey { String ls = (String) AccessController.doPrivileged (new GetPropertyAction("line.separator")); - str = new StringBuilder(ls) + str = new CPStringBuilder(ls) .append("defaultFormat=").append(defaultFormat).append(",").append(ls) .append("n=0x").append(n.toString(16)).append(",").append(ls) .append("e=0x").append(e.toString(16)) diff --git a/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java b/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java index 00a1b822ad0..e554f2f3f02 100644 --- a/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java +++ b/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPrivateKey.java @@ -38,6 +38,8 @@ exception statement from your version. */ package gnu.java.security.key.rsa; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Configuration; import gnu.java.security.action.GetPropertyAction; import gnu.java.security.Registry; @@ -289,7 +291,7 @@ public class GnuRSAPrivateKey { String ls = (String) AccessController.doPrivileged (new GetPropertyAction("line.separator")); - str = new StringBuilder(this.getClass().getName()).append("(") + str = new CPStringBuilder(this.getClass().getName()).append("(") .append(super.toString()).append(",").append(ls) .append("d=0x").append(Configuration.DEBUG ? d.toString(16) : "**...*").append(ls) diff --git a/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPublicKey.java b/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPublicKey.java index fe28d0ba3b0..3217130c258 100644 --- a/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPublicKey.java +++ b/libjava/classpath/gnu/java/security/key/rsa/GnuRSAPublicKey.java @@ -38,6 +38,8 @@ exception statement from your version. */ package gnu.java.security.key.rsa; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.Registry; import gnu.java.security.action.GetPropertyAction; import gnu.java.security.key.IKeyPairCodec; @@ -178,7 +180,7 @@ public class GnuRSAPublicKey { String ls = (String) AccessController.doPrivileged (new GetPropertyAction("line.separator")); - str = new StringBuilder(this.getClass().getName()).append("(") + str = new CPStringBuilder(this.getClass().getName()).append("(") .append(super.toString()).append(",").append(ls) .append(")") .toString(); diff --git a/libjava/classpath/gnu/java/security/provider/X509CertificateFactory.java b/libjava/classpath/gnu/java/security/provider/X509CertificateFactory.java index 7d61779f937..64403315672 100644 --- a/libjava/classpath/gnu/java/security/provider/X509CertificateFactory.java +++ b/libjava/classpath/gnu/java/security/provider/X509CertificateFactory.java @@ -39,6 +39,7 @@ exception statement from your version. */ package gnu.java.security.provider; import gnu.java.io.Base64InputStream; +import gnu.java.lang.CPStringBuilder; import gnu.java.security.x509.X509CRL; import gnu.java.security.x509.X509CertPath; import gnu.java.security.x509.X509Certificate; @@ -193,7 +194,7 @@ public class X509CertificateFactory if (i != 0x30) { inStream.reset(); - StringBuffer line = new StringBuffer(80); + CPStringBuilder line = new CPStringBuilder(80); do { line.setLength(0); @@ -252,7 +253,7 @@ public class X509CertificateFactory if (i != 0x30) { inStream.reset(); - StringBuffer line = new StringBuffer(80); + CPStringBuilder line = new CPStringBuilder(80); do { line.setLength(0); 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 diff --git a/libjava/classpath/gnu/java/security/x509/PolicyNodeImpl.java b/libjava/classpath/gnu/java/security/x509/PolicyNodeImpl.java index 72cb4a9ea91..60d35574d01 100644 --- a/libjava/classpath/gnu/java/security/x509/PolicyNodeImpl.java +++ b/libjava/classpath/gnu/java/security/x509/PolicyNodeImpl.java @@ -38,6 +38,8 @@ exception statement from your version. */ package gnu.java.security.x509; +import gnu.java.lang.CPStringBuilder; + import java.security.cert.PolicyNode; import java.security.cert.PolicyQualifierInfo; @@ -186,7 +188,7 @@ public final class PolicyNodeImpl implements PolicyNode public String toString() { - StringBuffer buf = new StringBuffer(); + CPStringBuilder buf = new CPStringBuilder(); for (int i = 0; i < depth; i++) buf.append(" "); buf.append("("); diff --git a/libjava/classpath/gnu/java/security/x509/Util.java b/libjava/classpath/gnu/java/security/x509/Util.java index 1bd268a51e2..7b6c89f6aac 100644 --- a/libjava/classpath/gnu/java/security/x509/Util.java +++ b/libjava/classpath/gnu/java/security/x509/Util.java @@ -38,6 +38,8 @@ exception statement from your version. */ package gnu.java.security.x509; +import gnu.java.lang.CPStringBuilder; + /** * A collection of useful class methods. * @@ -65,7 +67,7 @@ public final class Util */ public static String toHexString(byte[] buf, int off, int len) { - StringBuffer str = new StringBuffer(); + CPStringBuilder str = new CPStringBuilder(); for (int i = 0; i < len; i++) { str.append(HEX.charAt(buf[i+off] >>> 4 & 0x0F)); @@ -94,7 +96,7 @@ public final class Util */ 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(HEX.charAt(buf[i+off] >>> 4 & 0x0F)); @@ -130,7 +132,7 @@ public final class Util public static String hexDump(byte[] buf, int off, int len, String prefix) { String nl = System.getProperty("line.separator"); - StringBuffer str = new StringBuffer(); + CPStringBuilder str = new CPStringBuilder(); int i = 0; while (i < len) { @@ -174,7 +176,7 @@ public final class Util public static String formatInt(int i, int radix, int len) { String s = Integer.toString(i, 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/x509/X500DistinguishedName.java b/libjava/classpath/gnu/java/security/x509/X500DistinguishedName.java index 02adad7d2fd..e2e05c57e4b 100644 --- a/libjava/classpath/gnu/java/security/x509/X500DistinguishedName.java +++ b/libjava/classpath/gnu/java/security/x509/X500DistinguishedName.java @@ -38,6 +38,8 @@ exception statement from your version. */ package gnu.java.security.x509; +import gnu.java.lang.CPStringBuilder; + import gnu.java.security.OID; import gnu.java.security.der.DER; import gnu.java.security.der.DERReader; @@ -285,7 +287,7 @@ public class X500DistinguishedName implements Principal { if (fixed && stringRep != null) return stringRep; - StringBuffer str = new StringBuffer(); + CPStringBuilder str = new CPStringBuilder(); for (Iterator it = components.iterator(); it.hasNext(); ) { Map m = (Map) it.next(); @@ -377,7 +379,7 @@ public class X500DistinguishedName implements Principal private String readAttributeType(Reader in) throws IOException { - StringBuffer buf = new StringBuffer(); + CPStringBuilder buf = new CPStringBuilder(); int ch; while ((ch = in.read()) != '=') { @@ -399,7 +401,7 @@ public class X500DistinguishedName implements Principal private String readAttributeValue(Reader in) throws IOException { - StringBuffer buf = new StringBuffer(); + CPStringBuilder buf = new CPStringBuilder(); int ch = in.read(); if (ch == '#') { @@ -537,7 +539,7 @@ public class X500DistinguishedName implements Principal private static String compressWS(String str) { - StringBuffer buf = new StringBuffer(); + CPStringBuilder buf = new CPStringBuilder(); char lastChar = 0; for (int i = 0; i < str.length(); i++) { |
