Skip to content

Commit

Permalink
Release 2.6
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.code.sf.net/p/ssdeep/code/tags/release-2.6@107 d1b3761f-3242-0410-b1a5-fe525d664610
  • Loading branch information
jessekornblum committed Sep 28, 2010
1 parent 21920c1 commit 9c92207
Show file tree
Hide file tree
Showing 45 changed files with 15,596 additions and 14,180 deletions.
22 changes: 22 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
2010-07-15 Jesse Kornblum

* Added quotes and quote escaping to filenames when
displayed in CSV matching mode.

* Modified FILEFORMAT to reflect quotation marks in filenames.


2010-06-24 Jesse Kornblum

* Added parameter checking to my_basename.


2010-05-05 Jesse Kornblum

* Changed logic for reading files of known hashes to look for
the header this version of the program writes instead of
the v1 header. This was done for the DC3 branch of the code.

* Updated README documentation and published version 2.5.


2010-03-20 Jesse Kornblum

* Fixed define in fuzzy.h to only allow one compilation
Expand Down
20 changes: 13 additions & 7 deletions FILEFORMAT
Original file line number Diff line number Diff line change
@@ -1,30 +1,36 @@

SSDEEP FILE FORMAT VERSION 1.0
SSDEEP FILE FORMAT VERSION 1.1

1. REVISION HISTORY

14 Aug 2006 - Initial version (jk)

15 Jul 2010 - Adding quotation marks to filenames



2. FILE HEADER

The first line of the file is a header, like this:

ssdeep,1.0--blocksize:hash:hash,filename
ssdeep,1.1--blocksize:hash:hash,filename

ssdeep - Identifies the file type
1.0 - The version of the file format, NOT the version of the program
1.1 - The version of the file format, NOT the version of the program
-- - Separator

The remainder of the line identifies the format of the file.
Note that for version 1.0 these values must be given EXACTLY as shown above
Note that for version 1.1 these values must be given EXACTLY as shown above


3. FILE DATA

Each line represents the hash of one file as listed in the header.
Specifically, we have the blocksize used by the program, the hash
for this blocksize and twice the blocksize, and the filename. Note that
there are *no* quotation marks in the file.
for this blocksize and twice the blocksize, and the filename. Filenames
are enclosed in quotation marks. Filenames which contain a quotation mark
will have those quotes slash escaped. For example, the file ma"in.c
will be listed as:

"ma\"in.c"


4 changes: 3 additions & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
Expand All @@ -175,6 +176,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
Expand All @@ -187,6 +189,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
Expand Down Expand Up @@ -219,7 +222,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
Expand Down
14 changes: 13 additions & 1 deletion NEWS
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
** Version 2.5 - RBF DATE
** Version 2.6 - 28 Sep 2010

* New Features

- Modified the output file format to allow for proper escaping of
filenames with quotation marks in them.

* Bug Fixes

- Added quotation marks to filenames in CSV matching mode.


** Version 2.5 - 6 May 2010

* New Features

Expand Down
4 changes: 2 additions & 2 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ the following:

* Fuzzy hashing a buffer of text:

int fuzzy_hash_buf(unsigned char *buf,
int fuzzy_hash_buf(const unsigned char *buf,
uint32_t buf_len,
char *result);

Expand Down Expand Up @@ -52,7 +52,7 @@ The function returns zero on success, one on error.

The other function to hash a file takes a file name:

int fuzzy_hash_filename(char * filename,
int fuzzy_hash_filename(const char * filename,
char * result);

Like the function above, this function stores the fuzzy hash result
Expand Down
Loading

0 comments on commit 9c92207

Please sign in to comment.