Merge branch 'develop' of https://github.com/sleuthkit/sleuthkit into...

Merge branch 'develop' of https://github.com/sleuthkit/sleuthkit into 4590-DataSourceProfileArtifact

bindings/java/ivy.xml

@@ -3,9 +3,7 @@
 	<dependencies>
 		<dependency org="junit" name="junit" rev="4.8.2"/>
 		<dependency org="com.googlecode.java-diff-utils" name="diffutils" rev="1.2.1"/>
-		<dependency org="org.xerial" name="sqlite-jdbc" rev="3.8.11">
-			<artifact name="sqlite-jdbc" type="jar" />
-		</dependency>
+		<dependency org="org.xerial" name="sqlite-jdbc" rev="3.25.2"/>
 		<dependency org="org.postgresql" name="postgresql" rev="9.4.1211.jre7" >
 			<artifact name="postgresql" type="jar" />
 		</dependency>

tsk/auto/db_postgresql.cpp

@@ -839,8 +839,8 @@ int TskDbPostgreSQL::addImageInfo(int type, TSK_OFF_T ssize, int64_t & objId, co
     removeNonUtf8(sha256_local, MAX_DB_STRING_LENGTH - 1, sha256.c_str());
     char *timezone_sql = PQescapeLiteral(conn, timeZone_local, strlen(timeZone_local));
     char *md5_sql = PQescapeLiteral(conn, md5_local, strlen(md5_local));
-    char *sha1_sql = PQescapeLiteral(conn, md5_local, strlen(sha1_local));
-    char *sha256_sql = PQescapeLiteral(conn, md5_local, strlen(sha256_local));
+    char *sha1_sql = PQescapeLiteral(conn, sha1_local, strlen(sha1_local));
+    char *sha256_sql = PQescapeLiteral(conn, sha256_local, strlen(sha256_local));
 
     if (!isEscapedStringValid(timezone_sql, timeZone_local, "TskDbPostgreSQL::addImageInfo: Unable to escape time zone string: %s (Error: %s)\n")
         || !isEscapedStringValid(md5_sql, md5_local, "TskDbPostgreSQL::addImageInfo: Unable to escape md5 string: %s (Error: %s)\n")