From f53d947a134c963eb6fd8392a6eef0b5f036cd02 Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 30 Nov 2020 22:14:07 +0100 Subject: [PATCH] Cleanup logging --- src/main/java/StreamAesUtils.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/StreamAesUtils.java b/src/main/java/StreamAesUtils.java index 38fa09d..14bf6bc 100644 --- a/src/main/java/StreamAesUtils.java +++ b/src/main/java/StreamAesUtils.java @@ -4,7 +4,6 @@ import java.util.HashMap; import java.util.logging.Logger; public class StreamAesUtils { - private static final Logger logger = Logger.getLogger(StreamAesUtils.class.getName()); public static Aes generateFromExchangeKeyAndSuperSecretKey(String keyExchange, String superSecretKey) throws NoSuchAlgorithmException { HashMap hashMap = new HashMap<>(); @@ -20,21 +19,21 @@ public class StreamAesUtils { if (!hashMap.containsKey("nonce")) { return null; } - logger.info("cipher=" + (hashMap.get("cipher"))); - logger.info("username=" + (hashMap.get("username"))); - logger.info("padding=" + (hashMap.get("padding"))); - logger.info("algorithm=" + (hashMap.get("algorithm"))); - logger.info("nonce=" + (hashMap.get("nonce"))); + System.out.println("cipher=" + (hashMap.get("cipher"))); + System.out.println("username=" + (hashMap.get("username"))); + System.out.println("padding=" + (hashMap.get("padding"))); + System.out.println("algorithm=" + (hashMap.get("algorithm"))); + System.out.println("nonce=" + (hashMap.get("nonce"))); return fromUserNonceSuperSecretKey(hashMap.get("username"), hashMap.get("nonce"), superSecretKey); } public static Aes fromUserNonceSuperSecretKey(String username, String nonce, String superSecretKey) throws NoSuchAlgorithmException { if (GenKey.generateDefaultUsername().equals(username)) { - logger.info("AES use User Password"); + System.out.println("AES use User Password"); } else if ("none".equals(username)) { superSecretKey = GenKey.generateDefaultPsw(); } else { - logger.info("AES key-exchange unknown username"); + System.out.println("AES key-exchange unknown username"); return null; } byte[] md5 = md5Digest(nonce + ":" + superSecretKey);