[Forensics-changes] [afflib] 03/03: Merging upstream version 3.7.4-dfsg.
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Thu Oct 2 14:14:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch master
in repository afflib.
commit fe3350e03960618afcd0af0a469e93e776dbea72
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Thu Oct 2 11:09:51 2014 -0300
Merging upstream version 3.7.4-dfsg.
---
.gitignore | 98 ------
ChangeLog | 3 -
INSTALL | 8 +-
config.h.in | 446 ----------------------------
configure.ac | 4 -
lib/aff_db.cpp | 4 -
lib/afflib.cpp | 8 -
lib/afflib.h | 12 -
lib/afflib_i.h | 8 -
lib/afflib_os.cpp | 4 -
lib/afflib_stream.cpp | 4 -
lib/afflib_util.cpp | 4 -
lib/aftimer.h | 18 --
lib/crypto.cpp | 4 -
lib/s3.cpp | 4 -
lib/vnode_afd.cpp | 8 -
lib/vnode_aff.cpp | 17 --
lib/vnode_afm.cpp | 4 -
lib/vnode_raw.cpp | 4 -
lib/vnode_s3.cpp | 4 -
lib/vnode_split_raw.cpp | 17 --
lzma443/C/7zip/Archive/7z_C/makefile | 55 ++++
lzma443/C/7zip/Compress/LZMA_Alone/makefile | 100 +++++++
lzma443/C/7zip/Compress/LZMA_C/makefile | 43 +++
tests/encrypted.aff | Bin 0 -> 880 bytes
tools/aff_bom.cpp | 8 -
tools/test_fatty.sh | 4 -
tools/test_sealing.sh | 4 -
win32/affconfig.h | 68 +++++
29 files changed, 267 insertions(+), 698 deletions(-)
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 9137229..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,98 +0,0 @@
-depcomp
-
-# http://help.github.com/ignore-files/
-# Compiled source #
-###################
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-*.a
-
-# Packages #
-############
-# it's better to unpack these files and commit the raw source
-# git has its own built in compression methods
-*.7z
-*.dmg
-*.gz
-*.iso
-*.jar
-*.rar
-*.tar
-*.zip
-
-# Logs and databases #
-######################
-*.log
-*.sql
-*.sqlite
-
-# OS generated files #
-######################
-.DS_Store*
-ehthumbs.db
-Icon?
-Thumbs.db
-
-# Backup Files and autoconf nonsense
-# http://stackoverflow.com/questions/3290908/which-files-generated-by-autotools-should-i-keep-in-git-repository
-autom4te.cache
-*.aff
-*.obj
-*.sig
-*~
-Makefile
-Makefile.in
-Makefile.in
-TAGS
-a.out.dSYM
-aclocal.m4
-affconfig.h
-affconfig.h.in
-afflib-*.tar.gz
-afflib.lib
-afflib.pc
-afflib.spec
-autom4te.cache
-config.guess
-config.log
-config.status
-config.sub
-configure
-install-sh
-libtool
-ltmain.sh
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-missing
-stamp-h*
-
-# Executables
-.deps
-.libs
-TAGS
-tools/affdiskprint
-tools/affcat
-tools/affcompare
-tools/affconvert
-tools/affcopy
-tools/affcrypto
-tools/affinfo
-tools/affix
-tools/affrecover
-tools/affsegment
-tools/affsign
-tools/affstats
-tools/affuse
-tools/affverify
-tools/affxml
-
-lib/version.h
-*.lo
-*.la
diff --git a/ChangeLog b/ChangeLog
index fd9e716..469771e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
2013-11-16 Basic <simsong at Mucha.local>
* configure.ac: version bumped to 3.7.4
@@ -8,7 +6,6 @@
* configure.ac: updated for OSX Mavericks (10.9)
->>>>>>> upstream
2012-05-21 Simson Garfinkel <simsong at mncrnpsedu.local>
* configure.ac: version bumped to 3.7.1
diff --git a/INSTALL b/INSTALL
index 09544cd..8e14a0c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -11,16 +11,10 @@ To disable optimization, do this:
./configure 'CXXFLAGS=-O0 -g' 'CFLAGS=-O0 -g'
-<<<<<<< HEAD
-
-Optimization is automatically disabled if the environment variable
-AFF_NOOPT is set.
-=======
Optimization is automatically disabled if the environment variable
AFF_NOOPT is set.
If you are trying to compile out of a git or SVN repository, then you
need to run autoconf to create the configure script and other
tempaltes. We have provided a script called "./bootstrap.sh" that will
-do this for you.
->>>>>>> upstream
+do this for you.
\ No newline at end of file
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index 29d8294..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,446 +0,0 @@
-/* config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
- systems. This function is required for `alloca.c' support on those systems.
- */
-#undef CRAY_STACKSEG_END
-
-/* Define to 1 if using `alloca.c'. */
-#undef C_ALLOCA
-
-/* Define to 1 if you have the `AES_encrypt' function. */
-#undef HAVE_AES_ENCRYPT
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#undef HAVE_ALLOCA
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
- */
-#undef HAVE_ALLOCA_H
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#undef HAVE_ARPA_INET_H
-
-/* Define to 1 if you have the <assert.h> header file. */
-#undef HAVE_ASSERT_H
-
-/* Define to 1 if you have the `beep' function. */
-#undef HAVE_BEEP
-
-/* Define to 1 if you have the `CC_SHA256_Init' function. */
-#undef HAVE_CC_SHA256_INIT
-
-/* Define to 1 if you have the <CommonCrypto/CommonDigest.h> header file. */
-#undef HAVE_COMMONCRYPTO_COMMONDIGEST_H
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#undef HAVE_CTYPE_H
-
-/* Define to 1 if you have the <curses.h> header file. */
-#undef HAVE_CURSES_H
-
-/* Define to 1 if you have the `des_read_pw_string' function. */
-#undef HAVE_DES_READ_PW_STRING
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
- */
-#undef HAVE_DIRENT_H
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <dmalloc.h> header file. */
-#undef HAVE_DMALLOC_H
-
-/* Define to 1 if you have the `endwin' function. */
-#undef HAVE_ENDWIN
-
-/* Define to 1 if you have the `err' function. */
-#undef HAVE_ERR
-
-/* Define to 1 if you have the <errno.h> header file. */
-#undef HAVE_ERRNO_H
-
-/* Define to 1 if you have the `errx' function. */
-#undef HAVE_ERRX
-
-/* Define to 1 if you have the <err.h> header file. */
-#undef HAVE_ERR_H
-
-/* Define to 1 if you have the `err_set_exit' function. */
-#undef HAVE_ERR_SET_EXIT
-
-/* Define to 1 if you have the `EVP_read_pw_string' function. */
-#undef HAVE_EVP_READ_PW_STRING
-
-/* Define to 1 if you have the `EVP_sha256' function. */
-#undef HAVE_EVP_SHA256
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#undef HAVE_FCNTL_H
-
-/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
-#undef HAVE_FSEEKO
-
-/* Define to 1 if you have the `fstatfs' function. */
-#undef HAVE_FSTATFS
-
-/* Define to 1 if you have the `ftruncate' function. */
-#undef HAVE_FTRUNCATE
-
-/* Define to 1 if you have the <getopt.h> header file. */
-#undef HAVE_GETOPT_H
-
-/* Define to 1 if you have the `getprogname' function. */
-#undef HAVE_GETPROGNAME
-
-/* Define to 1 if you have the `gotorc' function. */
-#undef HAVE_GOTORC
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `isalnum' function. */
-#undef HAVE_ISALNUM
-
-/* Define to 1 if you have the `isalphanum' function. */
-#undef HAVE_ISALPHANUM
-
-/* Define to 1 if you have the `isatty' function. */
-#undef HAVE_ISATTY
-
-/* Define to 1 if you have the `isdigit' function. */
-#undef HAVE_ISDIGIT
-
-/* Define to 1 if you have the `crypto' library (-lcrypto). */
-#undef HAVE_LIBCRYPTO
-
-/* Define to 1 if you have the `curl' library (-lcurl). */
-#undef HAVE_LIBCURL
-
-/* Define to 1 if you have the `ewf' library (-lewf). */
-#undef HAVE_LIBEWF
-
-/* Define to 1 if you have the <libewf.h> header file. */
-#undef HAVE_LIBEWF_H
-
-/* Define to 1 if you have the `expat' library (-lexpat). */
-#undef HAVE_LIBEXPAT
-
-/* Define to 1 if you have the `md' library (-lmd). */
-#undef HAVE_LIBMD
-
-/* Define to 1 if you have the `ncurses' library (-lncurses). */
-#undef HAVE_LIBNCURSES
-
-/* Define to 1 if you have the `readline' library (-lreadline). */
-#undef HAVE_LIBREADLINE
-
-/* Define to 1 if you have the `ssl' library (-lssl). */
-#undef HAVE_LIBSSL
-
-/* Define to 1 if you have the `z' library (-lz). */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the <linux/fs.h> header file. */
-#undef HAVE_LINUX_FS_H
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#undef HAVE_MALLOC_H
-
-/* Define to 1 if you have the `MD5' function. */
-#undef HAVE_MD5
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
-/* Define to 1 if you have the `mkdir' function. */
-#undef HAVE_MKDIR
-
-/* Define to 1 if you have the <ncurses/term.h> header file. */
-#undef HAVE_NCURSES_TERM_H
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#undef HAVE_NETINET_IN_H
-
-/* Define to 1 if you have the <openssl/aes.h> header file. */
-#undef HAVE_OPENSSL_AES_H
-
-/* Define to 1 if you have the <openssl/bio.h> header file. */
-#undef HAVE_OPENSSL_BIO_H
-
-/* Define to 1 if you have the <openssl/evp.h> header file. */
-#undef HAVE_OPENSSL_EVP_H
-
-/* Define to 1 if you have the <openssl/fips_sha.h> header file. */
-#undef HAVE_OPENSSL_FIPS_SHA_H
-
-/* Define to 1 if you have the <openssl/hmac.h> header file. */
-#undef HAVE_OPENSSL_HMAC_H
-
-/* Define to 1 if you have the <openssl/md5.h> header file. */
-#undef HAVE_OPENSSL_MD5_H
-
-/* Define to 1 if you have the <openssl/pem.h> header file. */
-#undef HAVE_OPENSSL_PEM_H
-
-/* Define to 1 if you have the <openssl/rand.h> header file. */
-#undef HAVE_OPENSSL_RAND_H
-
-/* Define to 1 if you have the <openssl/rsa.h> header file. */
-#undef HAVE_OPENSSL_RSA_H
-
-/* Define to 1 if you have the <openssl/sha.h> header file. */
-#undef HAVE_OPENSSL_SHA_H
-
-/* Define to 1 if you have the `PEM_read_bio_RSA_PUBKEY' function. */
-#undef HAVE_PEM_READ_BIO_RSA_PUBKEY
-
-/* Define to 1 if you have the `popen' function. */
-#undef HAVE_POPEN
-
-/* Define to 1 if you have the `printw' function. */
-#undef HAVE_PRINTW
-
-/* Define to 1 if you have the `putenv' function. */
-#undef HAVE_PUTENV
-
-/* Define to 1 if you have the `RAND_pseudo_bytes' function. */
-#undef HAVE_RAND_PSEUDO_BYTES
-
-/* Define to 1 if you have the <readline/readline.h> header file. */
-#undef HAVE_READLINE_READLINE_H
-
-/* Define to 1 if you have the `regcomp' function. */
-#undef HAVE_REGCOMP
-
-/* Define to 1 if you have the `setupterm' function. */
-#undef HAVE_SETUPTERM
-
-/* Define to 1 if you have the <sha256.h> header file. */
-#undef HAVE_SHA256_H
-
-/* Define to 1 if you have the `SHA256_Init' function. */
-#undef HAVE_SHA256_INIT
-
-/* Define to 1 if you have the <signal.h> header file. */
-#undef HAVE_SIGNAL_H
-
-/* Do we have sockaddr.sin_len? */
-#undef HAVE_SOCKADDR_SIN_LEN
-
-/* Define to 1 if you have the `srandom' function. */
-#undef HAVE_SRANDOM
-
-/* Define to 1 if you have the `srandomdev' function. */
-#undef HAVE_SRANDOMDEV
-
-/* Define to 1 if stdbool.h conforms to C99. */
-#undef HAVE_STDBOOL_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strlcat' function. */
-#undef HAVE_STRLCAT
-
-/* Define to 1 if you have the `strlcpy' function. */
-#undef HAVE_STRLCPY
-
-/* Define to 1 if you have the `strrchr' function. */
-#undef HAVE_STRRCHR
-
-/* Define to 1 if `st_blocks' is member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_BLOCKS
-
-/* Define to 1 if `st_rdev' is member of `struct stat'. */
-#undef HAVE_STRUCT_STAT_ST_RDEV
-
-/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use
- `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
-#undef HAVE_ST_BLOCKS
-
-/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use
- `HAVE_STRUCT_STAT_ST_RDEV' instead. */
-#undef HAVE_ST_RDEV
-
-/* Define to 1 if you have the <sysexits.h> header file. */
-#undef HAVE_SYSEXITS_H
-
-/* Define to 1 if you have the <sys/cdefs.h> header file. */
-#undef HAVE_SYS_CDEFS_H
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
- */
-#undef HAVE_SYS_DIR_H
-
-/* Define to 1 if you have the <sys/disk.h> header file. */
-#undef HAVE_SYS_DISK_H
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#undef HAVE_SYS_IOCTL_H
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
- */
-#undef HAVE_SYS_NDIR_H
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#undef HAVE_SYS_PARAM_H
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#undef HAVE_SYS_SOCKET_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <sys/vfs.h> header file. */
-#undef HAVE_SYS_VFS_H
-
-/* Define to 1 if you have the <termcap.h> header file. */
-#undef HAVE_TERMCAP_H
-
-/* Define to 1 if you have the <term.h> header file. */
-#undef HAVE_TERM_H
-
-/* Define to 1 if you have the `tgetnum' function. */
-#undef HAVE_TGETNUM
-
-/* Define to 1 if you have the `tgetstr' function. */
-#undef HAVE_TGETSTR
-
-/* Define to 1 if you have the `tgoto' function. */
-#undef HAVE_TGOTO
-
-/* Define to 1 if you have the <time.h> header file. */
-#undef HAVE_TIME_H
-
-/* Define to 1 if you have the `tputs' function. */
-#undef HAVE_TPUTS
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `valloc' function. */
-#undef HAVE_VALLOC
-
-/* Define to 1 if you have the `warn' function. */
-#undef HAVE_WARN
-
-/* Define to 1 if you have the `warnx' function. */
-#undef HAVE_WARNX
-
-/* Define to 1 if you have the <zlib.h> header file. */
-#undef HAVE_ZLIB_H
-
-/* Define to 1 if the system has the type `_Bool'. */
-#undef HAVE__BOOL
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
- automatically deduced at runtime.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
-#undef STACK_DIRECTION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME
-
-/* Use FUSE to mount AFF images */
-#undef USE_FUSE
-
-/* Use libewf to read EnCase files */
-#undef USE_LIBEWF
-
-/* Enable support for Amazon S3 */
-#undef USE_S3
-
-/* Version number of package */
-#undef VERSION
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#undef _LARGEFILE_SOURCE
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef mode_t
-
-/* Define to `long int' if <sys/types.h> does not define. */
-#undef off_t
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
diff --git a/configure.ac b/configure.ac
index aa171fc..47a3e4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,11 +4,7 @@
# See http://autotoolset.sourceforge.net/tutorial.html
# and http://www.openismus.com/documents/linux/automake/automake.shtml
-<<<<<<< HEAD
-AC_INIT([AFFLIB],[3.7.1],[bugs at afflib.org])
-=======
AC_INIT([AFFLIB],[3.7.4],[bugs at afflib.org])
->>>>>>> upstream
AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
diff --git a/lib/aff_db.cpp b/lib/aff_db.cpp
index 1f0e9b0..1bc82d8 100644
--- a/lib/aff_db.cpp
+++ b/lib/aff_db.cpp
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/* Distributed under the 4-part Berkeley License */
-=======
/* Distributed under the 4-part Berkeley License */
->>>>>>> upstream
/*
* afflib_db.cpp:
diff --git a/lib/afflib.cpp b/lib/afflib.cpp
index 660b2af..48ada9b 100644
--- a/lib/afflib.cpp
+++ b/lib/afflib.cpp
@@ -654,11 +654,7 @@ void af_aes_decrypt(AFFILE *af,const char *segname,unsigned char *data,size_t *d
/* An encrypted segment was retrieved; decrypt and trunc the length as necessary */
uint32_t extra = (*datalen) % AES_BLOCK_SIZE;
uint32_t pad = (AES_BLOCK_SIZE - extra) % AES_BLOCK_SIZE;
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream
if(data==0){ // just wants to find out new length
if(extra>0){
*datalen -= AES_BLOCK_SIZE;
@@ -894,11 +890,7 @@ int af_update_seg(AFFILE *af, const char *segname,
#ifdef HAVE_OPENSSL_BIO_H
/* Requires no locking */
-<<<<<<< HEAD
-int af_update_seg_frombio(AFFILE *af,const char *segname,uint32_t arg,BIO *bio)
-=======
int af_update_seg_frombio(AFFILE *af,const char *segname,uint32_t /*arg*/,BIO *bio)
->>>>>>> upstream
{
/* Get the buffer to write out */
u_char *buf=0;
diff --git a/lib/afflib.h b/lib/afflib.h
index 0bbc2c2..d1ff54a 100644
--- a/lib/afflib.h
+++ b/lib/afflib.h
@@ -8,11 +8,7 @@
* The interface to reading AFF files and Raw files.
*
* Copyright (c) 2005-2006
-<<<<<<< HEAD
- * Simson L. Garfinkel and Basis Technology, Inc.
-=======
* Simson L. Garfinkel and Basis Technology, Inc.
->>>>>>> upstream
* All rights reserved.
*
* This code is derrived from software contributed by
@@ -47,11 +43,7 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-<<<<<<< HEAD
- * SUCH DAMAGE.
-=======
* SUCH DAMAGE.
->>>>>>> upstream
*/
/* Figure out what kind of OS we are running on */
@@ -159,11 +151,7 @@ struct af_vnode_info {
uint32_t segment_count_signed;
uint32_t segment_count_encrypted;
uint32_t page_count_encrypted;
-<<<<<<< HEAD
-}; //
-=======
}; //
->>>>>>> upstream
/* All of this stuff should be hidden inside a single private structure... */
diff --git a/lib/afflib_i.h b/lib/afflib_i.h
index a910d53..6fa02b6 100644
--- a/lib/afflib_i.h
+++ b/lib/afflib_i.h
@@ -6,11 +6,7 @@
*
*
* Copyright (c) 2005-2006
-<<<<<<< HEAD
- * Simson L. Garfinkel and Basis Technology, Inc.
-=======
* Simson L. Garfinkel and Basis Technology, Inc.
->>>>>>> upstream
* All rights reserved.
*
* This code is derrived from software contributed by
@@ -536,11 +532,7 @@ void af_initialize(); // initialize the AFFLIB
/* Internal identification routines */
int af_identify_file_type(const char *filename,int exists); // returns type of a file; if exists=1, file must exist
-<<<<<<< HEAD
-const char *af_identify_file_name(const char *filename,int exists); // returns name of a file type;
-=======
const char *af_identify_file_name(const char *filename,int exists); // returns name of a file type;
->>>>>>> upstream
int split_raw_increment_fname (char *fn); /* exposed for testing in aftest */
/* AFF implementation types returned by af_identify_type() and af_identify_name()*/
diff --git a/lib/afflib_os.cpp b/lib/afflib_os.cpp
index 9b07cc8..918cb64 100644
--- a/lib/afflib_os.cpp
+++ b/lib/afflib_os.cpp
@@ -2,11 +2,7 @@
* afflib_os.cpp:
*
* The OS-specific features of AFFLIB
-<<<<<<< HEAD
- *
-=======
*
->>>>>>> upstream
* This file is a work of a US government employee and as such is in the Public domain.
* Simson L. Garfinkel, March 12, 2012
*/
diff --git a/lib/afflib_stream.cpp b/lib/afflib_stream.cpp
index 1b95f3e..9db1604 100644
--- a/lib/afflib_stream.cpp
+++ b/lib/afflib_stream.cpp
@@ -16,11 +16,7 @@
#ifdef _WIN32
#define ASIZE SSIZE_T
#else
-<<<<<<< HEAD
-#define ASIZE ssize_t
-=======
#define ASIZE ssize_t
->>>>>>> upstream
#endif
diff --git a/lib/afflib_util.cpp b/lib/afflib_util.cpp
index d05899c..74687d9 100644
--- a/lib/afflib_util.cpp
+++ b/lib/afflib_util.cpp
@@ -91,11 +91,7 @@ const char *af_hexbuf(char *dst,int dst_len,const unsigned char *bin,int bytes,i
dst_len -= 2;
bytes--;
charcount++; // how many characters
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream
if((flag & AF_HEXBUF_SPACE4) && charcount%2==0){
*dst++ = ' ';
*dst = '\000';
diff --git a/lib/aftimer.h b/lib/aftimer.h
index d1e3394..463def9 100644
--- a/lib/aftimer.h
+++ b/lib/aftimer.h
@@ -41,21 +41,13 @@ public:
std::string eta_time(double fraction_done); // the actual time
};
-<<<<<<< HEAD
-/* This code in part from
-=======
/* This code in part from
->>>>>>> upstream
* http://social.msdn.microsoft.com/Forums/en/vcgeneral/thread/430449b3-f6dd-4e18-84de-eebd26a8d668
*/
#ifdef WIN32
# include <winsock2.h>
-<<<<<<< HEAD
-# include <windows.h>
-=======
# include <windows.h>
->>>>>>> upstream
# ifndef DELTA_EPOCH_IN_MICROSECS
# if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
# define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64
@@ -74,15 +66,9 @@ inline void timestamp(struct timeval *t)
tmpres |= ft.dwHighDateTime;
tmpres <<= 32;
tmpres |= ft.dwLowDateTime;
-<<<<<<< HEAD
-
- /*converting file time to unix epoch*/
- tmpres -= DELTA_EPOCH_IN_MICROSECS;
-=======
/*converting file time to unix epoch*/
tmpres -= DELTA_EPOCH_IN_MICROSECS;
->>>>>>> upstream
tmpres /= 10; /*convert into microseconds*/
t->tv_sec = (long)(tmpres / 1000000UL);
t->tv_usec = (long)(tmpres % 1000000UL);
@@ -187,11 +173,7 @@ inline std::string aftimer::eta_time(double fraction_done)
#else
tm = *localtime(&when);
#endif
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream
char buf[64];
snprintf(buf,sizeof(buf),"%02d:%02d:%02d",tm.tm_hour,tm.tm_min,tm.tm_sec);
return std::string(buf);
diff --git a/lib/crypto.cpp b/lib/crypto.cpp
index de79d5e..446edf5 100644
--- a/lib/crypto.cpp
+++ b/lib/crypto.cpp
@@ -187,11 +187,7 @@ int af_save_aes_key_with_passphrase(AFFILE *af,const char *passphrase, const u_c
/** MacOS 10.5 with GCC 4.0.1 packed affkey at 52 bytes.
** Linux GCC 4.1.2 packed affkey at 56 bytes. It should be 52 bytes
** --- 4 bytes for the version number, 32 bytes for the affkey, 16 bytes for encryption of zeros.
-<<<<<<< HEAD
- ** original code specified the version as uint32_t version:32, for which the
-=======
** original code specified the version as uint32_t version:32, for which the
->>>>>>> upstream
** compiler allocated 64 bits...
** So this code needs to be willing to accept a 52-byte or 56-byte affkey.
**/
diff --git a/lib/s3.cpp b/lib/s3.cpp
index da38e7c..e9e03c2 100644
--- a/lib/s3.cpp
+++ b/lib/s3.cpp
@@ -5,11 +5,7 @@
* These features would be nice:
* have "ls" use Delimiter option to just list the drives
* Give "ls" an option to list just the AFF files.
-<<<<<<< HEAD
- * Have implementation read a list of all the segments on open, and cache this.
-=======
* Have implementation read a list of all the segments on open, and cache this.
->>>>>>> upstream
*
* Distributed under the Berkeley 4-part license.
* Simson L. Garfinkel, March 12, 2012
diff --git a/lib/vnode_afd.cpp b/lib/vnode_afd.cpp
index 10e5212..e5afbac 100644
--- a/lib/vnode_afd.cpp
+++ b/lib/vnode_afd.cpp
@@ -319,11 +319,7 @@ static int afd_add_file(AFFILE *af,const char *fname_)
unsigned char data[65536]; // big enough for most metadata
size_t datalen = sizeof(data);
uint32_t arg=0;
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream
if(af_get_seg(af0,*segname,&arg,data,&datalen)==0){
int r = af_update_seg(af2,*segname,arg,data,datalen);
if(r!=0){
@@ -502,11 +498,7 @@ static int afd_rewind_seg(AFFILE *af)
*/
static int afd_update_seg(AFFILE *af, const char *name,
uint32_t arg,const u_char *value,uint32_t vallen)
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream
{
struct afd_private *ap = AFD_PRIVATE(af);
AFFILE *af2 = afd_file_with_seg(af,name);
diff --git a/lib/vnode_aff.cpp b/lib/vnode_aff.cpp
index 2c1a936..1fac55e 100644
--- a/lib/vnode_aff.cpp
+++ b/lib/vnode_aff.cpp
@@ -22,19 +22,11 @@
static int aff_write_ignore(AFFILE *af,size_t bytes);
static int aff_write_seg(AFFILE *af,const char *name,uint32_t arg,
-<<<<<<< HEAD
- const u_char *value,size_t vallen);
-static int aff_get_seg(AFFILE *af,const char *name,uint32_t *arg,
- unsigned char *data,size_t *datalen);
-#ifdef KERNEL_LIBRARY
-static int aff_write_seg_no_data(AFFILE *af,const char *name,uint32_t arg, size_t vallen);
-=======
const u_char *value,size_t vallen);
static int aff_get_seg(AFFILE *af,const char *name,uint32_t *arg,
unsigned char *data,size_t *datalen);
#ifdef KERNEL_LIBRARY
static int aff_write_seg_no_data(AFFILE *af,const char *name,uint32_t arg, size_t vallen);
->>>>>>> upstream
#endif
static int aff_get_next_seg(AFFILE *af,char *segname,size_t segname_len,
uint32_t *arg, unsigned char *data, size_t *datalen);
@@ -148,11 +140,7 @@ int aff_write_seg(AFFILE *af, const char *segname,uint32_t arg,const u_char *dat
segt.segment_len = htonl(sizeof(segh)+segname_len + datalen + sizeof(segt));
aff_toc_update(af,segname,ftello(af->aseg),datalen);
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream
if(af_trace) fprintf(af_trace,"aff_write_seg: putting segment %s (datalen=%d) offset=%"PRId64"\n",
segname,(int)datalen,ftello(af->aseg));
@@ -374,11 +362,6 @@ static int aff_update_seg(AFFILE *af, const char *name,
{
size_t size_needed = vallen+aff_segment_overhead(name);
struct aff_toc_mem *adm = aff_toc(af,name);
-<<<<<<< HEAD
-
- if(af_trace) fprintf(af_trace,"aff_update_seg(name=%s,arg=%"PRIu32",vallen=%u)\n",name,arg,vallen);
-=======
->>>>>>> upstream
if(af_trace) fprintf(af_trace,"aff_update_seg(name=%s,arg=%"PRIu32",vallen=%u)\n",name,arg,vallen);
diff --git a/lib/vnode_afm.cpp b/lib/vnode_afm.cpp
index d5f24ef..a037a50 100644
--- a/lib/vnode_afm.cpp
+++ b/lib/vnode_afm.cpp
@@ -317,11 +317,7 @@ static int afm_rewind_seg(AFFILE *af)
*/
static int afm_update_seg(AFFILE *af, const char *name,
uint32_t arg,const u_char *value,uint32_t vallen)
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream
{
struct afm_private *ap = AFM_PRIVATE(af);
int64_t page_num = af_segname_page_number(name); // <0 means update metadata
diff --git a/lib/vnode_raw.cpp b/lib/vnode_raw.cpp
index 794138c..83c91b5 100644
--- a/lib/vnode_raw.cpp
+++ b/lib/vnode_raw.cpp
@@ -206,11 +206,7 @@ static int raw_get_seg(AFFILE *af,const char *name,
int raw_update_seg(AFFILE *af, const char *name,
-<<<<<<< HEAD
- uint32_t arg,const u_char *value,uint32_t vallen)
-=======
uint32_t /*arg*/,const u_char *value,uint32_t vallen)
->>>>>>> upstream
{
struct raw_private *rp = RAW_PRIVATE(af);
diff --git a/lib/vnode_s3.cpp b/lib/vnode_s3.cpp
index 1be5a3b..5e3ddec 100644
--- a/lib/vnode_s3.cpp
+++ b/lib/vnode_s3.cpp
@@ -262,11 +262,7 @@ static int s3_rewind_seg(AFFILE *af)
*/
static int s3_update_seg(AFFILE *af, const char *name,
uint32_t arg,const u_char *value,uint32_t vallen)
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream
{
struct s3_private *sp =S3_PRIVATE(af);
char metabuf[64];
diff --git a/lib/vnode_split_raw.cpp b/lib/vnode_split_raw.cpp
index 17de27c..46c37ae 100644
--- a/lib/vnode_split_raw.cpp
+++ b/lib/vnode_split_raw.cpp
@@ -132,20 +132,12 @@ int split_raw_increment_fname (char *fn)
/* Get the case */
int lower = islower(ext[0]);
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream
/* Convert to all uppercase */
for(int i=0;i<3;i++){
if(isalpha(ext[i])) ext[i] = toupper(ext[i]);
}
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream
/* Increment */
if(incval(ext[2],10)){
if(incval(ext[1],36)){
@@ -544,11 +536,7 @@ static int split_raw_get_seg(AFFILE *af,const char *name,uint32_t *arg,unsigned
uint32_t bytes_to_read = af->image_pagesize; // copy this many bytes, unless
if(bytes_to_read > bytes_left) bytes_to_read = (uint32_t)bytes_left; // only this much is left
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream
if(arg) *arg = 0; // arg is always 0
if(datalen){
if(data==0){ // asked for 0 bytes, so give the actual size
@@ -615,13 +603,8 @@ static int split_raw_rewind_seg(AFFILE *af)
}
static int split_raw_update_seg(AFFILE *af, const char *name,
-<<<<<<< HEAD
- uint32_t arg,const u_char *value,uint32_t vallen)
-
-=======
uint32_t /*arg*/,const u_char *value,uint32_t vallen)
->>>>>>> upstream
{
int64_t page_num = af_segname_page_number(name);
if(page_num<0){
diff --git a/lzma443/C/7zip/Archive/7z_C/makefile b/lzma443/C/7zip/Archive/7z_C/makefile
new file mode 100755
index 0000000..eafbd05
--- /dev/null
+++ b/lzma443/C/7zip/Archive/7z_C/makefile
@@ -0,0 +1,55 @@
+PROG = 7zDec.exe
+
+!IFNDEF O
+!IFDEF CPU
+O=$(CPU)
+!ELSE
+O=O
+!ENDIF
+!ENDIF
+
+CFLAGS = $(CFLAGS) -nologo -c -Fo$O/ -GS-
+CFLAGS_O1 = $(CFLAGS) -O1
+CFLAGS_O2 = $(CFLAGS) -O2
+
+LFLAGS = $(LFLAGS) -nologo -OPT:NOWIN98
+
+PROGPATH = $O\$(PROG)
+
+COMPL_O1 = $(CPP) $(CFLAGS_O1) $**
+COMPL_O2 = $(CPP) $(CFLAGS_O2) $**
+COMPL = $(CPP) $(CFLAGS_O1) $**
+
+
+7Z_OBJS = \
+ $O\7zAlloc.obj \
+ $O\7zBuffer.obj \
+ $O\7zCrc.obj \
+ $O\7zDecode.obj \
+ $O\7zExtract.obj \
+ $O\7zHeader.obj \
+ $O\7zIn.obj \
+ $O\7zItem.obj \
+ $O\7zMain.obj \
+ $O\7zMethodID.obj \
+
+OBJS = \
+ $(7Z_OBJS) \
+ $O\LzmaDecode.obj \
+
+all: $(PROGPATH)
+
+clean:
+ -del /Q $(PROGPATH) $O\*.exe $O\*.dll $O\*.obj $O\*.lib $O\*.exp $O\*.res $O\*.pch
+
+$O:
+ if not exist "$O" mkdir "$O"
+
+$(PROGPATH): $O $(OBJS)
+ link $(LFLAGS) -out:$(PROGPATH) $(OBJS) $(LIBS)
+
+
+$(7Z_OBJS): $(*B).c
+ $(COMPL)
+$O\LzmaDecode.obj: ../../Compress/LZMA_C/$(*B).c
+ $(COMPL_O2)
diff --git a/lzma443/C/7zip/Compress/LZMA_Alone/makefile b/lzma443/C/7zip/Compress/LZMA_Alone/makefile
new file mode 100755
index 0000000..5b8d0a3
--- /dev/null
+++ b/lzma443/C/7zip/Compress/LZMA_Alone/makefile
@@ -0,0 +1,100 @@
+PROG = lzma.exe
+CFLAGS = $(CFLAGS) -I ../../../
+LIBS = $(LIBS) oleaut32.lib user32.lib
+
+!IFNDEF O
+!IFDEF CPU
+O=$(CPU)
+!ELSE
+O=O
+!ENDIF
+!ENDIF
+
+CFLAGS = $(CFLAGS) -nologo -EHsc -c -Fo$O/ -GS-
+CFLAGS_O1 = $(CFLAGS) -O1
+CFLAGS_O2 = $(CFLAGS) -O2
+
+LFLAGS = $(LFLAGS) -nologo -OPT:NOWIN98
+
+PROGPATH = $O\$(PROG)
+
+COMPL_O1 = $(CPP) $(CFLAGS_O1) $**
+COMPL_O2 = $(CPP) $(CFLAGS_O2) $**
+COMPL = $(CPP) $(CFLAGS_O1) $**
+
+
+LZMA_OBJS = \
+ $O\LzmaAlone.obj \
+ $O\LzmaBench.obj \
+ $O\LzmaRam.obj \
+
+LZMA_OPT_OBJS = \
+ $O\LZMADecoder.obj \
+ $O\LZMAEncoder.obj \
+
+COMMON_OBJS = \
+ $O\Alloc.obj \
+ $O\CRC.obj \
+ $O\CommandLineParser.obj \
+ $O\String.obj \
+ $O\StringConvert.obj \
+ $O\StringToInt.obj \
+ $O\Vector.obj
+
+7ZIP_COMMON_OBJS = \
+ $O\InBuffer.obj \
+ $O\OutBuffer.obj \
+ $O\StreamUtils.obj \
+
+LZ_OBJS = \
+ $O\LZInWindow.obj \
+ $O\LZOutWindow.obj \
+
+
+OBJS = \
+ $(LZMA_OBJS) \
+ $(LZMA_OPT_OBJS) \
+ $(COMMON_OBJS) \
+ $(7ZIP_COMMON_OBJS) \
+ $(LZ_OBJS) \
+ $O\LzmaRamDecode.obj \
+ $O\LzmaDecode.obj \
+ $O\FileStreams.obj \
+ $O\FileIO.obj \
+ $O\RangeCoderBit.obj \
+ $O\BranchX86.obj \
+
+all: $(PROGPATH)
+
+clean:
+ -del /Q $(PROGPATH) $O\*.exe $O\*.dll $O\*.obj $O\*.lib $O\*.exp $O\*.res $O\*.pch
+
+$O:
+ if not exist "$O" mkdir "$O"
+
+$(PROGPATH): $O $(OBJS)
+ link $(LFLAGS) -out:$(PROGPATH) $(OBJS) $(LIBS)
+
+
+$(LZMA_OBJS): $(*B).cpp
+ $(COMPL)
+$(LZMA_OPT_OBJS): ../LZMA/$(*B).cpp
+ $(COMPL_O2)
+$(COMMON_OBJS): ../../../Common/$(*B).cpp
+ $(COMPL)
+$(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp
+ $(COMPL)
+$(LZ_OBJS): ../LZ/$(*B).cpp
+ $(COMPL)
+$O\RangeCoderBit.obj: ../RangeCoder/$(*B).cpp
+ $(COMPL)
+$O\LzmaRamDecode.obj: LzmaRamDecode.c
+ $(COMPL_O1)
+$O\LzmaDecode.obj: ../LZMA_C/LzmaDecode.c
+ $(COMPL_O2)
+$O\BranchX86.obj: ../Branch/BranchX86.c
+ $(COMPL_O2)
+$O\FileStreams.obj: ../../Common/FileStreams.cpp
+ $(COMPL)
+$O\FileIO.obj: ../../../Windows/FileIO.cpp
+ $(COMPL)
diff --git a/lzma443/C/7zip/Compress/LZMA_C/makefile b/lzma443/C/7zip/Compress/LZMA_C/makefile
new file mode 100755
index 0000000..f8e193b
--- /dev/null
+++ b/lzma443/C/7zip/Compress/LZMA_C/makefile
@@ -0,0 +1,43 @@
+PROG = lzmaDec.exe
+
+!IFNDEF O
+!IFDEF CPU
+O=$(CPU)
+!ELSE
+O=O
+!ENDIF
+!ENDIF
+
+CFLAGS = $(CFLAGS) -nologo -c -Fo$O/ -GS-
+CFLAGS_O1 = $(CFLAGS) -O1
+CFLAGS_O2 = $(CFLAGS) -O2
+
+LFLAGS = $(LFLAGS) -nologo -OPT:NOWIN98
+
+PROGPATH = $O\$(PROG)
+
+COMPL_O1 = $(CPP) $(CFLAGS_O1) $**
+COMPL_O2 = $(CPP) $(CFLAGS_O2) $**
+COMPL = $(CPP) $(CFLAGS_O1) $**
+
+
+OBJS = \
+ $O\LzmaTest.obj \
+ $O\LzmaDecode.obj \
+
+all: $(PROGPATH)
+
+clean:
+ -del /Q $(PROGPATH) $O\*.exe $O\*.dll $O\*.obj $O\*.lib $O\*.exp $O\*.res $O\*.pch
+
+$O:
+ if not exist "$O" mkdir "$O"
+
+$(PROGPATH): $O $(OBJS)
+ link $(LFLAGS) -out:$(PROGPATH) $(OBJS) $(LIBS)
+
+
+$O\LzmaTest.obj: $(*B).c
+ $(COMPL)
+$O\LzmaDecode.obj: ../../Compress/LZMA_C/$(*B).c
+ $(COMPL_O2)
diff --git a/tests/encrypted.aff b/tests/encrypted.aff
new file mode 100644
index 0000000..acdc723
Binary files /dev/null and b/tests/encrypted.aff differ
diff --git a/tools/aff_bom.cpp b/tools/aff_bom.cpp
index 102bf55..a7974b7 100644
--- a/tools/aff_bom.cpp
+++ b/tools/aff_bom.cpp
@@ -212,23 +212,15 @@ int aff_bom::write(AFFILE *af,aff::seglist &segments)
}
-<<<<<<< HEAD
-void aff_bom::make_hash(u_char seghash[32], uint32_t arg,const char *segname,
-=======
#define SHA256_SIZE 32
void aff_bom::make_hash(u_char seghash[SHA256_SIZE], uint32_t arg,const char *segname,
->>>>>>> upstream
const u_char *segbuf, uint32_t segsize)
{
OpenSSL_add_all_digests(); // probably a good idea
const EVP_MD *sha256 = EVP_get_digestbyname("SHA256");
if(sha256){
-<<<<<<< HEAD
- unsigned int seghash_len = sizeof(seghash);
-=======
unsigned int seghash_len = SHA256_SIZE;
->>>>>>> upstream
uint32_t arg_net = htonl(arg);
EVP_MD_CTX md; /* EVP message digest */
EVP_DigestInit(&md,sha256);
diff --git a/tools/test_fatty.sh b/tools/test_fatty.sh
index c18e7c2..90d572b 100644
--- a/tools/test_fatty.sh
+++ b/tools/test_fatty.sh
@@ -1,7 +1,3 @@
# This file is a work of a US government employee and as such is in the Public domain.
# Simson L. Garfinkel, March 12, 2012
-<<<<<<< HEAD
-./affconvert -o file://:password@/fatty.afd fatty.iso
-=======
./affconvert -o file://:password@/fatty.afd fatty.raw
->>>>>>> upstream
diff --git a/tools/test_sealing.sh b/tools/test_sealing.sh
index 154d92c..77d1257 100755
--- a/tools/test_sealing.sh
+++ b/tools/test_sealing.sh
@@ -8,11 +8,7 @@
BASE=`mktemp -t testfileXXXX`
SEALING_KEY=$BASE.sealing.key
SEALING_PEM=$BASE.sealing.pem
-<<<<<<< HEAD
-EVIDENCE_ISO=$BASE.evidence.iso
-=======
EVIDENCE_ISO=$BASE.evidence.raw
->>>>>>> upstream
EVIDENCE_AFF=$BASE.evidence.aff
/bin/rm -f $SEALING_KEY $SEALING_PEM $EVIDENCE_ISO $EVIDENCE_AFF
diff --git a/win32/affconfig.h b/win32/affconfig.h
new file mode 100755
index 0000000..620f1f0
--- /dev/null
+++ b/win32/affconfig.h
@@ -0,0 +1,68 @@
+#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
+#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
+
+#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
--
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