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 2026/01/04 17:35:38 UTC
(commons-crypto) branch master updated (18d78e07 -> 6ab9f416)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
from 18d78e07 Bump actions/upload-artifact from 5.0.0 to 6.0.0 (#516)
new 5961b7c7 Use a code comment, not Javadoc inside a method
new 469466ab Use a code comment, not Javadoc inside a method
new 7a7b9310 Javadoc
new 194404f6 Use a code comment, not Javadoc inside a method
new 6ab9f416 Javadoc
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/org/apache/commons/crypto/Crypto.java | 1 +
.../apache/commons/crypto/stream/CtrCryptoInputStream.java | 11 ++++++-----
.../apache/commons/crypto/stream/CtrCryptoOutputStream.java | 11 ++++++-----
.../commons/crypto/stream/PositionedCryptoInputStream.java | 10 +++++-----
.../java/org/apache/commons/crypto/stream/input/Input.java | 1 +
.../org/apache/commons/crypto/cipher/AbstractCipherTest.java | 2 +-
6 files changed, 20 insertions(+), 16 deletions(-)
(commons-crypto) 04/05: Use a code comment, not Javadoc inside a method
Posted by gg...@apache.org.
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
commit 194404f6d515d2b6af8a57beaf3337d5cbc2794b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jan 4 12:35:09 2026 -0500
Use a code comment, not Javadoc inside a method
---
.../org/apache/commons/crypto/stream/CtrCryptoInputStream.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/crypto/stream/CtrCryptoInputStream.java b/src/main/java/org/apache/commons/crypto/stream/CtrCryptoInputStream.java
index 3d21cd99..b8e018ec 100644
--- a/src/main/java/org/apache/commons/crypto/stream/CtrCryptoInputStream.java
+++ b/src/main/java/org/apache/commons/crypto/stream/CtrCryptoInputStream.java
@@ -368,11 +368,11 @@ protected void decryptBuffer(final ByteBuffer out) throws IOException {
try {
final int n = cipher.update(inBuffer, out);
if (n < inputSize) {
- /**
- * Typically code will not get here. CryptoCipher#update will
- * consume all input data and put result in outBuffer.
- * CryptoCipher#doFinal will reset the cipher context.
- */
+ //
+ // Typically code will not get here. CryptoCipher#update will
+ // consume all input data and put result in outBuffer.
+ // CryptoCipher#doFinal will reset the cipher context.
+ //
cipher.doFinal(inBuffer, out);
cipherReset = true;
}
(commons-crypto) 02/05: Use a code comment, not Javadoc inside a method
Posted by gg...@apache.org.
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
commit 469466ab4366d163eedd6aebfc0f1131c9bae808
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jan 4 12:32:47 2026 -0500
Use a code comment, not Javadoc inside a method
---
.../apache/commons/crypto/stream/CtrCryptoOutputStream.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/crypto/stream/CtrCryptoOutputStream.java b/src/main/java/org/apache/commons/crypto/stream/CtrCryptoOutputStream.java
index 5af402dd..9a18d9aa 100644
--- a/src/main/java/org/apache/commons/crypto/stream/CtrCryptoOutputStream.java
+++ b/src/main/java/org/apache/commons/crypto/stream/CtrCryptoOutputStream.java
@@ -309,11 +309,11 @@ private void encryptBuffer(final ByteBuffer out) throws IOException {
try {
final int n = cipher.update(inBuffer, out);
if (n < inputSize) {
- /**
- * Typically code will not get here. CryptoCipher#update will
- * consume all input data and put result in outBuffer.
- * CryptoCipher#doFinal will reset the cipher context.
- */
+ //
+ // Typically code will not get here. CryptoCipher#update will
+ // consume all input data and put result in outBuffer.
+ // CryptoCipher#doFinal will reset the cipher context.
+ //
cipher.doFinal(inBuffer, out);
cipherReset = true;
}
(commons-crypto) 01/05: Use a code comment, not Javadoc inside a method
Posted by gg...@apache.org.
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
commit 5961b7c750f8a0e2cdfeb7aa0c48b60afee81a60
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jan 4 12:31:41 2026 -0500
Use a code comment, not Javadoc inside a method
---
.../commons/crypto/stream/PositionedCryptoInputStream.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/crypto/stream/PositionedCryptoInputStream.java b/src/main/java/org/apache/commons/crypto/stream/PositionedCryptoInputStream.java
index ad9eb468..8f5f6acb 100644
--- a/src/main/java/org/apache/commons/crypto/stream/PositionedCryptoInputStream.java
+++ b/src/main/java/org/apache/commons/crypto/stream/PositionedCryptoInputStream.java
@@ -256,11 +256,11 @@ private void decryptBuffer(final CipherState state, final ByteBuffer inByteBuffe
try {
final int n = state.getCryptoCipher().update(inByteBuffer, outByteBuffer);
if (n < inputSize) {
- /**
- * Typically code will not get here. CryptoCipher#update will
- * consume all input data and put result in outBuffer.
- * CryptoCipher#doFinal will reset the cipher context.
- */
+ //
+ // Typically code will not get here. CryptoCipher#update will
+ // consume all input data and put result in outBuffer.
+ // CryptoCipher#doFinal will reset the cipher context.
+ //
state.getCryptoCipher().doFinal(inByteBuffer, outByteBuffer);
state.reset(true);
}
(commons-crypto) 03/05: Javadoc
Posted by gg...@apache.org.
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
commit 7a7b9310e2842ba3c216f3ccb8b2c910dd9c9086
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jan 4 12:32:57 2026 -0500
Javadoc
---
src/test/java/org/apache/commons/crypto/cipher/AbstractCipherTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 291b23b7..8d225fa2 100644
--- a/src/test/java/org/apache/commons/crypto/cipher/AbstractCipherTest.java
+++ b/src/test/java/org/apache/commons/crypto/cipher/AbstractCipherTest.java
@@ -235,10 +235,10 @@ void testCloseTestRepeat() throws Exception {
}
}
+ /** Uses the small data set in {@link TestData}. */
@Test
void testCryptoTest() throws Exception {
for (final String tran : transformations) {
- /** Uses the small data set in {@link TestData} */
cipherTests = TestData.getTestData(tran);
assertNotNull(cipherTests, "TestData cannot supply data for: " + tran);
for (int i = 0; i != cipherTests.length; i += 5) {
(commons-crypto) 05/05: Javadoc
Posted by gg...@apache.org.
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
commit 6ab9f41692cceece96b46ef62f9d1545faacfa85
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jan 4 12:35:32 2026 -0500
Javadoc
Add an empty line before a Javadoc comment
---
src/main/java/org/apache/commons/crypto/Crypto.java | 1 +
src/main/java/org/apache/commons/crypto/stream/CtrCryptoInputStream.java | 1 +
.../java/org/apache/commons/crypto/stream/CtrCryptoOutputStream.java | 1 +
src/main/java/org/apache/commons/crypto/stream/input/Input.java | 1 +
4 files changed, 4 insertions(+)
diff --git a/src/main/java/org/apache/commons/crypto/Crypto.java b/src/main/java/org/apache/commons/crypto/Crypto.java
index 67125e31..882dd9c9 100644
--- a/src/main/java/org/apache/commons/crypto/Crypto.java
+++ b/src/main/java/org/apache/commons/crypto/Crypto.java
@@ -106,6 +106,7 @@ private static Properties getComponentProperties() {
/** Default name for loading SSL crypto library using JNA */
public static final String JNA_LIBRARY_NAME_DEFAULT = "crypto";
+
/**
* Name for loading SSL crypto library using dlopen on macOS
* JNA automatically adds prefix and suffix; dlopen does not
diff --git a/src/main/java/org/apache/commons/crypto/stream/CtrCryptoInputStream.java b/src/main/java/org/apache/commons/crypto/stream/CtrCryptoInputStream.java
index b8e018ec..d7a45ff2 100644
--- a/src/main/java/org/apache/commons/crypto/stream/CtrCryptoInputStream.java
+++ b/src/main/java/org/apache/commons/crypto/stream/CtrCryptoInputStream.java
@@ -50,6 +50,7 @@
* The underlying stream offset is maintained as state. It is not thread-safe.
*/
public class CtrCryptoInputStream extends CryptoInputStream {
+
/**
* <p>
* This method is only for Counter (CTR) mode. Generally the CryptoCipher
diff --git a/src/main/java/org/apache/commons/crypto/stream/CtrCryptoOutputStream.java b/src/main/java/org/apache/commons/crypto/stream/CtrCryptoOutputStream.java
index 9a18d9aa..6f0270ac 100644
--- a/src/main/java/org/apache/commons/crypto/stream/CtrCryptoOutputStream.java
+++ b/src/main/java/org/apache/commons/crypto/stream/CtrCryptoOutputStream.java
@@ -54,6 +54,7 @@
* </p>
*/
public class CtrCryptoOutputStream extends CryptoOutputStream {
+
/**
* Underlying stream offset.
*/
diff --git a/src/main/java/org/apache/commons/crypto/stream/input/Input.java b/src/main/java/org/apache/commons/crypto/stream/input/Input.java
index 007abb25..4a500c1f 100644
--- a/src/main/java/org/apache/commons/crypto/stream/input/Input.java
+++ b/src/main/java/org/apache/commons/crypto/stream/input/Input.java
@@ -33,6 +33,7 @@
* {@link ReadableByteChannel}.
*/
public interface Input extends Closeable {
+
/**
* Returns an estimate of the number of bytes that can be read (or skipped
* over) from this input without blocking by the next invocation of a method