log3

Author: kessplas

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

@@ -50,7 +50,6 @@ public void onNext(ByteBuffer byteBuffer) {
 
         if (amountToReadFromByteBuffer > 0) {
             byte[] buf = BinaryUtils.copyBytesFrom(byteBuffer, amountToReadFromByteBuffer);
-            System.out.println("updating cipher...");
             outputBuffer = cipher.update(buf, 0, amountToReadFromByteBuffer);
             if (outputBuffer == null || outputBuffer.length == 0) {
                 // The underlying data is too short to fill in the block cipher.

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

@@ -153,6 +153,7 @@ public void onStream(SdkPublisher<ByteBuffer> ciphertextPublisher) {
                 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:

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

@@ -138,6 +138,7 @@ 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,6 +132,7 @@ 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();