Skip to content

Commit

Permalink
Removed _ART from artifacts, removed TSK_WEB_BOOKMARK attribute. Upda…
Browse files Browse the repository at this point in the history 
…ted .gitignore. Renamed framework library to libtskframework.
  • Loading branch information
@esaunders
esaunders committed May 8, 2012
1 parent 1504949 commit 41aa55d
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 29 deletions.
11 changes: 9 additions & 2 deletions .gitignore
View file
Expand Up @@ -14,17 +14,24 @@
/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
*.lo
*.la
Makefile
.deps
.libs
.libs
1 change: 0 additions & 1 deletion bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
View file
Expand Up @@ -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"),
Expand Down
21 changes: 10 additions & 11 deletions framework/Services/TskBlackboard.cpp
View file
Expand Up @@ -12,16 +12,16 @@

map<int, TskArtifactNames> initializeArtifactTypeMap(){
map<int, TskArtifactNames> retval;
retval.insert(pair<int, TskArtifactNames>(TSK_ART_GEN_INFO, TskArtifactNames("TSK_ART_GEN_INFO", "General Info")));
retval.insert(pair<int, TskArtifactNames>(TSK_ART_WEB_BOOKMARK, TskArtifactNames("TSK_ART_WEB_BOOKMARK", "Date Time")));
retval.insert(pair<int, TskArtifactNames>(TSK_ART_WEB_COOKIE, TskArtifactNames("TSK_ART_WEB_COOKIE", "Web Cookie")));
retval.insert(pair<int, TskArtifactNames>(TSK_ART_WEB_HISTORY, TskArtifactNames("TSK_ART_WEB_HISTORY", "History")));
retval.insert(pair<int, TskArtifactNames>(TSK_ART_WEB_DOWNLOAD, TskArtifactNames("TSK_ART_WEB_DOWNLOAD", "Download")));
retval.insert(pair<int, TskArtifactNames>(TSK_ART_RECENT_OBJECT, TskArtifactNames("TSK_ART_RECENT_OBJECT", "Recent History Object")));
retval.insert(pair<int, TskArtifactNames>(TSK_ART_TRACKPOINT, TskArtifactNames("TSK_ART_TRACKPOINT", "Trackpoint")));
retval.insert(pair<int, TskArtifactNames>(TSK_ART_INSTALLED_PROG, TskArtifactNames("TSK_ART_INSTALLED_PROG", "Installed Program")));
retval.insert(pair<int, TskArtifactNames>(TSK_ART_KEYWORD_HIT, TskArtifactNames("TSK_ART_KEYWORD_HIT", "Keyword Hit")));
retval.insert(pair<int, TskArtifactNames>(TSK_ART_DEVICE_ATTACHED, TskArtifactNames("TSK_ART_DEVICE_ATTACHED", "Device Attached")));
retval.insert(pair<int, TskArtifactNames>(TSK_GEN_INFO, TskArtifactNames("TSK_GEN_INFO", "General Info")));
retval.insert(pair<int, TskArtifactNames>(TSK_WEB_BOOKMARK, TskArtifactNames("TSK_WEB_BOOKMARK", "Date Time")));
retval.insert(pair<int, TskArtifactNames>(TSK_WEB_COOKIE, TskArtifactNames("TSK_WEB_COOKIE", "Web Cookie")));
retval.insert(pair<int, TskArtifactNames>(TSK_WEB_HISTORY, TskArtifactNames("TSK_WEB_HISTORY", "History")));
retval.insert(pair<int, TskArtifactNames>(TSK_WEB_DOWNLOAD, TskArtifactNames("TSK_WEB_DOWNLOAD", "Download")));
retval.insert(pair<int, TskArtifactNames>(TSK_RECENT_OBJECT, TskArtifactNames("TSK_RECENT_OBJECT", "Recent History Object")));
retval.insert(pair<int, TskArtifactNames>(TSK_TRACKPOINT, TskArtifactNames("TSK_TRACKPOINT", "Trackpoint")));
retval.insert(pair<int, TskArtifactNames>(TSK_INSTALLED_PROG, TskArtifactNames("TSK_INSTALLED_PROG", "Installed Program")));
retval.insert(pair<int, TskArtifactNames>(TSK_KEYWORD_HIT, TskArtifactNames("TSK_KEYWORD_HIT", "Keyword Hit")));
retval.insert(pair<int, TskArtifactNames>(TSK_DEVICE_ATTACHED, TskArtifactNames("TSK_DEVICE_ATTACHED", "Device Attached")));
return retval;
}

Expand All @@ -31,7 +31,6 @@ map<int, TskAttributeNames> initializeAttributeTypeMap(){
retval.insert(pair<int, TskAttributeNames>(TSK_DATETIME, TskAttributeNames("TSK_DATETIME", "Datetime")));
retval.insert(pair<int, TskAttributeNames>(TSK_NAME, TskAttributeNames("TSK_NAME", "Name")));
retval.insert(pair<int, TskAttributeNames>(TSK_PROG_NAME, TskAttributeNames("TSK_PROG_NAME", "Program Name")));
retval.insert(pair<int, TskAttributeNames>(TSK_WEB_BOOKMARK, TskAttributeNames("TSK_WEB_BOOKMARK", "Web Bookmark")));
retval.insert(pair<int, TskAttributeNames>(TSK_VALUE, TskAttributeNames("TSK_VALUE", "Value")));
retval.insert(pair<int, TskAttributeNames>(TSK_FLAG, TskAttributeNames("TSK_FLAG", "Flag")));
retval.insert(pair<int, TskAttributeNames>(TSK_PATH, TskAttributeNames("TSK_PATH", "Path")));
Expand Down
23 changes: 11 additions & 12 deletions framework/Services/TskBlackboard.h
View file
Expand Up @@ -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
Expand All @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions framework/win32/framework/framework.vcproj
View file
Expand Up @@ -2,7 +2,7 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="framework"
Name="libtskframework"
ProjectGUID="{F791B16A-1489-4526-9FFF-CB481CEC5414}"
RootNamespace="framework"
Keyword="Win32Proj"
Expand Down Expand Up @@ -86,7 +86,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="xcopy &quot;$(POCO_HOME)\bin\PocoFoundationd.dll&quot; &quot;$(OutDir)&quot; /R /Y&#x0D;&#x0A;xcopy &quot;$(POCO_HOME)\bin\PocoUtild.dll&quot; &quot;$(OutDir)&quot; /R /Y&#x0D;&#x0A;xcopy &quot;$(POCO_HOME)\bin\PocoXMLd.dll&quot; &quot;$(OutDir)&quot; /R /Y&#x0D;&#x0A;xcopy &quot;$(LIBEWF_HOME)\msvscpp\Release\libewf.dll&quot; &quot;$(outDir)&quot; /R /Y&#x0D;&#x0A;IF EXIST &quot;$(LIBEWF_HOME)\msvscpp\zlib-1.2.6&quot; (&#x0D;&#x0A;xcopy &quot;$(LIBEWF_HOME)\msvscpp\Release\zlib.dll&quot; &quot;$(outDir)&quot; /R /Y&#x0D;&#x0A;) ELSE (&#x0D;&#x0A;xcopy &quot;$(LIBEWF_HOME)\msvscpp\zlib\zlib1.dll&quot; &quot;$(outDir)&quot; /R /Y&#x0D;&#x0A;)"
CommandLine="xcopy &quot;$(POCO_HOME)\bin\PocoFoundationd.dll&quot; &quot;$(OutDir)&quot; /R /Y&#x0D;&#x0A;xcopy &quot;$(POCO_HOME)\bin\PocoUtild.dll&quot; &quot;$(OutDir)&quot; /R /Y&#x0D;&#x0A;xcopy &quot;$(POCO_HOME)\bin\PocoXMLd.dll&quot; &quot;$(OutDir)&quot; /R /Y&#x0D;&#x0A;xcopy &quot;$(LIBEWF_HOME)\msvscpp\Release\libewf.dll&quot; &quot;$(outDir)&quot; /R /Y&#x0D;&#x0A;IF EXIST &quot;$(LIBEWF_HOME)\msvscpp\zlib-1.2.6&quot; (&#x0D;&#x0A;xcopy &quot;$(LIBEWF_HOME)\msvscpp\Release\zlib.dll&quot; &quot;$(outDir)&quot; /R /Y&#x0D;&#x0A;) ELSE (&#x0D;&#x0A;xcopy &quot;$(LIBEWF_HOME)\msvscpp\zlib\zlib1.dll&quot; &quot;$(outDir)&quot; /R /Y&#x0D;&#x0A;)&#x0D;&#x0A;"
/>
</Configuration>
<Configuration
Expand Down Expand Up @@ -159,7 +159,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine="xcopy &quot;$(POCO_HOME)\bin\PocoFoundationd.dll&quot; &quot;$(OutDir)&quot; /R /Yxcopy &quot;$(POCO_HOME)\bin\PocoFoundationd.dll&quot; &quot;$(OutDir)&quot; /R /Y&#x0D;&#x0A;xcopy &quot;$(POCO_HOME)\bin\PocoUtild.dll&quot; &quot;$(OutDir)&quot; /R /Y&#x0D;&#x0A;xcopy &quot;$(POCO_HOME)\bin\PocoXMLd.dll&quot; &quot;$(OutDir)&quot; /R /Y&#x0D;&#x0A;xcopy &quot;$(LIBEWF_HOME)\msvscpp\Release\libewf.dll&quot; &quot;$(outDir)&quot; /R /Y&#x0D;&#x0A;IF EXIST &quot;$(LIBEWF_HOME)\msvscpp\zlib-1.2.6&quot; (&#x0D;&#x0A;xcopy &quot;$(LIBEWF_HOME)\msvscpp\Release\zlib.dll&quot; &quot;$(outDir)&quot; /R /Y&#x0D;&#x0A;) ELSE (&#x0D;&#x0A;xcopy &quot;$(LIBEWF_HOME)\msvscpp\zlib\zlib1.dll&quot; &quot;$(outDir)&quot; /R /Y&#x0D;&#x0A;)"
CommandLine="xcopy &quot;$(POCO_HOME)\bin\PocoFoundationd.dll&quot; &quot;$(OutDir)&quot; /R /Yxcopy &quot;$(POCO_HOME)\bin\PocoFoundationd.dll&quot; &quot;$(OutDir)&quot; /R /Y&#x0D;&#x0A;xcopy &quot;$(POCO_HOME)\bin\PocoUtild.dll&quot; &quot;$(OutDir)&quot; /R /Y&#x0D;&#x0A;xcopy &quot;$(POCO_HOME)\bin\PocoXMLd.dll&quot; &quot;$(OutDir)&quot; /R /Y&#x0D;&#x0A;xcopy &quot;$(LIBEWF_HOME)\msvscpp\Release\libewf.dll&quot; &quot;$(outDir)&quot; /R /Y&#x0D;&#x0A;IF EXIST &quot;$(LIBEWF_HOME)\msvscpp\zlib-1.2.6&quot; (&#x0D;&#x0A;xcopy &quot;$(LIBEWF_HOME)\msvscpp\Release\zlib.dll&quot; &quot;$(outDir)&quot; /R /Y&#x0D;&#x0A;) ELSE (&#x0D;&#x0A;xcopy &quot;$(LIBEWF_HOME)\msvscpp\zlib\zlib1.dll&quot; &quot;$(outDir)&quot; /R /Y&#x0D;&#x0A;)&#x0D;&#x0A;"
/>
</Configuration>
</Configurations>
Expand Down

0 comments on commit 41aa55d

Please sign in to comment.