diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java index c136022021..f25c6c64e1 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java @@ -28,7 +28,6 @@ import java.io.IOException; import java.nio.file.InvalidPathException; import java.nio.file.Path; import java.nio.file.Paths; -import java.security.GeneralSecurityException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/Core/src/org/sleuthkit/autopsy/core/TextConverter.java b/Core/src/org/sleuthkit/autopsy/core/TextConverter.java index bb9030851e..06bd418f70 100644 --- a/Core/src/org/sleuthkit/autopsy/core/TextConverter.java +++ b/Core/src/org/sleuthkit/autopsy/core/TextConverter.java @@ -18,23 +18,22 @@ */ package org.sleuthkit.autopsy.core; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.security.GeneralSecurityException; import java.util.Base64; - +import java.util.logging.Level; import javax.crypto.Cipher; import javax.crypto.SecretKey; import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; import javax.crypto.spec.PBEParameterSpec; import org.openide.util.NbBundle; +import org.sleuthkit.autopsy.coreutils.Logger; /** * Provides ability to convert text to hex text. */ class TextConverter { + private static final Logger logger = Logger.getLogger(TextConverter.class.getName()); private static final char[] TMP = "dontlookhere".toCharArray(); private static final byte[] SALT = { (byte) 0xde, (byte) 0x33, (byte) 0x10, (byte) 0x12, @@ -55,6 +54,7 @@ class TextConverter { pbeCipher.init(Cipher.ENCRYPT_MODE, key, new PBEParameterSpec(SALT, 20)); return base64Encode(pbeCipher.doFinal(property.getBytes("UTF-8"))); } catch (Exception ex) { + logger.log(Level.SEVERE, "Error converting text to hex text", ex); //NON-NLS throw new IllegalArgumentException( NbBundle.getMessage(TextConverter.class, "TextConverter.convert.exception.txt")); } @@ -78,6 +78,7 @@ class TextConverter { pbeCipher.init(Cipher.DECRYPT_MODE, key, new PBEParameterSpec(SALT, 20)); return new String(pbeCipher.doFinal(base64Decode(property)), "UTF-8"); } catch (Exception ex) { + logger.log(Level.SEVERE, "Error converting hex text to text", ex); //NON-NLS throw new IllegalArgumentException( NbBundle.getMessage(TextConverter.class, "TextConverter.convertFromHex.exception.txt")); } diff --git a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java index 8f8eb9a9d2..9acae39438 100755 --- a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java +++ b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java @@ -18,9 +18,6 @@ */ package org.sleuthkit.autopsy.core; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.security.GeneralSecurityException; import java.util.prefs.BackingStoreException; import org.sleuthkit.autopsy.events.MessageServiceConnectionInfo; import java.util.prefs.PreferenceChangeListener; diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java index 0c115b83e6..b692d53fa8 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java @@ -18,12 +18,8 @@ import org.sleuthkit.autopsy.core.UserPreferences; import org.sleuthkit.autopsy.events.MessageServiceConnectionInfo; import org.sleuthkit.autopsy.coreutils.Logger; import java.awt.Cursor; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.security.GeneralSecurityException; import java.util.logging.Level; import javax.swing.ImageIcon; -import org.openide.util.Exceptions; import org.openide.util.ImageUtilities; import org.openide.util.Lookup; import org.sleuthkit.autopsy.keywordsearchservice.KeywordSearchService; diff --git a/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java b/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java index ad22cc8b2f..80c352e611 100644 --- a/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java +++ b/Core/src/org/sleuthkit/autopsy/events/AutopsyEventPublisher.java @@ -19,9 +19,7 @@ package org.sleuthkit.autopsy.events; import java.beans.PropertyChangeListener; -import java.io.IOException; import java.net.URISyntaxException; -import java.security.GeneralSecurityException; import java.util.Set; import java.util.logging.Level; import javax.jms.JMSException;