Skip to content
Snippets Groups Projects
Commit 5c529bda authored by Brian Carrier's avatar Brian Carrier
Browse files

Merge pull request #23 from dickfickling/master

Hashset hits blackboard artifact
parents 207f729a 3ff3d34c
Branches
Tags
No related merge requests found
......@@ -43,7 +43,8 @@ public enum ARTIFACT_TYPE {
TSK_RECENT_OBJECT (6, "TSK_RECENT_OBJ", "Recent Documents"),
TSK_TRACKPOINT (7, "TSK_TRACKPOINT", "Trackpoints"),
TSK_INSTALLED_PROG (8, "TSK_INSTALLED_PROG", "Installed Programs"),
TSK_KEYWORD_HIT (9, "TSK_KEYWORD_HIT", "Keyword Hits");
TSK_KEYWORD_HIT (9, "TSK_KEYWORD_HIT", "Keyword Hits"),
TSK_HASHSET_HIT (10, "TSK_HASHSET_HIT", "Hashset Hits");
private String label;
private int typeID;
......
......@@ -109,7 +109,7 @@ public enum ATTRIBUTE_TYPE {
TSK_DEVICE_MAKE(19, "TSK_DEVICE_MAKE", "Device Make"),
TSK_DEVICE_ID(20, "TSK_DEVICE_ID", "Device ID"),
TSK_EMAIL(21, "TSK_EMAIL", "Email"),
TSK_HASH_HD5(22, "TSK_HASH_MD5", "MD5 Hash"),
TSK_HASH_MD5(22, "TSK_HASH_MD5", "MD5 Hash"),
TSK_HASH_SHA1(23, "TSK_HASH_SHA1", "SHA1 Hash"),
TSK_HASH_SHA2_256(24, "TSK_HASH_SHA2_256", "SHA2-256 Hash"),
TSK_HASH_SHA2_512(25, "TSK_HASH_SHA2_512", "SHA2-512 Hash"),
......
......@@ -26,7 +26,7 @@
import java.util.logging.Logger;
import java.io.InputStream;
class Hash {
public class Hash {
private final static int BUFFER_SIZE = 8192;
......@@ -36,7 +36,7 @@ class Hash {
* @param content Content object whose md5 hash we want to calculate
* @return md5 of the given Content object
*/
static String calculateMd5(Content content) {
public static String calculateMd5(Content content) {
String hashText = "";
InputStream in = new ReadContentInputStream(content);
Logger logger = Logger.getLogger(Hash.class.getName());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment