[Forensics-changes] [afflib] 01/02: Imported Upstream version 3.7.7
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Mon Oct 12 12:35:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository afflib.
commit d34749fa164bb27f08be1f5809b401ed25c3c3c0
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Mon Oct 12 09:34:43 2015 -0300
Imported Upstream version 3.7.7
---
README | 2 +-
configure.ac | 2 +-
lib/afflib.cpp | 4 +-
lib/afflib.h | 20 ++++++++++
lib/afflib_i.h | 21 ----------
lib/crypto.cpp | 2 +-
lib/vnode_afd.cpp | 2 +-
tools/affinfo.cpp | 2 +-
tools/affuse.c | 2 -
win32/affconfig.h | 112 ++++++++++++++++++++++--------------------------------
win32/afflib.mak | 2 +-
11 files changed, 74 insertions(+), 97 deletions(-)
diff --git a/README b/README
index 3754fc6..18b6781 100644
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ computer forensic information. Critical features of AFF include:
- AFF allows you to store both computer forensic data and associated
metadata in one or more files.
- - AFF allows files to be digital singed, to provide for
+ - AFF allows files to be digital signed, to provide for
chain-of-custody and long-term file integrity.
- AFF allows for forensic disk images to stored encrypted and
diff --git a/configure.ac b/configure.ac
index 940353b..a5bab0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# See http://autotoolset.sourceforge.net/tutorial.html
# and http://www.openismus.com/documents/linux/automake/automake.shtml
-AC_INIT([AFFLIB],[3.7.6],[https://github.com/sshock/AFFLIBv3])
+AC_INIT([AFFLIB],[3.7.7],[https://github.com/sshock/AFFLIBv3])
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
diff --git a/lib/afflib.cpp b/lib/afflib.cpp
index 66d96a8..85688ad 100644
--- a/lib/afflib.cpp
+++ b/lib/afflib.cpp
@@ -840,7 +840,7 @@ int af_update_segf(AFFILE *af, const char *segname,
af->bytes_written += datalen;
#ifdef HAVE_AES_ENCRYPT
/* if we encrypted, make sure the unencrypted segment is deleted */
- if(oldname) (*af->v->del_seg)(af,oldname);
+ if(oldname && af->v->del_seg) (*af->v->del_seg)(af,oldname);
if(newdata){
free(newdata); // free any allocated data
newdata = 0;
@@ -852,7 +852,7 @@ int af_update_segf(AFFILE *af, const char *segname,
char encrypted_name[AF_MAX_NAME_LEN];
strlcpy(encrypted_name,segname,sizeof(encrypted_name));
strlcat(encrypted_name,AF_AES256_SUFFIX,sizeof(encrypted_name));
- if(*af->v->del_seg) (*af->v->del_seg)(af,encrypted_name); // no need to check error return
+ if(af->v->del_seg) (*af->v->del_seg)(af,encrypted_name); // no need to check error return
/* Sign the segment if:
diff --git a/lib/afflib.h b/lib/afflib.h
index d1ff54a..af4cf86 100644
--- a/lib/afflib.h
+++ b/lib/afflib.h
@@ -233,6 +233,7 @@ uint64_t af_tell(AFFILE *af);
int af_eof(AFFILE *af); // is the virtual file at the end?
/* Additional routines for writing */
+int af_set_maxsize(AFFILE *af,int64_t size); // sets maximum AFF file size
void af_set_callback(AFFILE *af, void (*cb)(struct affcallback_info *acbi));
void af_enable_compression(AFFILE *af,int type,int level); // set/gunset compression for writing
int af_compression_type(AFFILE *af);
@@ -247,6 +248,25 @@ int af_ext_is(const char *filename,const char *ext);
const char *af_filename(AFFILE *af); // returns the filename of an open stream.
int af_identify(AFFILE *af); // returns type of AFFILE pointer
+/* AFF implementation types returned by af_identify() and af_identify_file_type() */
+
+#define AF_IDENTIFY_RAW 0 // file is a raw file
+#define AF_IDENTIFY_AFF 1 // file is an AFF file
+#define AF_IDENTIFY_AFD 2 // file is a directory of AFF files
+#define AF_IDENTIFY_EVF 3 // file is an EnCase file
+#define AF_IDENTIFY_EVD 4 // file is a .E01 file when there are more files following
+#define AF_IDENTIFY_SPLIT_RAW 5 // file is a split raw file
+#define AF_IDENTIFY_AFM 6 // file is raw file with metadata
+#define AF_IDENTIFY_EWF 7 // libewf; deprecated
+#define AF_IDENTIFY_S3 8 // is an s3:/// file
+#define AF_IDENTIFY_VMDK 9 // QEMU support for VMDK format
+#define AF_IDENTIFY_DMG 10 // QEMU support for Apple DMG format
+#define AF_IDENTIFY_SPARSEIMAGE 11 // QEMU support for Apple SPARSEIMAGE format
+
+#define AF_IDENTIFY_ERR -1 // error encountered on identify
+#define AF_IDENTIFY_NOEXIST -2 // file does not exist
+
+
/* Accessor Functions */
int64_t af_get_imagesize(AFFILE *af); // byte # of last mapped byte in image, or size of device;
// returns -1 if error
diff --git a/lib/afflib_i.h b/lib/afflib_i.h
index b05374d..efa2019 100644
--- a/lib/afflib_i.h
+++ b/lib/afflib_i.h
@@ -538,26 +538,6 @@ int af_identify_file_type(const char *filename,int exists); // returns type of a
const char *af_identify_file_name(const char *filename,int exists); // returns name of a file type;
int split_raw_increment_fname (char *fn); /* exposed for testing in aftest */
-/* AFF implementation types returned by af_identify_type() and af_identify_name()*/
-
-#define AF_IDENTIFY_RAW 0 // file is a raw file
-#define AF_IDENTIFY_AFF 1 // file is an AFF file
-#define AF_IDENTIFY_AFD 2 // file is a directory of AFF files
-#define AF_IDENTIFY_EVF 3 // file is an EnCase file
-#define AF_IDENTIFY_EVD 4 // file is a .E01 file when there are more files following
-#define AF_IDENTIFY_SPLIT_RAW 5 // file is a split raw file
-#define AF_IDENTIFY_AFM 6 // file is raw file with metadata
-#define AF_IDENTIFY_EWF 7 // libewf; deprecated
-#define AF_IDENTIFY_S3 8 // is an s3:/// file
-#define AF_IDENTIFY_VMDK 9 // QEMU support for VMDK format
-#define AF_IDENTIFY_DMG 10 // QEMU support for Apple DMG format
-#define AF_IDENTIFY_SPARSEIMAGE 11 // QEMU support for Apple SPARSEIMAGE format
-
-
-#define AF_IDENTIFY_ERR -1 // error encountered on identify
-#define AF_IDENTIFY_NOEXIST -2 // file does not exist
-
-
AFFILE *af_open_with(const char *filename,int flags,int mode, struct af_vnode *v);
extern struct af_vnode *af_vnode_array[]; // array of filesystems; last is a "0"
@@ -635,7 +615,6 @@ int af_get_page(AFFILE *af,int64_t pagenum,uint8_t *data,size_t *bytes);
****************************************************************/
extern int af_cache_debug; // sets level of verbosity */
-int af_set_maxsize(AFFILE *af,int64_t size); // sets maximum AFF file size
int af_update_page(AFFILE *af,int64_t pagenum,uint8_t *data,int datalen);
int af_update_segf(AFFILE *af,const char *name,
uint32_t arg,const uint8_t *value,uint32_t vallen,uint32_t sigflag);
diff --git a/lib/crypto.cpp b/lib/crypto.cpp
index 446edf5..9cc13bf 100644
--- a/lib/crypto.cpp
+++ b/lib/crypto.cpp
@@ -633,7 +633,7 @@ int af_hash_verify_seg2(AFFILE *af,const char *segname,u_char *sigbuf_,size_t si
}
/* Verify a segment against a particular signature and public key */
-int af_sig_verify_seg2(AFFILE *af,const char *segname,EVP_PKEY */*pubkey*/,u_char *sigbuf,size_t sigbuf_len,int sigmode)
+int af_sig_verify_seg2(AFFILE *af,const char *segname,EVP_PKEY * /*pubkey*/,u_char *sigbuf,size_t sigbuf_len,int sigmode)
{
const EVP_MD *sha256 = EVP_get_digestbyname("SHA256");
if(!sha256){
diff --git a/lib/vnode_afd.cpp b/lib/vnode_afd.cpp
index e5afbac..e3c0c61 100644
--- a/lib/vnode_afd.cpp
+++ b/lib/vnode_afd.cpp
@@ -20,7 +20,7 @@
#endif
-#if defined(WIN32) and !defined(HAVE__MINGW_H)
+#if defined(WIN32) && !defined(HAVE__MINGW_H)
/**********************************************************************
* Implement dirent-style opendir/readdir/rewinddir/closedir on Win32
*
diff --git a/tools/affinfo.cpp b/tools/affinfo.cpp
index 47cbd22..be76f90 100644
--- a/tools/affinfo.cpp
+++ b/tools/affinfo.cpp
@@ -91,7 +91,7 @@ void bold(int on)
#ifdef HAVE_ISATTY
if(!isatty(fileno(stdout))) return;
#endif
-#if defined(HAVE_TPUTS)
+#if defined(HAVE_TPUTS) && defined(HAVE_CURSES_H) && defined(HAVE_TERM_H)
if(on) tputs(enter_bold_mode,1,putchar);
else tputs(exit_attribute_mode,0,putchar);
#endif
diff --git a/tools/affuse.c b/tools/affuse.c
index e911efa..2c3ed46 100644
--- a/tools/affuse.c
+++ b/tools/affuse.c
@@ -14,9 +14,7 @@
*
* *********************************************************/
-#if HAVE_CONFIG_H
#include "affconfig.h"
-#endif
#include <stdio.h>
#include <stdlib.h>
diff --git a/win32/affconfig.h b/win32/affconfig.h
old mode 100755
new mode 100644
index 620f1f0..19a161e
--- a/win32/affconfig.h
+++ b/win32/affconfig.h
@@ -1,68 +1,48 @@
-#include "../affconfig.h"
-#undef C_ALLOCA
-#undef DISABLE_QEMU
-#undef HAVE_ALLOCA_H
-#undef HAVE_CTYPE_H
-#undef HAVE_CURSES_H
-#undef HAVE_DIRENT_H
-#undef HAVE_ERR
-#undef HAVE_ERRX
-#undef HAVE_ERR_H
-#undef HAVE_GETPROGNAME
-#undef HAVE_INTTYPES_H
-#undef HAVE_LINUX_FS_H
-#undef HAVE_MALLOC_H
-#undef HAVE_NCURSES_TERM_H
-#undef HAVE_NDIR_H
-#undef HAVE_OPENSSL_FIPS_SHA_H
-#undef HAVE_POPEN
-#undef HAVE_SETUPTERM
-#undef HAVE_SHA256_H
-#undef HAVE_STRINGS_H
-#undef HAVE_STRLCAT
-#undef HAVE_STRLCPY
-#undef HAVE_SYS_CDEFS_H
-#undef HAVE_SYS_DIR_H
-#undef HAVE_SYS_DISK_H
-#undef HAVE_SYS_IOCTL_H
-#undef HAVE_SYS_NDIR_H
-#undef HAVE_SYS_PARAM_H
-#undef HAVE_SYS_SOCKET_H
-#undef HAVE_SYS_TIME_H
-#undef HAVE_SYS_VFS_H
-#undef HAVE_TERMCAP_H
-#undef HAVE_TERM_H
-#undef HAVE_UNISTD_H
-#undef HAVE_VALLOC
-#undef HAVE_WARN
-#undef HAVE_WARNX
-#undef TM_IN_SYS_TIME
-#undef USE_S3
+#include <windows.h>
+
+#define PACKAGE_VERSION "3.7.7"
+
+#undef USE_LIBEWF
#undef USE_QEMU
-#undef USE_SPARSEIMAGE
-#undef HAVE_STDINT_H
-#undef HAVE_INTTYPES_H
-#undef HAVE_LIBNCUSES
-#undef HAVE_PUTENV
-#undef HAVE_READLINE_READLINE_H
-#undef HAVE_LIBREADLINE
-#undef HAVE_ARPA_INET_H
-#undef HAVE_SYS_FILE_H
-#undef HAVE_FLOCK
-#undef HAVE_INTTYPES_H
+#undef USE_FUSE
+#undef USE_S3
+
+#define HAVE_AES_ENCRYPT 1
+#define HAVE_ASSERT_H 1
+#define HAVE_CSTRING 1
+#define HAVE_CTYPE_H 1
+#define HAVE_ERRNO_H 1
+#define HAVE_FCNTL_H 1
+#define HAVE_ISDIGIT 1
+#define HAVE_LIBCRYPTO 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MD5 1
+#define HAVE_OPENSSL_AES_H 1
+#define HAVE_OPENSSL_BIO_H 1
+#define HAVE_OPENSSL_EVP_H 1
+#define HAVE_OPENSSL_HMAC_H 1
+#define HAVE_OPENSSL_MD5_H 1
+#define HAVE_OPENSSL_PEM_H 1
+#define HAVE_OPENSSL_RAND_H 1
+#define HAVE_OPENSSL_RSA_H 1
+#define HAVE_OPENSSL_SHA_H 1
+#define HAVE_OPENSSL_X509_H 1
+#define HAVE_PEM_READ_BIO_RSA_PUBKEY 1
+#define HAVE_SHA1 1
+#define HAVE_STDIO_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_ZLIB_H 1
+
+#if _MSC_VER >= 1600
+#define HAVE_STDINT_H 1
+#endif
+
+#if _MSC_VER >= 1800
+#define HAVE_INTTYPES_H 1
+#endif
+
+typedef SSIZE_T ssize_t;
-#define HAVE_LIBEWF 1
-/* Define to 1 if you have the libewf_get_bytes_per_sector function. */
-#define HAVE_LIBEWF_GET_BYTES_PER_SECTOR 1
-/* Define to 1 if libewf_get_bytes_per_sector takes value as an argument. */
-#define HAVE_LIBEWF_GET_BYTES_PER_SECTOR_ARGUMENT_VALUE 1
-/* Define to 1 if you have the libewf_get_chunk_size function. */
-#define HAVE_LIBEWF_GET_CHUNK_SIZE 1
-/* Define to 1 if libewf_get_chunk_size takes value as an argument. */
-#define HAVE_LIBEWF_GET_CHUNK_SIZE_ARGUMENT_VALUE 1
-/* Define to 1 if you have the libewf_get_media_size function. */
-#define HAVE_LIBEWF_GET_MEDIA_SIZE 1
-/* Define to 1 if libewf_get_media_size takes value as an argument. */
-#define HAVE_LIBEWF_GET_MEDIA_SIZE_ARGUMENT_VALUE 1
-/* Define to 1 if you have the <libewf.h> header file. */
-#define HAVE_LIBEWF_H 1
diff --git a/win32/afflib.mak b/win32/afflib.mak
index e5456b9..7a7245c 100755
--- a/win32/afflib.mak
+++ b/win32/afflib.mak
@@ -155,7 +155,7 @@ afflib.lib: $(LIB_OBJS)
WIN32LIBS = ws2_32.lib advapi32.lib c:\openssl\lib\libeay32.lib
clean:
- del afflib.lib $(LIB_OBJS) $(TARGETS)
+ del afflib.lib $(LIB_OBJS) $(TARGETS) > NUL 2>&1
LINK_OPTS = /libpath:$(SDK_DIR)/Lib /nodefaultlib:libc $(WIN32LIBS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/afflib.git
More information about the forensics-changes
mailing list