remove logging, redundant code

Author: kessplas

src/examples/java/software/amazon/encryption/s3/examples/MultipartUploadExample.java

@@ -85,7 +85,6 @@ public static void LowLevelMultipartUpload() throws IOException {
 
         // Process and Upload each part
         while ((bytesRead = inputStream.read(partData, 0, partData.length)) != -1) {
-            System.out.println("part no: " + partsSent);
             outputStream.write(partData, 0, bytesRead);
             if (bytesSent < PART_SIZE) {
                 bytesSent += bytesRead;
@@ -104,7 +103,6 @@ public static void LowLevelMultipartUpload() throws IOException {
             final InputStream partInputStream = new ByteArrayInputStream(outputStream.toByteArray());
 
             // Upload all the different parts of the object
-            System.out.println("uploading part no: " + uploadPartRequest.partNumber());
             UploadPartResponse uploadPartResult = v3Client.uploadPart(uploadPartRequest,
                     RequestBody.fromInputStream(partInputStream, partInputStream.available()));
 
@@ -133,7 +131,6 @@ public static void LowLevelMultipartUpload() throws IOException {
 
         // Upload the last part multipart upload to invoke `cipher.doFinal()`
         final InputStream partInputStream = new ByteArrayInputStream(outputStream.toByteArray());
-        System.out.println("uploading FINAL part no: " + uploadPartRequest.partNumber());
         UploadPartResponse uploadPartResult = v3Client.uploadPart(uploadPartRequest,
                 RequestBody.fromInputStream(partInputStream, partInputStream.available()));
 
@@ -144,15 +141,13 @@ public static void LowLevelMultipartUpload() throws IOException {
 
         // Finally call completeMultipartUpload operation to tell S3 to merge all uploaded
         // parts and finish the multipart operation.
-        System.out.println("completing MPU");
         v3Client.completeMultipartUpload(builder -> builder
                 .bucket(BUCKET)
                 .key(objectKey)
                 .uploadId(initiateResult.uploadId())
                 .multipartUpload(partBuilder -> partBuilder.parts(partETags)));
 
         // Call getObject to retrieve and decrypt the object from S3
-        System.out.println("GetObject follows");
         ResponseInputStream<GetObjectResponse> output = v3Client.getObject(builder -> builder
                 .bucket(BUCKET)
                 .key(objectKey));

src/main/java/software/amazon/encryption/s3/internal/CipherProvider.java

@@ -30,7 +30,6 @@ public CipherProvider(final CryptographicMaterialsManager cmm) {
      * @return a Cipher object, initialized and ready to use
      */
     public static Cipher createAndInitCipher(final CryptographicMaterials materials, byte[] iv) {
-        System.out.println("creating a cipher.");
         // Validate that the IV has been populated. There is a small chance
         // that an IV containing only 0s is (validly) randomly generated,
         // but the tradeoff is worth the protection, and an IV of 0s is
@@ -42,7 +41,6 @@ public static Cipher createAndInitCipher(final CryptographicMaterials materials,
             Cipher cipher = CryptoFactory.createCipher(materials.algorithmSuite().cipherName(), materials.cryptoProvider());
             switch (materials.algorithmSuite()) {
                 case ALG_AES_256_GCM_IV12_TAG16_NO_KDF:
-                    System.out.println("initting a GCM cipher");
                     cipher.init(materials.cipherMode().opMode(), materials.dataKey(), new GCMParameterSpec(materials.algorithmSuite().cipherTagLengthBits(), iv));
                     break;
                 case ALG_AES_256_CTR_IV16_TAG16_NO_KDF:

src/main/java/software/amazon/encryption/s3/internal/CipherSubscriber.java

@@ -25,7 +25,6 @@ public class CipherSubscriber implements Subscriber<ByteBuffer> {
     private byte[] outputBuffer;
 
     CipherSubscriber(Subscriber<? super ByteBuffer> wrappedSubscriber, Long contentLength, CryptographicMaterials materials, byte[] iv, boolean isLastPart) {
-        System.out.println("Initializing CipherSubscriber. It is " + (isLastPart ? "infact" : "NOT") + " the last part!");
         this.wrappedSubscriber = wrappedSubscriber;
         this.contentLength = contentLength;
         this.materials = materials;
@@ -102,7 +101,6 @@ public void onComplete() {
             return;
         }
         try {
-            System.out.println("Doing final!");
             outputBuffer = cipher.doFinal();
             // Send the final bytes to the wrapped subscriber
             wrappedSubscriber.onNext(ByteBuffer.wrap(outputBuffer));

src/main/java/software/amazon/encryption/s3/internal/GetEncryptedObjectPipeline.java

@@ -138,25 +138,10 @@ public void onStream(SdkPublisher<ByteBuffer> ciphertextPublisher) {
             long[] desiredRange = RangedGetUtils.getRange(materials.getContentRange());
             long[] cryptoRange = RangedGetUtils.getCryptoRange(materials.getContentRange());
             AlgorithmSuite algorithmSuite = materials.algorithmSuite();
-//            SecretKey contentKey = materials.dataKey();
-//            final int tagLength = algorithmSuite.cipherTagLengthBits();
             byte[] iv = contentMetadata.contentIv();
             if (algorithmSuite == AlgorithmSuite.ALG_AES_256_CTR_IV16_TAG16_NO_KDF) {
                 iv = AesCtrUtils.adjustIV(iv, cryptoRange[0]);
             }
-            //                final Cipher cipher = CryptoFactory.createCipher(algorithmSuite.cipherName(), materials.cryptoProvider());
-            switch (algorithmSuite) {
-                case ALG_AES_256_GCM_IV12_TAG16_NO_KDF:
-                    System.out.println("initting a GCM cipher for decrypt...");
-//                        cipher.init(Cipher.DECRYPT_MODE, contentKey, new GCMParameterSpec(tagLength, iv));
-                    break;
-                case ALG_AES_256_CTR_IV16_TAG16_NO_KDF:
-                case ALG_AES_256_CBC_IV16_NO_KDF:
-//                        cipher.init(Cipher.DECRYPT_MODE, contentKey, new IvParameterSpec(iv));
-                    break;
-                default:
-                    throw new S3EncryptionClientException("Unknown algorithm: " + algorithmSuite.cipherName());
-            }
 
             if (algorithmSuite.equals(AlgorithmSuite.ALG_AES_256_CBC_IV16_NO_KDF)
                     || algorithmSuite.equals(AlgorithmSuite.ALG_AES_256_CTR_IV16_TAG16_NO_KDF)

src/main/java/software/amazon/encryption/s3/internal/MultipartUploadMaterials.java

@@ -43,7 +43,6 @@ private MultipartUploadMaterials(Builder builder) {
         this._cryptoProvider = builder._cryptoProvider;
         this._plaintextLength = builder._plaintextLength;
         this._cipher = builder._cipher;
-        System.out.println("initializing upload materials");
     }
 
     static public Builder builder() {
@@ -74,7 +73,6 @@ public final void setHasFinalPartBeenSeen(boolean hasFinalPartBeenSeen) {
      */
     @Override
     public Cipher getCipher(byte[] iv) {
-        System.out.println("returning cipher");
         if (!Arrays.equals(iv, _cipher.getIV())) {
             throw new S3EncryptionClientException("IVs in MultipartUploadMaterials do not match!");
         }

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

@@ -138,7 +138,6 @@ public byte[] decryptDataKey(DecryptionMaterials materials, byte[] encryptedData
 
             GCMParameterSpec gcmParameterSpec = new GCMParameterSpec(TAG_LENGTH_BITS, iv);
             final Cipher cipher = CryptoFactory.createCipher(CIPHER_ALGORITHM, materials.cryptoProvider());
-            System.out.println("aes keyring cipher - shouldn't happen..");
             cipher.init(Cipher.DECRYPT_MODE, _wrappingKey, gcmParameterSpec);
 
             final byte[] aADBytes = AlgorithmSuite.ALG_AES_256_GCM_IV12_TAG16_NO_KDF.cipherName().getBytes(StandardCharsets.UTF_8);

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

@@ -132,7 +132,6 @@ public byte[] encryptDataKey(SecureRandom secureRandom,
         @Override
         public byte[] decryptDataKey(DecryptionMaterials materials, byte[] encryptedDataKey) throws GeneralSecurityException {
             final Cipher cipher = CryptoFactory.createCipher(CIPHER_ALGORITHM, materials.cryptoProvider());
-            System.out.println("rsa keyring cipher - shouldn't happen..");
             cipher.init(Cipher.UNWRAP_MODE, _partialRsaKeyPair.getPrivateKey(), OAEP_PARAMETER_SPEC);
 
             String dataKeyAlgorithm = materials.algorithmSuite().dataKeyAlgorithm();