Merge remote-tracking branch 'origin/enhance-fips-tests' into enhance-fips-tests

Author: mkleene

cmdline/src/main/resources/log4j2.xml

@@ -9,9 +9,6 @@
         <Root level="trace">
             <AppenderRef ref="Console"/>
         </Root>
-        <Logger name="io.opentdf.platform" level="trace" additivity="false">
-            <AppenderRef ref="Console" />
-        </Logger>
         <Logger name="io.grpc.netty" level="error" additivity="false">
             <AppenderRef ref="Console" />
         </Logger>

sdk/src/main/java/io/opentdf/platform/sdk/TDF.java

@@ -58,8 +58,6 @@ private static byte[] tdfECKeySaltCompute() {
 
     private final SDK.Services services;
 
-    private static final Logger LOG = LoggerFactory.getLogger(TDF.class);
-
     /**
      * Constructs a new TDF instance using the default maximum input size defined by
      * MAX_TDF_INPUT_SIZE.
@@ -299,7 +297,6 @@ public Manifest getManifest() {
 
         public void readPayload(OutputStream outputStream) throws SDK.SegmentSignatureMismatch, IOException {
 
-            LOG.info("Reading payload");
             MessageDigest digest = null;
             try {
                 digest = MessageDigest.getInstance("SHA-256");
@@ -308,7 +305,6 @@ public void readPayload(OutputStream outputStream) throws SDK.SegmentSignatureMi
             }
 
             for (Manifest.Segment segment : manifest.encryptionInformation.integrityInformation.segments) {
-                LOG.info("reading a segment");
                 if (segment.encryptedSegmentSize > Config.MAX_SEGMENT_SIZE) {
                     throw new IllegalStateException("Segment size " + segment.encryptedSegmentSize + " exceeded limit "
                             + Config.MAX_SEGMENT_SIZE);
@@ -325,7 +321,6 @@ public void readPayload(OutputStream outputStream) throws SDK.SegmentSignatureMi
 
                 var isLegacyTdf = manifest.tdfVersion == null || manifest.tdfVersion.isEmpty();
 
-
                 if (manifest.payload.isEncrypted) {
                     String segHashAlg = manifest.encryptionInformation.integrityInformation.segmentHashAlg;
                     Config.IntegrityAlgorithm sigAlg = Config.IntegrityAlgorithm.HS256;
@@ -353,9 +348,7 @@ public void readPayload(OutputStream outputStream) throws SDK.SegmentSignatureMi
 
                     outputStream.write(readBuf);
                 }
-                LOG.info("read a segment");
             }
-            LOG.info("finished reading payload");
         }
 
         public PolicyObject readPolicyObject() {
@@ -552,9 +545,7 @@ Reader loadTDF(SeekableByteChannel tdf, Config.TDFReaderConfig tdfReaderConfig,
     Reader loadTDF(SeekableByteChannel tdf, Config.TDFReaderConfig tdfReaderConfig) throws SDKException, IOException {
 
         TDFReader tdfReader = new TDFReader(tdf);
-        LOG.info("loaded the tdf reader");
         String manifestJson = tdfReader.manifest();
-        LOG.info("here is the manifest json {}", manifestJson);
         // use Manifest.readManifest in order to validate the Manifest input
         Manifest manifest = Manifest.readManifest(manifestJson);
 
@@ -651,7 +642,6 @@ Reader loadTDF(SeekableByteChannel tdf, Config.TDFReaderConfig tdfReaderConfig)
             }
         }
 
-
         String rootSigValue;
         boolean isLegacyTdf = manifest.tdfVersion == null || manifest.tdfVersion.isEmpty();
         if (manifest.payload.isEncrypted) {
@@ -676,8 +666,6 @@ Reader loadTDF(SeekableByteChannel tdf, Config.TDFReaderConfig tdfReaderConfig)
             rootSigValue = Base64.getEncoder().encodeToString(digest.digest(aggregateHash.toString().getBytes()));
         }
 
-        LOG.info("validated the signature");
-
         if (rootSignature.compareTo(rootSigValue) != 0) {
             throw new SDK.RootSignatureValidationException("root signature validation failed");
         }
@@ -740,8 +728,6 @@ Reader loadTDF(SeekableByteChannel tdf, Config.TDFReaderConfig tdfReaderConfig)
             }
         }
 
-        LOG.info("returning payload reader");
-
         return new Reader(tdfReader, manifest, payloadKey, unencryptedMetadata);
     }
 }

sdk/src/main/java/io/opentdf/platform/sdk/TDFReader.java

@@ -1,8 +1,5 @@
 package io.opentdf.platform.sdk;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,7 +20,6 @@ public class TDFReader {
 
     private final ZipReader.Entry manifestEntry;
     private final InputStream payload;
-    private static final Logger LOG = LoggerFactory.getLogger(TDFReader.class);
 
     public TDFReader(SeekableByteChannel tdf) throws SDKException, IOException {
         Map<String, ZipReader.Entry> entries = new ZipReader(tdf).getEntries()
@@ -39,8 +35,6 @@ public TDFReader(SeekableByteChannel tdf) throws SDKException, IOException {
 
         manifestEntry = entries.get(TDF_MANIFEST_FILE_NAME);
         payload = entries.get(TDF_PAYLOAD_FILE_NAME).getData();
-
-        LOG.info("Manifest found: {}", manifestEntry.getName());
     }
 
     String manifest() {