1 files changed, 51 insertions, 56 deletions
diff --git a/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java b/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java
index 77165b7fe..de99a2ec4 100644
--- a/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java
+++ b/pki/base/util/src/netscape/security/util/ByteToCharUniversalString.java
@@ -22,78 +22,73 @@ import sun.io.ConversionBufferFullException;
 import sun.io.UnknownCharacterException;
 
 /**
- * Converts bytes in ASN.1 UniversalString character set to unicode
- * characters.
- *
+ * Converts bytes in ASN.1 UniversalString character set to unicode characters.
+ * 
  * @author Lily Hsiao
  * @author Slava Galperin
  */
 
-public class ByteToCharUniversalString extends ByteToCharConverter
-{
+public class ByteToCharUniversalString extends ByteToCharConverter {
     public String getCharacterEncoding() {
-	return "ASN.1 UniversalString";
+        return "ASN.1 UniversalString";
     }
 
-    public int convert(byte[] input, int inStart, int inEnd,
-		       char[] output, int outStart, int outEnd)
-	throws ConversionBufferFullException,
-		UnknownCharacterException
-    {
-	int j = outStart;
+    public int convert(byte[] input, int inStart, int inEnd, char[] output,
+            int outStart, int outEnd) throws ConversionBufferFullException,
+            UnknownCharacterException {
+        int j = outStart;
 
+        int i = inStart;
+        while (i < inEnd) {
+            // XXX we do not know what to do with truly UCS-4 characters here
+            // we also assumed network byte order
 
-	int i = inStart;
-	while(i < inEnd) {
-	    // XXX we do not know what to do with truly UCS-4 characters here
-	    // we also assumed network byte order
+            if (i + 3 >= inEnd
+                    || (!((input[i] == 0 && input[i + 1] == 0) || (input[i + 2] == 0 && input[i + 3] == 0)))) {
+                byteOff = i;
+                charOff = j;
+                throw new UnknownCharacterException();
+            }
+            if (input[i + 2] == 0 && input[i + 3] == 0) {
+                // Try to be a bit forgiving. If the byte order is
+                // reversed, we still try handle it.
 
-        if ( i+3 >= inEnd || 
-				(!((input[i] == 0 && input[i+1] == 0) ||
-				(input[i+2] == 0 && input[i+3] == 0)))) {
-    		byteOff = i;
-	    	charOff = j;
-		    throw new UnknownCharacterException();
-	    }
-		if (input[i+2] == 0 && input[i+3] == 0) {
-			// Try to be a bit forgiving. If the byte order is
-			// reversed, we still try handle it.
+                // Sample Date Set (1):
+                // 0000000 f 0 \0 \0 213 0 \0 \0 S 0 \0 \0
+                // 0000014
 
-			// Sample Date Set (1):
-			// 0000000   f   0  \0  \0 213   0  \0  \0   S   0  \0  \0
-			// 0000014
+                // Sample Date Set (2):
+                // 0000000 w \0 \0 \0 w \0 \0 \0 w \0 \0 \0 . \0 \0 \0
+                // 0000020 ( \0 \0 \0 t \0 \0 \0 o \0 \0 \0 b \0 \0 \0
+                // 0000040 e \0 \0 \0 | \0 \0 \0 n \0 \0 \0 o \0 \0 \0
+                // 0000060 t \0 \0 \0 t \0 \0 \0 o \0 \0 \0 b \0 \0 \0
+                // 0000100 e \0 \0 \0 ) \0 \0 \0 . \0 \0 \0 c \0 \0 \0
+                // 0000120 o \0 \0 \0 m \0 \0 \0
+                // 0000130
+                output[j] = (char) (((input[i + 1] << 8) & 0xff00) + (input[i] & 0x00ff));
+            } else {
+                // This should be the right order.
+                //
+                // 0000000 0000 00c4 0000 0064 0000 006d 0000 0069
+                // 0000020 0000 006e 0000 0020 0000 0051 0000 0041
+                // 0000040
 
-			// Sample Date Set (2):
-			// 0000000   w  \0  \0  \0   w  \0  \0  \0   w  \0  \0  \0   .  \0  \0  \0
-			// 0000020   (  \0  \0  \0   t  \0  \0  \0   o  \0  \0  \0   b  \0  \0  \0
-			// 0000040   e  \0  \0  \0   |  \0  \0  \0   n  \0  \0  \0   o  \0  \0  \0
-			// 0000060   t  \0  \0  \0   t  \0  \0  \0   o  \0  \0  \0   b  \0  \0  \0
-			// 0000100   e  \0  \0  \0   )  \0  \0  \0   .  \0  \0  \0   c  \0  \0  \0
-			// 0000120   o  \0  \0  \0   m  \0  \0  \0
-			// 0000130
-		    output[j] = (char)(((input[i+1] << 8)& 0xff00) + (input[i] & 0x00ff));
-		} else { 
-			// This should be the right order.
-			//
-			// 0000000 0000 00c4 0000 0064 0000 006d 0000 0069
-			// 0000020 0000 006e 0000 0020 0000 0051 0000 0041
-			// 0000040
-
-			// (input[i] == 0 && input[i+1] == 0)
-		    output[j] = (char)(((input[i+2] << 8)& 0xff00) + (input[i+3] & 0x00ff));
-		}
-	    j++;
-	    i += 4;
-	}
-	byteOff = inEnd;
-	charOff = j;
-	return j - outStart;
+                // (input[i] == 0 && input[i+1] == 0)
+                output[j] = (char) (((input[i + 2] << 8) & 0xff00) + (input[i + 3] & 0x00ff));
+            }
+            j++;
+            i += 4;
+        }
+        byteOff = inEnd;
+        charOff = j;
+        return j - outStart;
     }
 
     public int flush(char[] output, int outStart, int outEnd) {
-	return 0;
+        return 0;
     }
 
-    public void reset() { }
+    public void reset() {
+    }
 
 }