diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java index eb8066cd8d932d8dcbcb87b26b3961d1d326a67a..f131f952ae33f7ea7d30960c4b229bdf478fe9ef 100755 --- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java +++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java @@ -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; diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java index a1e16754e9ddca4b2e647e7f31275f71a66aed2d..409844fd7e6a6434d8a366ae407a0441ff5567aa 100755 --- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java +++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java @@ -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"), diff --git a/bindings/java/src/org/sleuthkit/datamodel/Hash.java b/bindings/java/src/org/sleuthkit/datamodel/Hash.java index 78d780c91da6867a03a30d5ae14295b6cb4474f1..dd3d33a69943e29b4879d9d035d4a52b9a890a0c 100644 --- a/bindings/java/src/org/sleuthkit/datamodel/Hash.java +++ b/bindings/java/src/org/sleuthkit/datamodel/Hash.java @@ -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());