Skip to content

Commit 6411a40

Browse files
committed
Delete commented out code
1 parent 92df6e9 commit 6411a40

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

src/main/java/software/amazon/encryption/s3/S3EncryptionClient.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,13 @@ public PutObjectResponse putObject(PutObjectRequest putObjectRequest, RequestBod
7676
final Cipher cipher;
7777
try {
7878
cipher = Cipher.getInstance(contentEncryptionAlgorithm);
79-
//GCMParameterSpec defaultSpec = cipher.getParameters().getParameterSpec(GCMParameterSpec.class);
8079
cipher.init(Cipher.ENCRYPT_MODE, contentKey, new GCMParameterSpec(128, iv));
8180
} catch (NoSuchAlgorithmException
8281
| NoSuchPaddingException
8382
| InvalidAlgorithmParameterException
8483
| InvalidKeyException e) {
8584
throw new RuntimeException(e);
86-
}/* catch (InvalidParameterSpecException e) {
87-
throw new RuntimeException(e);
88-
}*/
85+
}
8986

9087
byte[] ciphertext;
9188
try {

src/main/java/software/amazon/encryption/s3/materials/DecryptionMaterials.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ final public class DecryptionMaterials {
1717

1818
private final byte[] _plaintextDataKey;
1919

20-
// Unused in here since signing is not supported
21-
// private final byte[] _signingKey;
22-
23-
2420
private DecryptionMaterials(Builder builder) {
2521
this._algorithmSuite = builder._algorithmSuite;
2622
this._encryptionContext = builder._encryptionContext;

src/main/java/software/amazon/encryption/s3/materials/EncryptionMaterials.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
final public class EncryptionMaterials {
1111

1212
// Identifies what sort of crypto algorithms we want to use
13-
// In ESDK, this is an enum
1413
private final AlgorithmSuite _algorithmSuite;
1514

1615
// Additional information passed into encrypted that is required on decryption as well
@@ -20,10 +19,6 @@ final public class EncryptionMaterials {
2019
private final List<EncryptedDataKey> _encryptedDataKeys;
2120
private final byte[] _plaintextDataKey;
2221

23-
// Unused in here since signing is not supported
24-
// private final byte[] _signingKey;
25-
26-
2722
private EncryptionMaterials(Builder builder) {
2823
this._algorithmSuite = builder._algorithmSuite;
2924
this._encryptionContext = builder._encryptionContext;

0 commit comments

Comments
 (0)