Reformatted Whitespaces/Comments

Author: ic0ns

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/pkcs1/oracles/Pkcs1Oracle.java

@@ -16,12 +16,14 @@
 
 /**
  * Oracle template for Bleichenbacher/Manger attack.
- * 
+ *
  * @version 0.1 Jun 12, 2012
  */
 public abstract class Pkcs1Oracle {
 
-    /** logger */
+    /**
+     * logger
+     */
     static Logger LOGGER = LogManager.getLogger(Pkcs1Oracle.class);
 
     /*
@@ -49,7 +51,7 @@ public abstract class Pkcs1Oracle {
 
     /**
      * Gets the blocksize of the encryption algorithm.
-     * 
+     *
      * @return Blocksize
      */
     public int getBlockSize() {
@@ -58,7 +60,7 @@ public int getBlockSize() {
 
     /**
      * Gets the total number of queries performed by this oracle.
-     * 
+     *
      * @return Number of queries
      */
     public long getNumberOfQueries() {
@@ -67,7 +69,7 @@ public long getNumberOfQueries() {
 
     /**
      * Gets the public key of this oracle.
-     * 
+     *
      * @return Public key
      */
     public PublicKey getPublicKey() {
@@ -76,17 +78,16 @@ public PublicKey getPublicKey() {
 
     /**
      * Checks for PKCS conformity - 00 02 padding 00 pms
-     * 
-     * @param msg
-     *            Encrypted message to check for conformity
+     *
+     * @param msg Encrypted message to check for conformity
      * @return True if PKCS conforming, else false
      */
     public abstract boolean checkPKCSConformity(final byte[] msg) throws OracleException;
 
     /**
      * Returns true if the oracle is a plaintext oracle (does not decrypt the
      * data received)
-     * 
+     *
      * @return isPlaintextOracle
      */
     public boolean isPlaintextOracle() {
@@ -95,7 +96,7 @@ public boolean isPlaintextOracle() {
 
     /**
      * Returns the oracle type
-     * 
+     *
      * @return
      */
     public OracleType getOracleType() {
@@ -108,12 +109,19 @@ public void resetNumberOfQueries() {
 
     /**
      * Oracle types defined in the Crypto'12 paper + specific oracles found
-     * during our research TTT checks only 0x00 0x02 ... FFF checks 0x00 0x02 on
-     * the beginning, the first 8 bytes cannot include 0x00 and the 0x00 byte
-     * has to be set on a correct position XMLENC checks if the key has a
-     * correct length (16, 24, or 32 bytes) BigIP checks only the second byte
-     * 0x02 (the first 0x00 byte is not checked at all) MANGER_0x00 checks only
-     * the first byte is equal to 0x00
+     * during our research
+     *
+     * TTT checks only 0x00 0x02 ...
+     *
+     * FFF checks 0x00 0x02 on the beginning, the first 8 bytes cannot include
+     * 0x00 and the 0x00 byte has to be set on a correct position
+     *
+     * XMLENC checks if the key has a correct length (16, 24, or 32 bytes)
+     *
+     * BigIP checks only the second byte 0x02 (the first 0x00 byte is not
+     * checked at all)
+     *
+     * MANGER_0x00 checks only the first byte is equal to 0x00
      */
     public enum OracleType {
 

Attacks/src/test/java/de/rub/nds/tlsattacker/attacks/pkcs1/oracles/TestPkcs1Oracle.java

@@ -143,8 +143,10 @@ private boolean checkThird(final byte[] msg) {
     }
 
     /**
-     * JSSE bug Plaintext oracle, for testing purposes: Example for 256/512 byte
-     * long RSA key: The oracle returns true if:
+     * JSSE bug Plaintext oracle, for testing purposes: 
+     * 
+     * Example for 256/512 byte long RSA key: 
+     * The oracle returns true if:
      * <ul>
      * <li>first two bytes are equal to 0x00 0x02</li>
      * <li>the following 8 bytes do not contain 0x00</li>

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/certificate/CertificateAdapter.java

@@ -14,7 +14,6 @@
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import org.bouncycastle.crypto.tls.Certificate;
 
-
 public class CertificateAdapter extends XmlAdapter<String, Certificate> {
 
     @Override

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/certificate/CertificateByteChooser.java

@@ -16,7 +16,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-
 public class CertificateByteChooser {
 
     protected static final Logger LOGGER = LogManager.getLogger(CertificateByteChooser.class.getName());

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/certificate/X509CertificateObjectAdapter.java

@@ -17,7 +17,6 @@
 import org.bouncycastle.crypto.tls.TlsUtils;
 import org.bouncycastle.jce.provider.X509CertificateObject;
 
-
 public class X509CertificateObjectAdapter extends XmlAdapter<String, X509CertificateObject> {
 
     @Override

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/Config.java

@@ -64,7 +64,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
 public class Config implements Serializable {

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/ConfigIO.java

@@ -13,7 +13,6 @@
 import java.io.OutputStream;
 import javax.xml.bind.JAXB;
 
-
 public class ConfigIO {
     public static void write(Config config, File f) {
         JAXB.marshal(config, f);

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/TLSDelegateConfig.java

@@ -18,7 +18,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-
 public abstract class TLSDelegateConfig {
 
     protected static final Logger LOGGER = LogManager.getLogger(TLSDelegateConfig.class.getName());

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/converters/ByteArrayConverter.java

@@ -12,7 +12,6 @@
 import com.beust.jcommander.ParameterException;
 import de.rub.nds.modifiablevariable.util.ArrayConverter;
 
-
 public class ByteArrayConverter implements IStringConverter<byte[]> {
 
     @Override

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/converters/SignatureAndHashAlgorithmConverter.java

@@ -14,7 +14,6 @@
 import de.rub.nds.tlsattacker.core.constants.SignatureAlgorithm;
 import de.rub.nds.tlsattacker.core.constants.SignatureAndHashAlgorithm;
 
-
 public class SignatureAndHashAlgorithmConverter implements IStringConverter<SignatureAndHashAlgorithm> {
 
     @Override