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 2022/12/12 12:53:10 UTC
[commons-crypto] 02/02: Normalize package-private abstract class name
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 be349edf90bdcbd828c551f86e014ad0f8467cc3
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Dec 12 07:53:04 2022 -0500
Normalize package-private abstract class name
---
...{OpenSslFeedbackCipher.java => AbstractOpenSslFeedbackCipher.java} | 4 ++--
src/main/java/org/apache/commons/crypto/cipher/OpenSsl.java | 2 +-
src/main/java/org/apache/commons/crypto/cipher/OpenSslCommonMode.java | 2 +-
.../org/apache/commons/crypto/cipher/OpenSslGaloisCounterMode.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/commons/crypto/cipher/OpenSslFeedbackCipher.java b/src/main/java/org/apache/commons/crypto/cipher/AbstractOpenSslFeedbackCipher.java
similarity index 94%
rename from src/main/java/org/apache/commons/crypto/cipher/OpenSslFeedbackCipher.java
rename to src/main/java/org/apache/commons/crypto/cipher/AbstractOpenSslFeedbackCipher.java
index 3eed438..8abbf56 100644
--- a/src/main/java/org/apache/commons/crypto/cipher/OpenSslFeedbackCipher.java
+++ b/src/main/java/org/apache/commons/crypto/cipher/AbstractOpenSslFeedbackCipher.java
@@ -30,7 +30,7 @@ import org.apache.commons.crypto.utils.Utils;
/**
* This class represents a block cipher in one of its modes.
*/
-abstract class OpenSslFeedbackCipher {
+abstract class AbstractOpenSslFeedbackCipher {
protected long context;
protected final int algorithmMode;
@@ -38,7 +38,7 @@ abstract class OpenSslFeedbackCipher {
protected int cipherMode = OpenSsl.DECRYPT_MODE;
- OpenSslFeedbackCipher(final long context, final int algorithmMode, final int padding) {
+ AbstractOpenSslFeedbackCipher(final long context, final int algorithmMode, final int padding) {
this.context = context;
this.algorithmMode = algorithmMode;
this.padding = padding;
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 415677e..1906719 100644
--- a/src/main/java/org/apache/commons/crypto/cipher/OpenSsl.java
+++ b/src/main/java/org/apache/commons/crypto/cipher/OpenSsl.java
@@ -43,7 +43,7 @@ final class OpenSsl {
public static final int ENCRYPT_MODE = 1;
public static final int DECRYPT_MODE = 0;
- private final OpenSslFeedbackCipher opensslBlockCipher;
+ private final AbstractOpenSslFeedbackCipher opensslBlockCipher;
/** Currently only support AES/CTR/NoPadding. */
private enum AlgorithmMode {
diff --git a/src/main/java/org/apache/commons/crypto/cipher/OpenSslCommonMode.java b/src/main/java/org/apache/commons/crypto/cipher/OpenSslCommonMode.java
index 4102b6e..dea4412 100644
--- a/src/main/java/org/apache/commons/crypto/cipher/OpenSslCommonMode.java
+++ b/src/main/java/org/apache/commons/crypto/cipher/OpenSslCommonMode.java
@@ -31,7 +31,7 @@ import javax.crypto.spec.IvParameterSpec;
* <p>
* It will call the OpenSSL API to implement encryption/decryption
*/
-class OpenSslCommonMode extends OpenSslFeedbackCipher {
+class OpenSslCommonMode extends AbstractOpenSslFeedbackCipher {
OpenSslCommonMode(final long context, final int algorithmMode, final int padding) {
super(context, algorithmMode, padding);
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 9abe02e..42394f2 100644
--- a/src/main/java/org/apache/commons/crypto/cipher/OpenSslGaloisCounterMode.java
+++ b/src/main/java/org/apache/commons/crypto/cipher/OpenSslGaloisCounterMode.java
@@ -36,7 +36,7 @@ import javax.crypto.spec.GCMParameterSpec;
*
* @since 1.1
*/
-class OpenSslGaloisCounterMode extends OpenSslFeedbackCipher {
+class OpenSslGaloisCounterMode extends AbstractOpenSslFeedbackCipher {
// buffer for AAD data; if consumed, set as null
private ByteArrayOutputStream aadBuffer = new ByteArrayOutputStream();