diff --git a/.gitignore b/.gitignore index e05e5ea858..4ce8482af0 100644 --- a/.gitignore +++ b/.gitignore @@ -14,12 +14,19 @@ /win32/Release/ /win32/*/Release/ /win32/*/*.user +framework/win32/Debug/ +framework/win32/Release/ +framework/win32/*/Debug/ +framework/win32/*/Release/ +framework/win32/*/*.user # IntelliSense data -/win32/tsk-win.ncb +/win32/*.ncb +framework/win32/framework/*.ncb # Visual Studio user options /win32/tsk-win.suo +framework/win32/framework/*.suo # Make crud *.o @@ -27,4 +34,4 @@ *.la Makefile .deps -.libs \ No newline at end of file +.libs diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java index eea46cc410..751e9df02e 100755 --- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java +++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java @@ -97,7 +97,6 @@ public enum ATTRIBUTE_TYPE { TSK_DATETIME(2, "TSK_DATETIME", "Date/Time"), TSK_NAME(3, "TSK_NAME", "Name"), TSK_PROG_NAME(4, "TSK_PROG_NAME", "Program Name"), - TSK_WEB_BOOKMARK(5, "TSK_WEB_BOOKMARK", "Bookmark"), TSK_VALUE(6, "TSK_VALUE", "Value"), TSK_FLAG(7, "TSK_FLAG", "Flag"), TSK_PATH(8, "TSK_PATH", "Path"), diff --git a/framework/Services/TskBlackboard.cpp b/framework/Services/TskBlackboard.cpp index 545521dbfc..4d5252ba72 100755 --- a/framework/Services/TskBlackboard.cpp +++ b/framework/Services/TskBlackboard.cpp @@ -12,16 +12,16 @@ map initializeArtifactTypeMap(){ map retval; - retval.insert(pair(TSK_ART_GEN_INFO, TskArtifactNames("TSK_ART_GEN_INFO", "General Info"))); - retval.insert(pair(TSK_ART_WEB_BOOKMARK, TskArtifactNames("TSK_ART_WEB_BOOKMARK", "Date Time"))); - retval.insert(pair(TSK_ART_WEB_COOKIE, TskArtifactNames("TSK_ART_WEB_COOKIE", "Web Cookie"))); - retval.insert(pair(TSK_ART_WEB_HISTORY, TskArtifactNames("TSK_ART_WEB_HISTORY", "History"))); - retval.insert(pair(TSK_ART_WEB_DOWNLOAD, TskArtifactNames("TSK_ART_WEB_DOWNLOAD", "Download"))); - retval.insert(pair(TSK_ART_RECENT_OBJECT, TskArtifactNames("TSK_ART_RECENT_OBJECT", "Recent History Object"))); - retval.insert(pair(TSK_ART_TRACKPOINT, TskArtifactNames("TSK_ART_TRACKPOINT", "Trackpoint"))); - retval.insert(pair(TSK_ART_INSTALLED_PROG, TskArtifactNames("TSK_ART_INSTALLED_PROG", "Installed Program"))); - retval.insert(pair(TSK_ART_KEYWORD_HIT, TskArtifactNames("TSK_ART_KEYWORD_HIT", "Keyword Hit"))); - retval.insert(pair(TSK_ART_DEVICE_ATTACHED, TskArtifactNames("TSK_ART_DEVICE_ATTACHED", "Device Attached"))); + retval.insert(pair(TSK_GEN_INFO, TskArtifactNames("TSK_GEN_INFO", "General Info"))); + retval.insert(pair(TSK_WEB_BOOKMARK, TskArtifactNames("TSK_WEB_BOOKMARK", "Date Time"))); + retval.insert(pair(TSK_WEB_COOKIE, TskArtifactNames("TSK_WEB_COOKIE", "Web Cookie"))); + retval.insert(pair(TSK_WEB_HISTORY, TskArtifactNames("TSK_WEB_HISTORY", "History"))); + retval.insert(pair(TSK_WEB_DOWNLOAD, TskArtifactNames("TSK_WEB_DOWNLOAD", "Download"))); + retval.insert(pair(TSK_RECENT_OBJECT, TskArtifactNames("TSK_RECENT_OBJECT", "Recent History Object"))); + retval.insert(pair(TSK_TRACKPOINT, TskArtifactNames("TSK_TRACKPOINT", "Trackpoint"))); + retval.insert(pair(TSK_INSTALLED_PROG, TskArtifactNames("TSK_INSTALLED_PROG", "Installed Program"))); + retval.insert(pair(TSK_KEYWORD_HIT, TskArtifactNames("TSK_KEYWORD_HIT", "Keyword Hit"))); + retval.insert(pair(TSK_DEVICE_ATTACHED, TskArtifactNames("TSK_DEVICE_ATTACHED", "Device Attached"))); return retval; } @@ -31,7 +31,6 @@ map initializeAttributeTypeMap(){ retval.insert(pair(TSK_DATETIME, TskAttributeNames("TSK_DATETIME", "Datetime"))); retval.insert(pair(TSK_NAME, TskAttributeNames("TSK_NAME", "Name"))); retval.insert(pair(TSK_PROG_NAME, TskAttributeNames("TSK_PROG_NAME", "Program Name"))); - retval.insert(pair(TSK_WEB_BOOKMARK, TskAttributeNames("TSK_WEB_BOOKMARK", "Web Bookmark"))); retval.insert(pair(TSK_VALUE, TskAttributeNames("TSK_VALUE", "Value"))); retval.insert(pair(TSK_FLAG, TskAttributeNames("TSK_FLAG", "Flag"))); retval.insert(pair(TSK_PATH, TskAttributeNames("TSK_PATH", "Path"))); diff --git a/framework/Services/TskBlackboard.h b/framework/Services/TskBlackboard.h index 233144a789..d3364c69c9 100755 --- a/framework/Services/TskBlackboard.h +++ b/framework/Services/TskBlackboard.h @@ -46,17 +46,17 @@ using namespace std; * you also add it there. * See bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java */ typedef enum TSK_ARTIFACT_TYPE { - TSK_ART_GEN_INFO = 1,///< The general info artifact, if information doesn't need its own artifact it should go here - TSK_ART_WEB_BOOKMARK = 2,///< A web bookmark. - TSK_ART_WEB_COOKIE = 3,///< A web cookie. - TSK_ART_WEB_HISTORY = 4,///< A web history enrty. - TSK_ART_WEB_DOWNLOAD = 5,///< A web download. - TSK_ART_RECENT_OBJECT = 6,///< A recently used object (MRU, recent document, etc.). - TSK_ART_TRACKPOINT = 7,///< A trackpoint from a GPS log. - TSK_ART_INSTALLED_PROG = 8,///< An installed program. - TSK_ART_KEYWORD_HIT = 9,///< A keyword hit. - TSK_ART_HASHSET_HIT = 10, ///< A hit within a known bad / notable hashset / hash database. - TSK_ART_DEVICE_ATTACHED = 11, ///< An event for a device being attached to the host computer + TSK_GEN_INFO = 1,///< The general info artifact, if information doesn't need its own artifact it should go here + TSK_WEB_BOOKMARK = 2,///< A web bookmark. + TSK_WEB_COOKIE = 3,///< A web cookie. + TSK_WEB_HISTORY = 4,///< A web history enrty. + TSK_WEB_DOWNLOAD = 5,///< A web download. + TSK_RECENT_OBJECT = 6,///< A recently used object (MRU, recent document, etc.). + TSK_TRACKPOINT = 7,///< A trackpoint from a GPS log. + TSK_INSTALLED_PROG = 8,///< An installed program. + TSK_KEYWORD_HIT = 9,///< A keyword hit. + TSK_HASHSET_HIT = 10, ///< A hit within a known bad / notable hashset / hash database. + TSK_DEVICE_ATTACHED = 11, ///< An event for a device being attached to the host computer /* SEE ABOVE: * - KEEP JAVA CODE IN SYNC * - UPDATE map in TskBlackboard.cpp @@ -80,7 +80,6 @@ typedef enum TSK_ATTRIBUTE_TYPE { TSK_DATETIME = 2,///< INT32: GMT based Unix time, defines number of secords elapsed since UTC Jan 1, 1970. TSK_NAME = 3,///< STRING: The name associated with an artifact TSK_PROG_NAME = 4,///< String of name of a program that was installed on the system - TSK_WEB_BOOKMARK = 5,///< STRING: Browser bookmark information -- DO NOT USED -- WILL BE REMOVED TSK_VALUE = 6,///< Some value associated with an artifact TSK_FLAG = 7,///< Some flag associated with an artifact TSK_PATH = 8,///< A filesystem path. Should be fully qualified. Should set TSK_PATH_ID as well when this is set. TODO: Need to define this value more for cases with multiple images and multiple file systems per image. diff --git a/framework/win32/framework/framework.vcproj b/framework/win32/framework/framework.vcproj index 4064a5cb63..22f96454ad 100755 --- a/framework/win32/framework/framework.vcproj +++ b/framework/win32/framework/framework.vcproj @@ -2,7 +2,7 @@