diff --git a/crypto-core/build.gradle b/crypto-core/build.gradle index 4a3d36fc5..28cc2a07c 100644 --- a/crypto-core/build.gradle +++ b/crypto-core/build.gradle @@ -15,6 +15,7 @@ dependencies { testCompile "org.assertj:assertj-core" testCompile "org.mockito:mockito-core" testCompile 'org.openjdk.jmh:jmh-core' + implementation 'com.palantir.safe-logging:logger' } project.task(type: JavaExec, 'benchmarks') { diff --git a/crypto-core/src/main/java/com/palantir/crypto2/io/CryptoStreamFactory.java b/crypto-core/src/main/java/com/palantir/crypto2/io/CryptoStreamFactory.java index 45aa81d19..2a2c623eb 100644 --- a/crypto-core/src/main/java/com/palantir/crypto2/io/CryptoStreamFactory.java +++ b/crypto-core/src/main/java/com/palantir/crypto2/io/CryptoStreamFactory.java @@ -21,6 +21,8 @@ import com.palantir.crypto2.cipher.SeekableCipher; import com.palantir.crypto2.cipher.SeekableCipherFactory; import com.palantir.crypto2.keys.KeyMaterial; +import com.palantir.logsafe.logger.SafeLogger; +import com.palantir.logsafe.logger.SafeLoggerFactory; import com.palantir.seekio.SeekableInput; import java.io.IOException; import java.io.InputStream; @@ -30,12 +32,10 @@ import javax.crypto.CipherOutputStream; import javax.crypto.SecretKey; import org.apache.commons.crypto.stream.CtrCryptoOutputStream; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public final class CryptoStreamFactory { - private static final Logger log = LoggerFactory.getLogger(CryptoStreamFactory.class); + private static final SafeLogger log = SafeLoggerFactory.get(CryptoStreamFactory.class); private static final Properties PROPS = ApacheCiphers.forceOpenSsl(new Properties()); private static final String AES_ALGORITHM = "AES/CTR/NoPadding"; private static final String OPEN_SSL_INIT_WARNING = "Unable to initialize cipher with OpenSSL, falling back to "