You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2015/08/19 07:06:02 UTC

directory-kerby git commit: Fix checkestyle issue: ArrayTypeStyle, LineLength and FinalClass.

Repository: directory-kerby
Updated Branches:
  refs/heads/pkinit-support 5ff113392 -> aad4a73e6


Fix checkestyle issue: ArrayTypeStyle, LineLength and FinalClass.


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/aad4a73e
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/aad4a73e
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/aad4a73e

Branch: refs/heads/pkinit-support
Commit: aad4a73e6d44b13501bf18cbb666cc5d49e980a8
Parents: 5ff1133
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Aug 19 13:11:09 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Aug 19 13:11:09 2015 +0800

----------------------------------------------------------------------
 .../org/apache/commons/ssl/Asn1PkcsUtil.java    |  2 +-
 .../java/org/apache/commons/ssl/CRLSocket.java  |  2 +-
 .../apache/commons/ssl/ComboInputStream.java    |  2 +-
 .../apache/commons/ssl/HostnameVerifier.java    |  2 +-
 .../org/apache/commons/ssl/KeyMaterial.java     |  9 +++--
 .../java/org/apache/commons/ssl/LDAPSocket.java |  2 +-
 .../java/org/apache/commons/ssl/OpenSSL.java    |  2 +-
 .../java/org/apache/commons/ssl/PKCS8Key.java   | 41 +++++++++++++-------
 .../main/java/org/apache/commons/ssl/Ping.java  | 30 +++++++++-----
 .../org/apache/commons/ssl/TrustMaterial.java   |  2 +-
 .../java/org/apache/commons/ssl/Version.java    |  3 +-
 .../org/apache/commons/ssl/TestOpenSSL.java     |  9 +++--
 12 files changed, 68 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/aad4a73e/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Asn1PkcsUtil.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Asn1PkcsUtil.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Asn1PkcsUtil.java
index 9504386..2cf5ca4 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Asn1PkcsUtil.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Asn1PkcsUtil.java
@@ -78,7 +78,7 @@ public class Asn1PkcsUtil {
 
         List<Asn1Item> items = asn1Coll.getValue();
         for (Asn1Item item : items) {
-            if (! item.isCollection()) {
+            if (!item.isCollection()) {
                 analyze(item.getValue(), pkcs8, depth);
             } else {
                 try {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/aad4a73e/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/CRLSocket.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/CRLSocket.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/CRLSocket.java
index 16cafda..473a7e2 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/CRLSocket.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/CRLSocket.java
@@ -7,7 +7,7 @@ import java.io.OutputStream;
 import java.net.Socket;
 import java.security.GeneralSecurityException;
 
-public class CRLSocket extends SSLClient {
+public final class CRLSocket extends SSLClient {
     private static final CRLSocket SECURE_INSTANCE;
     private static final CRLSocket PLAIN_INSTANCE;
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/aad4a73e/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/ComboInputStream.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/ComboInputStream.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/ComboInputStream.java
index 231e978..83a3077 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/ComboInputStream.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/ComboInputStream.java
@@ -78,7 +78,7 @@ public class ComboInputStream extends InputStream {
         }
     }
 
-    public int read(byte b[], int off, int len) throws IOException {
+    public int read(byte[] b, int off, int len) throws IOException {
         int c;
         if (headDone) {
             c = tail.read(b, off, len);

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/aad4a73e/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HostnameVerifier.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HostnameVerifier.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HostnameVerifier.java
index 3ec2dde..ada875f 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HostnameVerifier.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HostnameVerifier.java
@@ -273,7 +273,7 @@ public interface HostnameVerifier extends javax.net.ssl.HostnameVerifier {
             check(new String[]{host}, cns, subjectAlts);
         }
 
-        public void check(String host[], SSLSocket ssl)
+        public void check(String[] host, SSLSocket ssl)
             throws IOException {
             if (host == null) {
                 throw new NullPointerException("host to verify is null");

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/aad4a73e/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyMaterial.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyMaterial.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyMaterial.java
index 5c51603..44ff77e 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyMaterial.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/KeyMaterial.java
@@ -199,7 +199,8 @@ public class KeyMaterial extends TrustMaterial {
                         }
                         myChains.add(c);
                     } else {
-                        throw new KeyStoreException("Could not find KeyMaterial's associated certificate chain with alis=[" + alias + "]");
+                        throw new KeyStoreException("Could not find KeyMaterial's"
+                            + " associated certificate chain with alis=[" + alias + "]");
                     }
 
                 } catch (GeneralSecurityException gse) {
@@ -233,8 +234,10 @@ public class KeyMaterial extends TrustMaterial {
 
     public static void main(String[] args) throws Exception {
         if (args.length < 2) {
-            System.out.println("Usage1:  java org.apache.commons.ssl.KeyMaterial [password] [pkcs12 or jks]");
-            System.out.println("Usage2:  java org.apache.commons.ssl.KeyMaterial [password] [private-key] [cert-chain]");
+            System.out.println("Usage1:"
+                + " java org.apache.commons.ssl.KeyMaterial [password] [pkcs12 or jks]");
+            System.out.println("Usage2:"
+                + " java org.apache.commons.ssl.KeyMaterial [password] [private-key] [cert-chain]");
             System.exit(1);
         }
         char[] jksPass = args[0].toCharArray();

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/aad4a73e/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/LDAPSocket.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/LDAPSocket.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/LDAPSocket.java
index 17f9fca..8c6dbcd 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/LDAPSocket.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/LDAPSocket.java
@@ -41,7 +41,7 @@ import java.security.GeneralSecurityException;
  * @author <a href="mailto:juliusdavies@cucbc.com">juliusdavies@cucbc.com</a>
  * @since 28-Feb-2006
  */
-public class LDAPSocket extends SSLClient {
+public final class LDAPSocket extends SSLClient {
     private static final LDAPSocket INSTANCE;
 
     static {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/aad4a73e/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/OpenSSL.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/OpenSSL.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/OpenSSL.java
index 6d828f8..617722f 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/OpenSSL.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/OpenSSL.java
@@ -714,7 +714,7 @@ public class OpenSSL {
         // in = encrypt( args[ 1 ], pwdAsBytes, in, true );
 
         in = new BufferedInputStream(in);
-        BufferedOutputStream bufOut = new BufferedOutputStream( System.out );
+        BufferedOutputStream bufOut = new BufferedOutputStream(System.out);
         Util.pipeStream(in, bufOut, false);
         bufOut.flush();
         System.out.flush();

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/aad4a73e/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/PKCS8Key.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/PKCS8Key.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/PKCS8Key.java
index f20dda9..f55ba32 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/PKCS8Key.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/PKCS8Key.java
@@ -171,7 +171,8 @@ public class PKCS8Key {
                     opensslRSA = opensslRSA || rsa;
                     opensslDSA = opensslDSA || dsa;
                     if (derBytes != null) {
-                        throw new ProbablyNotPKCS8Exception("More than one pkcs8 or OpenSSL key found in the supplied PEM Base64 stream");
+                        throw new ProbablyNotPKCS8Exception("More than one pkcs8 "
+                            + "or OpenSSL key found in the supplied PEM Base64 stream");
                     }
                     derBytes = item.getDerBytes();
                     keyItem = item;
@@ -180,7 +181,8 @@ public class PKCS8Key {
             }
             // after the loop is finished, did we find anything?
             if (derBytes == null) {
-                throw new ProbablyNotPKCS8Exception("No pkcs8 or OpenSSL key found in the supplied PEM Base64 stream");
+                throw new ProbablyNotPKCS8Exception(
+                    "No pkcs8 or OpenSSL key found in the supplied PEM Base64 stream");
             }
 
             if (opensslDSA || opensslRSA) {
@@ -243,7 +245,8 @@ public class PKCS8Key {
                          || s.equals("3") || s.startsWith("3.");
             }
             if (!isOkay) {
-                throw new ProbablyNotPKCS8Exception("Valid ASN.1, but not PKCS8 or OpenSSL format.  OID=" + oid);
+                throw new ProbablyNotPKCS8Exception("Valid ASN.1,"
+                   + " but not PKCS8 or OpenSSL format.  OID=" + oid);
             }
         }
 
@@ -260,7 +263,8 @@ public class PKCS8Key {
             try {
                 pkcs8 = Asn1PkcsUtil.analyze(decryptedPKCS8);
             } catch (Exception e) {
-                throw new ProbablyBadPasswordException("Decrypted stream not ASN.1.  Probably bad decryption password.");
+                throw new ProbablyBadPasswordException(
+                    "Decrypted stream not ASN.1.  Probably bad decryption password.");
             }
             oid = pkcs8.oid1;
             isDSA = DSA_OID.equals(oid);
@@ -279,7 +283,8 @@ public class PKCS8Key {
             }
             pk = kf.generatePrivate(spec);
         } catch (Exception e) {
-            throw new ProbablyBadPasswordException("Cannot create " + type + " private key from decrypted stream.  Probably bad decryption password. " + e);
+            throw new ProbablyBadPasswordException("Cannot create " + type
+                + " private key from decrypted stream.  Probably bad decryption password. " + e);
         }
         if (pk != null) {
             this.privateKey = pk;
@@ -289,7 +294,8 @@ public class PKCS8Key {
             this.transformation = decryptResult.transformation;
             this.keySize = decryptResult.keySize;
         } else {
-            throw new GeneralSecurityException("KeyFactory.generatePrivate() returned null and didn't throw exception!");
+            throw new GeneralSecurityException(
+                "KeyFactory.generatePrivate() returned null and didn't throw exception!");
         }
     }
 
@@ -325,7 +331,7 @@ public class PKCS8Key {
             BigInteger p = params.getP();
             BigInteger q = params.getQ();
             BigInteger x = dsa.getX();
-            BigInteger y = q.modPow( x, p );
+            BigInteger y = q.modPow(x, p);
             DSAPublicKeySpec dsaKeySpec = new DSAPublicKeySpec(y, p, q, g);
             return KeyFactory.getInstance("DSA").generatePublic(dsaKeySpec);
         } else if (privateKey instanceof RSAPrivateCrtKey) {
@@ -708,7 +714,8 @@ public class PKCS8Key {
         // a cipher or hash at this point, then we don't support the file we
         // were given.
         if (cipher == null || hash == null) {
-            throw new ProbablyNotPKCS8Exception("Unsupported PKCS8 format. oid1=[" + pkcs8.oid1 + "], oid2=[" + pkcs8.oid2 + "]");
+            throw new ProbablyNotPKCS8Exception(
+                "Unsupported PKCS8 format. oid1=[" + pkcs8.oid1 + "], oid2=[" + pkcs8.oid2 + "]");
         }
 
         // In PKCS8 Version 1.5 we need to derive an 8 byte IV.  In those cases
@@ -970,9 +977,12 @@ public class PKCS8Key {
     public static void main(String[] args) throws Exception {
         String password = "changeit";
         if (args.length == 0) {
-            System.out.println("Usage1:  [password] [file:private-key]      Prints decrypted PKCS8 key (base64).");
-            System.out.println("Usage2:  [password] [file1] [file2] etc...  Checks that all private keys are equal.");
-            System.out.println("Usage2 assumes that all files can be decrypted with the same password.");
+            System.out.println("Usage1:  [password] [file:private-key]"
+                + "      Prints decrypted PKCS8 key (base64).");
+            System.out.println("Usage2:  [password] [file1] [file2] etc..."
+                + "  Checks that all private keys are equal.");
+            System.out.println(
+                "Usage2 assumes that all files can be decrypted with the same password.");
         } else if (args.length == 1 || args.length == 2) {
             FileInputStream in = new FileInputStream(args[args.length - 1]);
             if (args.length == 2) {
@@ -1020,13 +1030,16 @@ public class PKCS8Key {
 
                     if (original == null) {
                         original = decrypted;
-                        System.out.println("   SUCCESS    \t" + type + "\t" + transform + "\t" + keySizeStr + "\t" + args[i]);
+                        System.out.println("   SUCCESS    \t" + type + "\t"
+                            + transform + "\t" + keySizeStr + "\t" + args[i]);
                     } else {
                         boolean identical = Arrays.equals(original, decrypted);
                         if (!identical) {
-                            System.out.println("***FAILURE*** \t" + type + "\t" + transform + "\t" + keySizeStr + "\t" + args[i]);
+                            System.out.println("***FAILURE*** \t" + type + "\t"
+                                + transform + "\t" + keySizeStr + "\t" + args[i]);
                         } else {
-                            System.out.println("   SUCCESS    \t" + type + "\t" + transform + "\t" + keySizeStr + "\t" + args[i]);
+                            System.out.println("   SUCCESS    \t" + type + "\t"
+                                + transform + "\t" + keySizeStr + "\t" + args[i]);
                         }
                     }
                 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/aad4a73e/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Ping.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Ping.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Ping.java
index 5603ce2..d22e41e 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Ping.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Ping.java
@@ -56,16 +56,26 @@ import java.util.TreeSet;
 public class Ping {
     protected static SortedSet args = new TreeSet();
     protected static Map argsMatch = new HashMap();
-    protected static final Arg ARG_TARGET = new Arg("-t", "--target", "[hostname[:port]]              default port=443", true);
-    protected static final Arg ARG_BIND = new Arg("-b", "--bind", "[hostname[:port]]              default port=0 \"ANY\"");
-    protected static final Arg ARG_PROXY = new Arg("-r", "--proxy", "[hostname[:port]]              default port=80");
-    protected static final Arg ARG_TRUST_CERT = new Arg("-tm", "--trust-cert", "[path to trust material]       {pem, der, crt, jks}");
-    protected static final Arg ARG_CLIENT_CERT = new Arg("-km", "--client-cert", "[path to client's private key] {jks, pkcs12, pkcs8}");
-    protected static final Arg ARG_CERT_CHAIN = new Arg("-cc", "--cert-chain", "[path to client's cert chain for pkcs8/OpenSSL key]");
-    protected static final Arg ARG_PASSWORD = new Arg("-p", "--password", "[client cert password]");
-    protected static final Arg ARG_HOST_HEADER = new Arg("-h", "--host-header", "[http-host-header]      in case -t is an IP address");
-    protected static final Arg ARG_PATH = new Arg("-u", "--path", "[path for GET/HEAD request]    default=/");
-    protected static final Arg ARG_METHOD = new Arg("-m", "--method", "[http method to use]           default=HEAD");
+    protected static final Arg ARG_TARGET = new Arg("-t", "--target",
+        "[hostname[:port]]              default port=443", true);
+    protected static final Arg ARG_BIND = new Arg("-b", "--bind",
+        "[hostname[:port]]              default port=0 \"ANY\"");
+    protected static final Arg ARG_PROXY = new Arg("-r", "--proxy",
+        "[hostname[:port]]              default port=80");
+    protected static final Arg ARG_TRUST_CERT = new Arg("-tm", "--trust-cert",
+        "[path to trust material]       {pem, der, crt, jks}");
+    protected static final Arg ARG_CLIENT_CERT = new Arg("-km", "--client-cert",
+        "[path to client's private key] {jks, pkcs12, pkcs8}");
+    protected static final Arg ARG_CERT_CHAIN = new Arg("-cc", "--cert-chain",
+        "[path to client's cert chain for pkcs8/OpenSSL key]");
+    protected static final Arg ARG_PASSWORD = new Arg("-p", "--password",
+        "[client cert password]");
+    protected static final Arg ARG_HOST_HEADER = new Arg("-h", "--host-header",
+        "[http-host-header]      in case -t is an IP address");
+    protected static final Arg ARG_PATH = new Arg("-u", "--path",
+        "[path for GET/HEAD request]    default=/");
+    protected static final Arg ARG_METHOD = new Arg("-m", "--method",
+        "[http method to use]           default=HEAD");
 
     private static HostPort target;
     private static HostPort local;

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/aad4a73e/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/TrustMaterial.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/TrustMaterial.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/TrustMaterial.java
index af98e1b..b002c3d 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/TrustMaterial.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/TrustMaterial.java
@@ -270,7 +270,7 @@ public class TrustMaterial extends TrustChain {
 
     protected boolean containsTrustAll() {
         boolean yes = this.simpleTrustType == SIMPLE_TRUST_TYPE_TRUST_ALL;
-        if ( !yes ) {
+        if (!yes) {
             yes = super.containsTrustAll();
         }
         return yes;

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/aad4a73e/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Version.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Version.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Version.java
index adf10f8..5ec4b2e 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Version.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Version.java
@@ -54,7 +54,8 @@ import java.util.jar.JarFile;
  * @since 14-Nov-2007
  */
 public class Version {
-    public static final String HEAD_URL = "$HeadURL: http://juliusdavies.ca/svn/not-yet-commons-ssl/tags/commons-ssl-0.3.16/src/java/org/apache/commons/ssl/Version.java $";
+    public static final String HEAD_URL = "$HeadURL: http://juliusdavies.ca/svn/not-yet-commons-ssl"
+        + "/tags/commons-ssl-0.3.16/src/java/org/apache/commons/ssl/Version.java $";
     public static final String VERSION;
     public static final String COMPILE_TIME;
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/aad4a73e/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestOpenSSL.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestOpenSSL.java b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestOpenSSL.java
index ebc2b45..c01a22c 100644
--- a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestOpenSSL.java
+++ b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestOpenSSL.java
@@ -126,14 +126,17 @@ public class TestOpenSSL {
                     try {
                         byte[] result = OpenSSL.decrypt(cipher, pwd, encrypted);
                         String s = new String(result, "ISO-8859-1");
-                        assertTrue(cipherPadded + "." + filePadded + " decrypts to 'Hello World!'", "Hello World!".equals(s));
+                        assertTrue(cipherPadded + "." + filePadded
+                            + " decrypts to 'Hello World!'", "Hello World!".equals(s));
                         return 1;
                     } catch (NoSuchAlgorithmException nsae) {
-                        System.out.println("Warn: " + cipherPadded + filePadded + " NoSuchAlgorithmException");
+                        System.out.println("Warn: " + cipherPadded + filePadded
+                            + " NoSuchAlgorithmException");
                         return 0;
                     } catch (ArithmeticException ae) {
                         if (cipherPadded.contains("cfb1")) {
-                            System.out.println("Warn: " + cipherPadded + filePadded + " BouncyCastle can't handle cfb1 " + ae);
+                            System.out.println("Warn: " + cipherPadded + filePadded
+                                + " BouncyCastle can't handle cfb1 " + ae);
                             return 0;
                         } else {
                             throw ae;