You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/11/26 18:53:10 UTC
(commons-crypto) branch master updated: Remove extra blank lines
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
The following commit(s) were added to refs/heads/master by this push:
new d11fa87a Remove extra blank lines
new 841548ad Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-crypto.git
d11fa87a is described below
commit d11fa87af3c60b242544fbff6d4fbd614d4b29aa
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Nov 26 13:52:43 2023 -0500
Remove extra blank lines
---
src/main/java/org/apache/commons/crypto/OpenSslInfoNative.java | 1 -
src/main/java/org/apache/commons/crypto/cipher/JceCipher.java | 2 --
src/main/java/org/apache/commons/crypto/cipher/OpenSsl.java | 1 -
src/main/java/org/apache/commons/crypto/cipher/OpenSslCipher.java | 2 --
.../java/org/apache/commons/crypto/cipher/OpenSslGaloisCounterMode.java | 1 -
src/main/java/org/apache/commons/crypto/utils/AES.java | 1 -
src/test/java/org/apache/commons/crypto/CryptoBenchmark.java | 1 -
src/test/java/org/apache/commons/crypto/NativeCodeLoaderTest.java | 1 -
src/test/java/org/apache/commons/crypto/cipher/AbstractCipherTest.java | 1 -
src/test/java/org/apache/commons/crypto/cipher/GcmCipherTest.java | 1 -
src/test/java/org/apache/commons/crypto/cipher/JceCipherTest.java | 1 -
src/test/java/org/apache/commons/crypto/cipher/OpenSslCipherTest.java | 2 --
.../java/org/apache/commons/crypto/jna/AbstractCipherJnaStreamTest.java | 1 -
src/test/java/org/apache/commons/crypto/jna/CryptoJnaBenchmark.java | 1 -
src/test/java/org/apache/commons/crypto/jna/CtrCryptoJnaStreamTest.java | 1 -
.../java/org/apache/commons/crypto/random/MissingPropertyCtrRandom.java | 1 -
src/test/java/org/apache/commons/crypto/random/OsCryptoRandomTest.java | 1 -
.../java/org/apache/commons/crypto/stream/input/ChannelInputTest.java | 1 -
.../java/org/apache/commons/crypto/stream/output/StreamOutputTest.java | 1 -
src/test/java/org/apache/commons/crypto/utils/UtilsTest.java | 1 -
20 files changed, 23 deletions(-)
diff --git a/src/main/java/org/apache/commons/crypto/OpenSslInfoNative.java b/src/main/java/org/apache/commons/crypto/OpenSslInfoNative.java
index b2e7487f..6d74c012 100644
--- a/src/main/java/org/apache/commons/crypto/OpenSslInfoNative.java
+++ b/src/main/java/org/apache/commons/crypto/OpenSslInfoNative.java
@@ -52,7 +52,6 @@ final class OpenSslInfoNative {
*/
public static native String NativeTimeStamp();
-
/**
* @return version of native
*/
diff --git a/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java b/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java
index 65b35ee7..1da723d3 100644
--- a/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java
+++ b/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java
@@ -187,7 +187,6 @@ final class JceCipher implements CryptoCipher {
.update(input, inputOffset, inputLen, output, outputOffset);
}
-
/**
* Continues a multiple-part encryption/decryption operation. The data is
* encrypted or decrypted, depending on how this cipher was initialized.
@@ -232,7 +231,6 @@ final class JceCipher implements CryptoCipher {
cipher.updateAAD(aad);
}
-
/**
* Continues a multi-part update of the Additional Authentication
* Data (AAD).
diff --git a/src/main/java/org/apache/commons/crypto/cipher/OpenSsl.java b/src/main/java/org/apache/commons/crypto/cipher/OpenSsl.java
index 6751faa3..430dcfed 100644
--- a/src/main/java/org/apache/commons/crypto/cipher/OpenSsl.java
+++ b/src/main/java/org/apache/commons/crypto/cipher/OpenSsl.java
@@ -243,7 +243,6 @@ final class OpenSsl {
return opensslBlockCipher.update(input, inputOffset, inputLen, output, outputOffset);
}
-
/**
* Updates a multiple-part encryption or decryption operation. The data is
* encrypted or decrypted, depending on how this cipher was initialized.
diff --git a/src/main/java/org/apache/commons/crypto/cipher/OpenSslCipher.java b/src/main/java/org/apache/commons/crypto/cipher/OpenSslCipher.java
index 0ef8fc00..14e43520 100644
--- a/src/main/java/org/apache/commons/crypto/cipher/OpenSslCipher.java
+++ b/src/main/java/org/apache/commons/crypto/cipher/OpenSslCipher.java
@@ -193,7 +193,6 @@ final class OpenSslCipher implements CryptoCipher {
.update(input, inputOffset, inputLen, output, outputOffset);
}
-
/**
* Continues a multiple-part encryption/decryption operation. The data is
* encrypted or decrypted, depending on how this openSslEngine was initialized.
@@ -249,7 +248,6 @@ final class OpenSslCipher implements CryptoCipher {
openSslEngine.updateAAD(aad);
}
-
/**
* Continues a multi-part update of the Additional Authentication
* Data (AAD).
diff --git a/src/main/java/org/apache/commons/crypto/cipher/OpenSslGaloisCounterMode.java b/src/main/java/org/apache/commons/crypto/cipher/OpenSslGaloisCounterMode.java
index 5ef211ba..5b472ef8 100644
--- a/src/main/java/org/apache/commons/crypto/cipher/OpenSslGaloisCounterMode.java
+++ b/src/main/java/org/apache/commons/crypto/cipher/OpenSslGaloisCounterMode.java
@@ -45,7 +45,6 @@ final class OpenSslGaloisCounterMode extends AbstractOpenSslFeedbackCipher {
private int tagBitLen = -1;
private static final int BITS_TO_BYTES_SHIFT_COUNT = 3; // >> 3 divides by 8 == Byte.SIZE
-
// buffer for storing input in decryption, not used for encryption
private ByteArrayOutputStream inBuffer;
diff --git a/src/main/java/org/apache/commons/crypto/utils/AES.java b/src/main/java/org/apache/commons/crypto/utils/AES.java
index bb83bdec..ada086a7 100644
--- a/src/main/java/org/apache/commons/crypto/utils/AES.java
+++ b/src/main/java/org/apache/commons/crypto/utils/AES.java
@@ -54,7 +54,6 @@ public class AES {
return new SecretKeySpec(key, ALGORITHM);
}
-
/**
* Constructs a new instance.
*
diff --git a/src/test/java/org/apache/commons/crypto/CryptoBenchmark.java b/src/test/java/org/apache/commons/crypto/CryptoBenchmark.java
index 70b9423d..327cadae 100644
--- a/src/test/java/org/apache/commons/crypto/CryptoBenchmark.java
+++ b/src/test/java/org/apache/commons/crypto/CryptoBenchmark.java
@@ -79,7 +79,6 @@ public class CryptoBenchmark extends AbstractBenchmark {
getRandom(RANDOM_OPENSSL);
}
-
@Benchmark
public void RandomCreateOS() throws Exception {
getRandom(RANDOM_OS);
diff --git a/src/test/java/org/apache/commons/crypto/NativeCodeLoaderTest.java b/src/test/java/org/apache/commons/crypto/NativeCodeLoaderTest.java
index baaf3945..780de58a 100644
--- a/src/test/java/org/apache/commons/crypto/NativeCodeLoaderTest.java
+++ b/src/test/java/org/apache/commons/crypto/NativeCodeLoaderTest.java
@@ -29,7 +29,6 @@ import java.nio.file.Path;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-
public class NativeCodeLoaderTest {
@Test
diff --git a/src/test/java/org/apache/commons/crypto/cipher/AbstractCipherTest.java b/src/test/java/org/apache/commons/crypto/cipher/AbstractCipherTest.java
index 94418d5e..44d318ba 100644
--- a/src/test/java/org/apache/commons/crypto/cipher/AbstractCipherTest.java
+++ b/src/test/java/org/apache/commons/crypto/cipher/AbstractCipherTest.java
@@ -17,7 +17,6 @@
*/
package org.apache.commons.crypto.cipher;
-
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/src/test/java/org/apache/commons/crypto/cipher/GcmCipherTest.java b/src/test/java/org/apache/commons/crypto/cipher/GcmCipherTest.java
index 62a73b24..34957af9 100644
--- a/src/test/java/org/apache/commons/crypto/cipher/GcmCipherTest.java
+++ b/src/test/java/org/apache/commons/crypto/cipher/GcmCipherTest.java
@@ -37,7 +37,6 @@ import org.apache.commons.crypto.utils.Utils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-
public class GcmCipherTest {
private static final String GCM_NO_PADDING = "AES/GCM/NoPadding";
diff --git a/src/test/java/org/apache/commons/crypto/cipher/JceCipherTest.java b/src/test/java/org/apache/commons/crypto/cipher/JceCipherTest.java
index edd300e3..8724286d 100644
--- a/src/test/java/org/apache/commons/crypto/cipher/JceCipherTest.java
+++ b/src/test/java/org/apache/commons/crypto/cipher/JceCipherTest.java
@@ -27,7 +27,6 @@ import javax.crypto.Cipher;
import org.apache.commons.crypto.utils.AES;
import org.junit.jupiter.api.BeforeAll;
-
public class JceCipherTest extends AbstractCipherTest {
private static final int MAX_KEY_LEN_LOWER_BOUND = 256;
diff --git a/src/test/java/org/apache/commons/crypto/cipher/OpenSslCipherTest.java b/src/test/java/org/apache/commons/crypto/cipher/OpenSslCipherTest.java
index e326ad71..e7ca7ea9 100644
--- a/src/test/java/org/apache/commons/crypto/cipher/OpenSslCipherTest.java
+++ b/src/test/java/org/apache/commons/crypto/cipher/OpenSslCipherTest.java
@@ -39,7 +39,6 @@ import org.apache.commons.crypto.utils.AES;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
-
public class OpenSslCipherTest extends AbstractCipherTest {
private ByteBuffer dummyBuffer() {
@@ -120,7 +119,6 @@ public class OpenSslCipherTest extends AbstractCipherTest {
final OpenSsl cipher = OpenSsl.getInstance(AES.CTR_NO_PADDING);
assertNotNull(cipher);
-
assertThrows(InvalidAlgorithmParameterException.class,
() -> cipher.init(OpenSsl.ENCRYPT_MODE, KEY, new GCMParameterSpec(IV.length, IV)));
}
diff --git a/src/test/java/org/apache/commons/crypto/jna/AbstractCipherJnaStreamTest.java b/src/test/java/org/apache/commons/crypto/jna/AbstractCipherJnaStreamTest.java
index 99e8d5fb..5e270c87 100644
--- a/src/test/java/org/apache/commons/crypto/jna/AbstractCipherJnaStreamTest.java
+++ b/src/test/java/org/apache/commons/crypto/jna/AbstractCipherJnaStreamTest.java
@@ -103,5 +103,4 @@ public abstract class AbstractCipherJnaStreamTest extends AbstractCipherStreamTe
doFieldGetterTest(CIPHER_OPENSSL_JNA, baos, true);
}
-
}
diff --git a/src/test/java/org/apache/commons/crypto/jna/CryptoJnaBenchmark.java b/src/test/java/org/apache/commons/crypto/jna/CryptoJnaBenchmark.java
index 9c73d938..41849527 100644
--- a/src/test/java/org/apache/commons/crypto/jna/CryptoJnaBenchmark.java
+++ b/src/test/java/org/apache/commons/crypto/jna/CryptoJnaBenchmark.java
@@ -45,7 +45,6 @@ public class CryptoJnaBenchmark extends AbstractBenchmark {
private static final String CIPHER_OPENSSL_JNA = OpenSslJna.getCipherClass().getName();
-
@Benchmark
public void CipherCreateOpensslJna() throws Exception {
getCipher(CIPHER_OPENSSL_JNA);
diff --git a/src/test/java/org/apache/commons/crypto/jna/CtrCryptoJnaStreamTest.java b/src/test/java/org/apache/commons/crypto/jna/CtrCryptoJnaStreamTest.java
index e82b1eef..917552cc 100644
--- a/src/test/java/org/apache/commons/crypto/jna/CtrCryptoJnaStreamTest.java
+++ b/src/test/java/org/apache/commons/crypto/jna/CtrCryptoJnaStreamTest.java
@@ -26,5 +26,4 @@ public class CtrCryptoJnaStreamTest extends AbstractCipherJnaStreamTest {
transformation = AES.CTR_NO_PADDING;
}
-
}
diff --git a/src/test/java/org/apache/commons/crypto/random/MissingPropertyCtrRandom.java b/src/test/java/org/apache/commons/crypto/random/MissingPropertyCtrRandom.java
index 33443b49..ca89a614 100644
--- a/src/test/java/org/apache/commons/crypto/random/MissingPropertyCtrRandom.java
+++ b/src/test/java/org/apache/commons/crypto/random/MissingPropertyCtrRandom.java
@@ -16,7 +16,6 @@
*/
package org.apache.commons.crypto.random;
-
final class MissingPropertyCtrRandom implements CryptoRandom {
/** Should fail with NoSuchMethodException (has no constructor with a Properties argument). */
diff --git a/src/test/java/org/apache/commons/crypto/random/OsCryptoRandomTest.java b/src/test/java/org/apache/commons/crypto/random/OsCryptoRandomTest.java
index 4cb742f2..a6a4fe1b 100644
--- a/src/test/java/org/apache/commons/crypto/random/OsCryptoRandomTest.java
+++ b/src/test/java/org/apache/commons/crypto/random/OsCryptoRandomTest.java
@@ -29,7 +29,6 @@ import java.util.Properties;
import org.junit.jupiter.api.Test;
-
public class OsCryptoRandomTest extends AbstractRandomTest {
@Override
diff --git a/src/test/java/org/apache/commons/crypto/stream/input/ChannelInputTest.java b/src/test/java/org/apache/commons/crypto/stream/input/ChannelInputTest.java
index 85c3c9c8..cd2686a9 100644
--- a/src/test/java/org/apache/commons/crypto/stream/input/ChannelInputTest.java
+++ b/src/test/java/org/apache/commons/crypto/stream/input/ChannelInputTest.java
@@ -26,7 +26,6 @@ import java.nio.channels.Channels;
import org.junit.jupiter.api.Test;
-
/**
* Tests {@link ChannelInput}.
*/
diff --git a/src/test/java/org/apache/commons/crypto/stream/output/StreamOutputTest.java b/src/test/java/org/apache/commons/crypto/stream/output/StreamOutputTest.java
index 6969868c..3275f3b5 100644
--- a/src/test/java/org/apache/commons/crypto/stream/output/StreamOutputTest.java
+++ b/src/test/java/org/apache/commons/crypto/stream/output/StreamOutputTest.java
@@ -25,7 +25,6 @@ import java.io.IOException;
import org.junit.jupiter.api.Test;
-
/**
* Tests {@link StreamOutput}.
*/
diff --git a/src/test/java/org/apache/commons/crypto/utils/UtilsTest.java b/src/test/java/org/apache/commons/crypto/utils/UtilsTest.java
index 33965f96..09ecaeac 100644
--- a/src/test/java/org/apache/commons/crypto/utils/UtilsTest.java
+++ b/src/test/java/org/apache/commons/crypto/utils/UtilsTest.java
@@ -26,7 +26,6 @@ import java.util.Properties;
import org.junit.jupiter.api.Test;
-
public class UtilsTest {
@Test
public void testGetProperties() {