diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 9adb1c7649..71acddc08a 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -85,8 +85,8 @@ file.reference.Rejistry-1.1-SNAPSHOT.jar=release/modules/ext/Rejistry-1.1-SNAPSH
file.reference.serializer-2.7.2.jar=release/modules/ext/serializer-2.7.2.jar
file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbinding-AllPlatforms.jar
file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar
-file.reference.sleuthkit-4.12.0.jar=release/modules/ext/sleuthkit-4.12.0.jar
-file.reference.sleuthkit-caseuco-4.12.0.jar=release/modules/ext/sleuthkit-caseuco-4.12.0.jar
+file.reference.sleuthkit-4.12.1.jar=release/modules/ext/sleuthkit-4.12.1.jar
+file.reference.sleuthkit-caseuco-4.12.1.jar=release/modules/ext/sleuthkit-caseuco-4.12.1.jar
file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar
file.reference.snakeyaml-2.0.jar=release/modules/ext/snakeyaml-2.0.jar
file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 9b960955aa..754da003d9 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -718,12 +718,12 @@
release/modules/ext/sevenzipjbinding.jar
- ext/sleuthkit-4.12.0.jar
- release/modules/ext/sleuthkit-4.12.0.jar
+ ext/sleuthkit-4.12.1.jar
+ release/modules/ext/sleuthkit-4.12.1.jar
- ext/sleuthkit-caseuco-4.12.0.jar
- release/modules/ext/sleuthkit-caseuco-4.12.0.jar
+ ext/sleuthkit-caseuco-4.12.1.jar
+ release/modules/ext/sleuthkit-caseuco-4.12.1.jar
ext/slf4j-api-1.7.36.jar
diff --git a/NEWS.txt b/NEWS.txt
index b8db91ca62..f6658a92ed 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -9,7 +9,7 @@ Library Updates
Ingest Module Updates:
- Recent Activity checks for malicious Chrome extensions from list provided by https://github.com/randomaccess3/detections
- Keyword Search module now can search without needing to index text into Solr.
-- New Cyber Triage Malware Scanner module that uses Reversing Labs (requires license)
+- New Cyber Triage Malware Scanner module that uses Reversing Labs (requires license). https://www.cybertriage.com/autopsy-malware-module/
Add Data Source Updates:
- Timestamps for logical files can be added. Issue https://github.com/sleuthkit/autopsy/issues/5852, https://github.com/sleuthkit/autopsy/issues/1788
@@ -24,7 +24,7 @@ Bugs:
- Fix exporting of CSV files. Issue https://github.com/sleuthkit/autopsy/issues/6717
Misc:
-- Added File Repository concept for data source files that are in a central location
+- Added File Repository concept for data source files that are in a central location. Required for Cyber Triage import feature.
- Added Spanish language support, contributor https://github.com/AburtoArielPM
---------------- VERSION 4.20.0 --------------
diff --git a/TSKVersion.xml b/TSKVersion.xml
index 087dac0912..7f6a1a8848 100644
--- a/TSKVersion.xml
+++ b/TSKVersion.xml
@@ -1,3 +1,3 @@
-
+
diff --git a/docs/doxygen-user/ct_malware_scanner.dox b/docs/doxygen-user/ct_malware_scanner.dox
index fa1dd6fb6b..21d857e6f7 100644
--- a/docs/doxygen-user/ct_malware_scanner.dox
+++ b/docs/doxygen-user/ct_malware_scanner.dox
@@ -9,16 +9,19 @@ The Cyber Triage Malware Scanner module will use the malware scanning infrastruc
This module requires a commercial license from Cyber Triage.
-For more information on obtaining a license, refer to [CyberTriage.com](https://cybertriage.com/autopsy-malware-module). The remainder of this page is about the use of the module once it is licensed.
+For more information on what the module does or obtaining a license, refer to [CyberTriage.com](https://cybertriage.com/autopsy-malware-module). The remainder of this page is about the use of the module once it is licensed.
Configuration
=======
+You will need to first get a paid or eval license from the above URL. The code will come in via email. Example license formats include:
+* AUT-8ed86eb5-17fc-4b3a-9b75-ce638c11b070
+* b826a555-951f-42ca-86ce-439a81106688
+
Once you have a license, you must add it on the Options panel. Choose the 'Cyber Triage' tab and choose 'Add License'.
-
-\image html Malware-scanner-global-options-panel-no-license.png
+\image html malware-scanner-global-options-panel-no-license.png
After you enter the license number that you should have received from your email, you will then need to review and agree to the license terms.
diff --git a/docs/doxygen-user/images/Malware-scanner-global-options-panel-no-license.png b/docs/doxygen-user/images/Malware-scanner-global-options-panel-no-license.png
deleted file mode 100644
index 09bb7d8344..0000000000
Binary files a/docs/doxygen-user/images/Malware-scanner-global-options-panel-no-license.png and /dev/null differ
diff --git a/docs/doxygen-user/images/malware-artifact-tree.png b/docs/doxygen-user/images/malware-artifact-tree.png
index 53b229751c..b47afb86c1 100644
Binary files a/docs/doxygen-user/images/malware-artifact-tree.png and b/docs/doxygen-user/images/malware-artifact-tree.png differ
diff --git a/docs/doxygen-user/images/malware-scanner-global-options-panel-no-license.png b/docs/doxygen-user/images/malware-scanner-global-options-panel-no-license.png
new file mode 100644
index 0000000000..de64843872
Binary files /dev/null and b/docs/doxygen-user/images/malware-scanner-global-options-panel-no-license.png differ
diff --git a/docs/doxygen-user/images/malware-scanner-global-options-panel.png b/docs/doxygen-user/images/malware-scanner-global-options-panel.png
index fd0b131832..b5a0ad4f3d 100644
Binary files a/docs/doxygen-user/images/malware-scanner-global-options-panel.png and b/docs/doxygen-user/images/malware-scanner-global-options-panel.png differ
diff --git a/release_scripts/update_sleuthkit_version.pl b/release_scripts/update_sleuthkit_version.pl
index 1d6bdc7e72..f197477c82 100755
--- a/release_scripts/update_sleuthkit_version.pl
+++ b/release_scripts/update_sleuthkit_version.pl
@@ -33,7 +33,7 @@ sub main {
update_core_project_xml();
update_unix_setup();
- print "Files updated. You need to commit and push them\n";
+ print "Files updated and added to git. You need to commit (no -a) and push.\n";
}
diff --git a/unix_setup.sh b/unix_setup.sh
index d2572c9de2..ab2d1094f6 100644
--- a/unix_setup.sh
+++ b/unix_setup.sh
@@ -5,7 +5,7 @@
# NOTE: update_sleuthkit_version.pl updates this value and relies
# on it keeping the same name and whitespace. Don't change it.
-TSK_VERSION=4.12.0
+TSK_VERSION=4.12.1
usage() {