8279043: Some Security Exception Messages Miss Spaces

djelinski · wangweij · commit f31dead6c550 · 2021-12-21T18:24:31.000Z
Reviewed-by: weijun
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java b/src/java.base/share/classes/com/sun/crypto/provider/GaloisCounterMode.java
@@ -1304,7 +1304,7 @@ public int doFinal(ByteBuffer src, ByteBuffer dst) throws
             // 'len' includes ibuffer data
             checkDataLength(len, tagLenBytes);
             if (dst.remaining() < len + tagLenBytes) {
-                throw new ShortBufferException("Output buffer too small, must" +
+                throw new ShortBufferException("Output buffer too small, must " +
                     "be at least " + (len + tagLenBytes) + " bytes long");
             }
 
@@ -1472,7 +1472,7 @@ public int doFinal(byte[] in, int inOfs, int inLen, byte[] out,
             }
 
             if (len - tagLenBytes > out.length - outOfs) {
-                throw new ShortBufferException("Output buffer too small, must" +
+                throw new ShortBufferException("Output buffer too small, must " +
                     "be at least " + (len - tagLenBytes) + " bytes long");
             }
 
diff --git a/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java b/src/java.base/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java
@@ -213,7 +213,7 @@ private SecretKey engineGenerateKey0(byte[] masterSecret) throws GeneralSecurity
                 if (protocolVersion >= 0x0302) {
                     // TLS 1.1+
                     throw new RuntimeException(
-                            "Internal Error:  TLS 1.1+ should not be negotiating" +
+                            "Internal Error:  TLS 1.1+ should not be negotiating " +
                                     "exportable ciphersuites");
                 } else if (protocolVersion == 0x0301) {
                     // TLS 1.0
diff --git a/src/java.base/share/classes/javax/crypto/Cipher.java b/src/java.base/share/classes/javax/crypto/Cipher.java
@@ -340,7 +340,7 @@ private static String[] tokenizeTransformation(String transformation)
                                            "format:" + transformation);
         }
         if ((parts[0] == null) || (parts[0].isEmpty())) {
-            throw new NoSuchAlgorithmException("Invalid transformation:" +
+            throw new NoSuchAlgorithmException("Invalid transformation: " +
                                    "algorithm not specified-"
                                    + transformation);
         }
diff --git a/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java b/src/java.base/share/classes/sun/security/pkcs/PKCS9Attribute.java
@@ -481,12 +481,12 @@ public PKCS9Attribute(DerValue derVal) throws IOException {
                                   "attribute not supported.");
             // break unnecessary
         case 10:    // issuerAndserialNumber attribute -- not supported
-            throw new IOException("PKCS9 IssuerAndSerialNumber" +
+            throw new IOException("PKCS9 IssuerAndSerialNumber " +
                                   "attribute not supported.");
             // break unnecessary
         case 11:    // RSA DSI proprietary
         case 12:    // RSA DSI proprietary
-            throw new IOException("PKCS9 RSA DSI attributes" +
+            throw new IOException("PKCS9 RSA DSI attributes " +
                                   "11 and 12, not supported.");
             // break unnecessary
         case 13:    // S/MIME unused attribute
@@ -604,12 +604,12 @@ public void derEncode(OutputStream out) throws IOException {
                                   "attribute not supported.");
             // break unnecessary
         case 10:    // issuerAndserialNumber attribute -- not supported
-            throw new IOException("PKCS9 IssuerAndSerialNumber" +
+            throw new IOException("PKCS9 IssuerAndSerialNumber " +
                                   "attribute not supported.");
             // break unnecessary
         case 11:    // RSA DSI proprietary
         case 12:    // RSA DSI proprietary
-            throw new IOException("PKCS9 RSA DSI attributes" +
+            throw new IOException("PKCS9 RSA DSI attributes " +
                                   "11 and 12, not supported.");
             // break unnecessary
         case 13:    // S/MIME unused attribute
diff --git a/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java b/src/java.base/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
@@ -635,7 +635,7 @@ private void setKeyEntry(String alias, Key key,
                         }
                     }
                 } else {
-                    throw new KeyStoreException("Private key is not encoded" +
+                    throw new KeyStoreException("Private key is not encoded " +
                                 "as PKCS#8");
                 }
 
diff --git a/src/java.base/share/classes/sun/security/rsa/RSAPadding.java b/src/java.base/share/classes/sun/security/rsa/RSAPadding.java
@@ -270,7 +270,7 @@ public byte[] pad(byte[] data, int ofs, int len)
      */
     public byte[] unpad(byte[] padded) throws BadPaddingException {
         if (padded.length != paddedSize) {
-            throw new BadPaddingException("Decryption error." +
+            throw new BadPaddingException("Decryption error. " +
                 "The padded array length (" + padded.length +
                 ") is not the specified padded size (" + paddedSize + ")");
         }
diff --git a/src/java.base/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java b/src/java.base/share/classes/sun/security/ssl/CertificateAuthoritiesExtension.java
@@ -211,7 +211,7 @@ public byte[] produce(ConnectionContext context,
             if (encodedCAs.isEmpty()) {
                 if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
                     SSLLogger.warning(
-                            "The number of CAs exceeds the maximum size" +
+                            "The number of CAs exceeds the maximum size " +
                             "of the certificate_authorities extension");
                 }
 
diff --git a/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java b/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
@@ -451,7 +451,7 @@ public boolean permits(Key key) {
             for (Constraint constraint : list) {
                 if (!constraint.permits(key)) {
                     if (debug != null) {
-                        debug.println("Constraints: failed key size" +
+                        debug.println("Constraints: failed key size " +
                                 "constraint check " + KeyUtil.getKeySize(key));
                     }
                     return false;
diff --git a/src/java.base/share/classes/sun/security/x509/PolicyConstraintsExtension.java b/src/java.base/share/classes/sun/security/x509/PolicyConstraintsExtension.java
@@ -154,15 +154,15 @@ public PolicyConstraintsExtension(Boolean critical, Object value)
 
             if (next.isContextSpecific(TAG_REQUIRE) && !next.isConstructed()) {
                 if (this.require != -1)
-                    throw new IOException("Duplicate requireExplicitPolicy" +
+                    throw new IOException("Duplicate requireExplicitPolicy " +
                           "found in the PolicyConstraintsExtension");
                 next.resetTag(DerValue.tag_Integer);
                 this.require = next.getInteger();
 
             } else if (next.isContextSpecific(TAG_INHIBIT) &&
                        !next.isConstructed()) {
                 if (this.inhibit != -1)
-                    throw new IOException("Duplicate inhibitPolicyMapping" +
+                    throw new IOException("Duplicate inhibitPolicyMapping " +
                           "found in the PolicyConstraintsExtension");
                 next.resetTag(DerValue.tag_Integer);
                 this.inhibit = next.getInteger();
diff --git a/src/java.base/share/classes/sun/security/x509/PolicyInformation.java b/src/java.base/share/classes/sun/security/x509/PolicyInformation.java
@@ -202,7 +202,7 @@ public void set(String name, Object obj) throws IOException {
             if (obj instanceof Set) {
                 for (Object obj1 : (Set<?>) obj) {
                     if (!(obj1 instanceof PolicyQualifierInfo)) {
-                        throw new IOException("Attribute value must be a" +
+                        throw new IOException("Attribute value must be a " +
                                     "Set of PolicyQualifierInfo objects.");
                     }
                 }
diff --git a/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java b/src/java.security.jgss/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java
@@ -154,7 +154,7 @@ public static void checkInitCredPermission(Krb5NameElement name) {
                 sm.checkPermission(perm);
             } catch (SecurityException e) {
                 if (DEBUG) {
-                    System.out.println("Permission to initiate" +
+                    System.out.println("Permission to initiate " +
                         "kerberos init credential" + e.getMessage());
                 }
                 throw e;
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/AEAD/GCMBufferTest.java b/test/jdk/com/sun/crypto/provider/Cipher/AEAD/GCMBufferTest.java
@@ -258,7 +258,7 @@ void test() throws Exception {
             // If incrementalSegments is enabled, run through that test only
             if (incremental) {
                 if (ops.size() < 2) {
-                    throw new Exception("To do incrementalSegments you must" +
+                    throw new Exception("To do incrementalSegments you must " +
                         "have more that 1 dtype in the list");
                 }
                 sizes = new int[ops.size()];
diff --git a/test/jdk/com/sun/crypto/provider/Cipher/AEAD/GCMShortBuffer.java b/test/jdk/com/sun/crypto/provider/Cipher/AEAD/GCMShortBuffer.java
@@ -57,7 +57,7 @@ public class GCMShortBuffer {
         int r = c.doFinal(cipherText, 1, len, pt, 0);
         if (r != pt.length) {
             System.out.println(
-                "doFinal() return ( " + r + ") is not the same" +
+                "doFinal() return ( " + r + ") is not the same " +
                     "as getOutputSize returned" + pt.length);
             error = true;
         }
diff --git a/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.java b/test/jdk/sun/security/provider/PolicyParser/PrincipalExpansionError.java
@@ -110,7 +110,7 @@ public static void main(String[] args) {
                     ("PrincipalExpansionError test failed (file not found)");
                 java.io.FileNotFoundException fnfe =
                         (java.io.FileNotFoundException)e;
-                throw new SecurityException("PrincipalExpansionError" +
+                throw new SecurityException("PrincipalExpansionError " +
                         "test failed (file not found)");
             } else {
                 // i don't know???
diff --git a/test/jdk/sun/security/ssl/X509TrustManagerImpl/CacertsLimit.java b/test/jdk/sun/security/ssl/X509TrustManagerImpl/CacertsLimit.java
@@ -69,7 +69,7 @@ private static void checkLimit(
                 throw new Exception(
                         "There are too many trusted CAs in cacerts. The " +
                         "certificate_authorities extension cannot be used " +
-                        "for TLS connections.  Please rethink about the size" +
+                        "for TLS connections.  Please rethink about the size " +
                         "of the cacerts, or have a release note for the " +
                         "impacted behaviors");
             } else if (sizeAccount > 0x4000) {
diff --git a/test/jdk/sun/security/tools/keytool/fakegen/jdk.crypto.ec/sun/security/ec/ECKeyPairGenerator.java b/test/jdk/sun/security/tools/keytool/fakegen/jdk.crypto.ec/sun/security/ec/ECKeyPairGenerator.java
@@ -71,7 +71,7 @@ public KeyPair generateKeyPair() {
                 break;
             default:
                 throw new AssertionError("SunEC ECKeyPairGenerator" +
-                    "has been patched. Key size " + keySize +
+                    " has been patched. Key size " + keySize +
                     " is not supported");
         }
         ECParameterSpec ecParams = ECUtil.getECParameterSpec(null, keySize);

Original file line number	Diff line number	Diff line change
`@@ -1304,7 +1304,7 @@ public int doFinal(ByteBuffer src, ByteBuffer dst) throws`
`1304`	`1304`	`// 'len' includes ibuffer data`
`1305`	`1305`	`checkDataLength(len, tagLenBytes);`
`1306`	`1306`	`if (dst.remaining() < len + tagLenBytes) {`
`1307`		`- throw new ShortBufferException("Output buffer too small, must" +`
	`1307`	`+ throw new ShortBufferException("Output buffer too small, must " +`
`1308`	`1308`	`"be at least " + (len + tagLenBytes) + " bytes long");`
`1309`	`1309`	`}`
`1310`	`1310`
`@@ -1472,7 +1472,7 @@ public int doFinal(byte[] in, int inOfs, int inLen, byte[] out,`
`1472`	`1472`	`}`
`1473`	`1473`
`1474`	`1474`	`if (len - tagLenBytes > out.length - outOfs) {`
`1475`		`- throw new ShortBufferException("Output buffer too small, must" +`
	`1475`	`+ throw new ShortBufferException("Output buffer too small, must " +`
`1476`	`1476`	`"be at least " + (len - tagLenBytes) + " bytes long");`
`1477`	`1477`	`}`
`1478`	`1478`
Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ private static String[] tokenizeTransformation(String transformation)`
`340`	`340`	`"format:" + transformation);`
`341`	`341`	`}`
`342`	`342`	`if ((parts[0] == null) \|\| (parts[0].isEmpty())) {`
`343`		`- throw new NoSuchAlgorithmException("Invalid transformation:" +`
	`343`	`+ throw new NoSuchAlgorithmException("Invalid transformation: " +`
`344`	`344`	`"algorithm not specified-"`
`345`	`345`	`+ transformation);`
`346`	`346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,7 @@ private void setKeyEntry(String alias, Key key,`
`635`	`635`	`}`
`636`	`636`	`}`
`637`	`637`	`} else {`
`638`		`- throw new KeyStoreException("Private key is not encoded" +`
	`638`	`+ throw new KeyStoreException("Private key is not encoded " +`
`639`	`639`	`"as PKCS#8");`
`640`	`640`	`}`
`641`	`641`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ public byte[] pad(byte[] data, int ofs, int len)`
`270`	`270`	`*/`
`271`	`271`	`public byte[] unpad(byte[] padded) throws BadPaddingException {`
`272`	`272`	`if (padded.length != paddedSize) {`
`273`		`- throw new BadPaddingException("Decryption error." +`
	`273`	`+ throw new BadPaddingException("Decryption error. " +`
`274`	`274`	`"The padded array length (" + padded.length +`
`275`	`275`	`") is not the specified padded size (" + paddedSize + ")");`
`276`	`276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ public byte[] produce(ConnectionContext context,`
`211`	`211`	`if (encodedCAs.isEmpty()) {`
`212`	`212`	`if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {`
`213`	`213`	`SSLLogger.warning(`
`214`		`- "The number of CAs exceeds the maximum size" +`
	`214`	`+ "The number of CAs exceeds the maximum size " +`
`215`	`215`	`"of the certificate_authorities extension");`
`216`	`216`	`}`
`217`	`217`
Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ public boolean permits(Key key) {`
`451`	`451`	`for (Constraint constraint : list) {`
`452`	`452`	`if (!constraint.permits(key)) {`
`453`	`453`	`if (debug != null) {`
`454`		`- debug.println("Constraints: failed key size" +`
	`454`	`+ debug.println("Constraints: failed key size " +`
`455`	`455`	`"constraint check " + KeyUtil.getKeySize(key));`
`456`	`456`	`}`
`457`	`457`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ public void set(String name, Object obj) throws IOException {`
`202`	`202`	`if (obj instanceof Set) {`
`203`	`203`	`for (Object obj1 : (Set<?>) obj) {`
`204`	`204`	`if (!(obj1 instanceof PolicyQualifierInfo)) {`
`205`		`- throw new IOException("Attribute value must be a" +`
	`205`	`+ throw new IOException("Attribute value must be a " +`
`206`	`206`	`"Set of PolicyQualifierInfo objects.");`
`207`	`207`	`}`
`208`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public static void checkInitCredPermission(Krb5NameElement name) {`
`154`	`154`	`sm.checkPermission(perm);`
`155`	`155`	`} catch (SecurityException e) {`
`156`	`156`	`if (DEBUG) {`
`157`		`- System.out.println("Permission to initiate" +`
	`157`	`+ System.out.println("Permission to initiate " +`
`158`	`158`	`"kerberos init credential" + e.getMessage());`
`159`	`159`	`}`
`160`	`160`	`throw e;`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ void test() throws Exception {`
`258`	`258`	`// If incrementalSegments is enabled, run through that test only`
`259`	`259`	`if (incremental) {`
`260`	`260`	`if (ops.size() < 2) {`
`261`		`- throw new Exception("To do incrementalSegments you must" +`
	`261`	`+ throw new Exception("To do incrementalSegments you must " +`
`262`	`262`	`"have more that 1 dtype in the list");`
`263`	`263`	`}`
`264`	`264`	`sizes = new int[ops.size()];`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public class GCMShortBuffer {`
`57`	`57`	`int r = c.doFinal(cipherText, 1, len, pt, 0);`
`58`	`58`	`if (r != pt.length) {`
`59`	`59`	`System.out.println(`
`60`		`- "doFinal() return ( " + r + ") is not the same" +`
	`60`	`+ "doFinal() return ( " + r + ") is not the same " +`
`61`	`61`	`"as getOutputSize returned" + pt.length);`
`62`	`62`	`error = true;`
`63`	`63`	`}`