Enforce checkstyle EmptyLineSeparator rule

This update changes whitespace associated with empty lines for
enhanced readability.

Signed-off-by: Jason Katonica <[email protected]>

Author: jasonkatonica

checkstyle.xml

@@ -21,6 +21,10 @@
         <property name="fileExtensions" value="java"/>
         <module name="AvoidStarImport"/>
         <module name="EmptyBlock"/>
+        <module name="EmptyLineSeparator">
+            <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/>
+            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+        </module>
         <module name="GenericWhitespace"/>
         <module name="ImportOrder"/>
         <module name="Indentation">

src/main/java/com/ibm/crypto/plus/provider/AESCCMCipher.java

@@ -684,7 +684,6 @@ protected void engineUpdateAAD(byte[] src, int offset, int len) {
                     "AAD must be supplied before encryption/decryption starts");
         }
 
-
         if (this.authData == null) {
             this.authData = new byte[len];
             System.arraycopy(src, offset, authData, 0, len);

src/main/java/com/ibm/crypto/plus/provider/AESGCMCipher.java

@@ -186,7 +186,6 @@ protected byte[] engineDoFinal(byte[] input, int inputOffset, int inputLen)
                 // OCKDebug.Msg(debPrefix, methodName, "OCKException encountered = " +
                 // e.getMessage());
 
-
                 if (!encrypting) {
                     AEADBadTagException abte = new AEADBadTagException(
                             "Unable to perform engine doFinal; "
@@ -294,7 +293,6 @@ protected int engineDoFinal(byte[] input, int inputOffset, int inputLen, byte[]
                 //
                 //requireReinit = true;
 
-
                 if (!encrypting) {
                     AEADBadTagException abte = new AEADBadTagException(e.getMessage());
                     provider.setOCKExceptionCause(abte, e);
@@ -391,8 +389,6 @@ protected int engineDoFinal(byte[] input, int inputOffset, int inputLen, byte[]
             resetVars(true);
             throw provider.providerException("Failure in engineDoFinal", e);
         }
-
-
     }
 
     private byte[] doFinalForUpdates(byte[] input, int inputOffset, int inputLen)
@@ -983,7 +979,6 @@ protected int doUpdate(byte[] input, int inputOffset, int inputLen, byte[] outpu
 
         // Check for IV and Key.
 
-
         // OCKDebug.Msg(debPrefix, methodName, "is length greater than 0 " + len);
         try {
             // first do Init And AAED
@@ -1115,7 +1110,6 @@ protected int doUpdate(byte[] input, int inputOffset, int inputLen, byte[] outpu
                             // output, outputOffset);
                         } else {
 
-
                             outLen += GCMCipher.do_GCM_UpdForUpdateEncrypt(ockContext, Key.getValue(), IV,
                                     tagLenInBytes, input, inputOffset, inputConsumed, output,
                                     outputOffset, authData, provider);
@@ -1342,8 +1336,6 @@ private byte[] prepareInputBuffer(byte[] input, int inputOffset, int inputLen, b
         int len = Math.addExact(buffered, inputLen);
         //OCKDebug.Msg(debPrefix, methodName,"buffered=" + buffered + "inputLen=" + inputLen + "len=" +  len);
 
-
-
         /*
          * prepare the final input, assemble a new buffer if any
          * of the following is true:

src/main/java/com/ibm/crypto/plus/provider/AESKeyWrapCipher.java

@@ -356,6 +356,7 @@ private boolean checkKeySize(int keySize) {
         }
         return true;
     }
+
     public static final class KW extends AESKeyWrapCipher {
 
         public KW(OpenJCEPlusProvider provider) {

src/main/java/com/ibm/crypto/plus/provider/CurveUtil.java

@@ -24,12 +24,16 @@ public enum CURVE {
         X25519, X448, FFDHE2048, FFDHE3072, FFDHE4096, FFDHE6144, FFDHE8192
     }
 
-    private static final Map<CURVE, Integer> curveSizes = new HashMap<CURVE, Integer>(); // key sizes of curves in bytes
-    private static final Map<CURVE, Integer> DEREncodingSizes = new HashMap<CURVE, Integer>(); // key sizes of der encoded private key values.
-    private static final Map<Integer, CURVE> sizesToCurves = new HashMap<Integer, CURVE>(); // maps the total key size (I think?)
-                                                                                          // to algorithm (used in constructor)
-    static {
+    // key sizes of curves in bytes
+    private static final Map<CURVE, Integer> curveSizes = new HashMap<CURVE, Integer>();
+
+    // key sizes of der encoded private key values.
+    private static final Map<CURVE, Integer> DEREncodingSizes = new HashMap<CURVE, Integer>();
 
+    // maps the total key size (I think?) to algorithm (used in constructor)
+    private static final Map<Integer, CURVE> sizesToCurves = new HashMap<Integer, CURVE>();
+
+    static {
         curveSizes.put(CURVE.X25519, 32);
         curveSizes.put(CURVE.X448, 56);
         curveSizes.put(CURVE.FFDHE2048, 256);

src/main/java/com/ibm/crypto/plus/provider/DHKeyAgreement.java

@@ -155,7 +155,6 @@ protected byte[] engineGenerateSecret() throws IllegalStateException {
             throw ise;
         }
 
-
         // Make the computed secert compatible with  IBMJCE provider
         BigInteger modulus = init_p;
         int expectedLen = (modulus.bitLength() + 7) >>> 3;
@@ -185,8 +184,6 @@ protected byte[] engineGenerateSecret() throws IllegalStateException {
             }
             return result;
         }
-
-
     }
 
     @Override

src/main/java/com/ibm/crypto/plus/provider/DHPrivateKey.java

@@ -242,8 +242,6 @@ private byte[] buildOCKPrivateKeyBytes() throws IOException {
         } finally {
             closeStream(asn1Key);
         }
-
-
     }
 
     protected void parseKeyBits() throws IOException {

src/main/java/com/ibm/crypto/plus/provider/DHPublicKey.java

@@ -190,7 +190,6 @@ private byte[] convertOCKPublicKeyBytes(byte[] encodedKey) throws IOException {
                 throw new IOException("Extra parameter data");
             }
 
-
             /*
              * Parse the key
              */

src/main/java/com/ibm/crypto/plus/provider/DSASignature.java

@@ -151,6 +151,7 @@ public SHA256withDSA(OpenJCEPlusProvider provider) {
             super(provider, "SHA256"); // OCK digest name
         }
     }
+
     // nested static class for the SHA3_224withDSA implementation
     public static final class SHA3_224withDSA extends DSASignature {
         public SHA3_224withDSA(OpenJCEPlusProvider provider) {
@@ -164,6 +165,7 @@ public SHA3_256withDSA(OpenJCEPlusProvider provider) {
             super(provider, "SHA3-256"); // OCK digest name
         }
     }
+
     // nested static class for the SHA3_384withDSA implementation
     public static final class SHA3_384withDSA extends DSASignature {
         public SHA3_384withDSA(OpenJCEPlusProvider provider) {

src/main/java/com/ibm/crypto/plus/provider/ECDSASignature.java

@@ -186,6 +186,7 @@ public SHA512withECDSA(OpenJCEPlusProvider provider) {
             super(provider, "SHA512");
         }
     }
+
     // nested static class for the SHA3_224withECDSA implementation
     public static final class SHA3_224withECDSA extends ECDSASignature {
         public SHA3_224withECDSA(OpenJCEPlusProvider provider) {