Commit 5702cc06 authored by Hilko Bengen's avatar Hilko Bengen

New upstream version 20170930

parent f5b15a10
Acknowledgements: libfvde
Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
Copyright (C) 2011-2017, Omar Choudary <choudary.omar@gmail.com>
Joachim Metz <joachim.metz@gmail.com>
......@@ -77,6 +77,9 @@ Future considerations:
- rename library to libvcs ?
- rename FileVault to CoreStorage ?
20161103
* worked on tests
20160729
* worked on format support
......
......@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
include \
common \
libcstring \
libcerror \
libcthreads \
libcdata \
......@@ -17,11 +16,11 @@ SUBDIRS = \
libfcache \
libfdata \
libfguid \
libfplist \
libfvalue \
libhmac \
libcaes \
libfvde \
libcsystem \
fvdetools \
pyfvde \
pyfvde-python2 \
......@@ -37,13 +36,12 @@ DPKG_FILES = \
dpkg/compat \
dpkg/control \
dpkg/copyright \
dpkg/copyright.in \
dpkg/rules \
dpkg/libfvde.docs \
dpkg/libfvde-dev.docs \
dpkg/libfvde-python.docs \
dpkg/libfvde-python3.docs \
dpkg/libfvde-tools.docs \
dpkg/libfvde.install \
dpkg/libfvde-dev.install \
dpkg/libfvde-python.install \
dpkg/libfvde-python3.install \
dpkg/libfvde-tools.install \
dpkg/source/format
GETTEXT_FILES = \
......@@ -82,7 +80,6 @@ lib: library
library:
(cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libcstring && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libcdata && $(MAKE) $(AM_MAKEFLAGS))
......@@ -96,6 +93,8 @@ library:
(cd $(srcdir)/libfcache && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libfplist && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libhmac && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libcaes && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libfvde && $(MAKE) $(AM_MAKEFLAGS))
......@@ -114,7 +113,6 @@ distclean: clean
done && test -z "$$fail"
splint:
(cd $(srcdir)/libcstring && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libcerror && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libcthreads && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libcdata && $(MAKE) splint $(AM_MAKEFLAGS))
......@@ -128,10 +126,11 @@ splint:
(cd $(srcdir)/libfcache && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libfdata && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libfguid && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libfvalue && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libfplist && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libhmac && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libcaes && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libfvde && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/libcsystem && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/fvdetools && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/pyfvde && $(MAKE) splint $(AM_MAKEFLAGS))
(cd $(srcdir)/po && $(MAKE) splint $(AM_MAKEFLAGS))
......
This diff is collapsed.
dnl Checks for required headers and functions
dnl
dnl Version: 20170917
dnl Function to detect if libfvde dependencies are available
AC_DEFUN([AX_LIBFVDE_CHECK_LOCAL],
[dnl Check for internationalization functions in libfvde/libfvde_i18n.c
AC_CHECK_FUNCS([bindtextdomain])
[dnl Check for internationalization functions in libfvde/libfvde_i18n.c
AC_CHECK_FUNCS([bindtextdomain])
dnl Check if library should be build with verbose output
AX_COMMON_CHECK_ENABLE_VERBOSE_OUTPUT
dnl Check if library should be build with debug output
AX_COMMON_CHECK_ENABLE_DEBUG_OUTPUT
dnl Check if DLL support is needed
AS_IF(
[test "x$enable_shared" = xyes],
[AS_CASE(
[$host],
[*cygwin* | *mingw*],
[AC_DEFINE(
[HAVE_DLLMAIN],
[1],
[Define to 1 to enable the DllMain function.])
AC_SUBST(
[HAVE_DLLMAIN],
[1])
])
])
])
dnl Function to detect if fvdetools dependencies are available
AC_DEFUN([AX_FVDETOOLS_CHECK_LOCAL],
[dnl Headers included in fvdetools
AC_CHECK_HEADERS([signal.h sys/signal.h unistd.h])
dnl Functions included in fvdetools
AC_CHECK_FUNCS([close getopt setvbuf])
AS_IF(
[test "x$ac_cv_func_close" != xyes],
[AC_MSG_FAILURE(
[Missing function: close],
[1])
])
dnl Headers included in fvdetools/fvdemount.c
AC_CHECK_HEADERS([errno.h])
AC_HEADER_TIME
dnl Functions included in fvdetools/fvdemount.c
AS_IF(
[test "x$ac_cv_enable_winapi" = xno],
[AC_CHECK_FUNCS([getegid geteuid time])
])
dnl Check if tools should be build as static executables
AX_COMMON_CHECK_ENABLE_STATIC_EXECUTABLES
AM_PROG_LEX
AC_PROG_YACC])
dnl Check if DLL support is needed
AS_IF(
[test "x$enable_shared" = xyes && test "x$ac_cv_enable_static_executables" = xno],
[AS_CASE(
[$host],
[*cygwin* | *mingw*],
[AC_SUBST(
[LIBFVDE_DLL_IMPORT],
["-DLIBFVDE_DLL_IMPORT"])
])
])
])
This diff is collapsed.
......@@ -9,8 +9,11 @@ EXTRA_DIST = \
config_winapi.h \
file_stream.h \
memory.h \
narrow_string.h \
system_string.h \
types.h \
types.h.in
types.h.in \
wide_string.h
MAINTAINERCLEANFILES = \
Makefile.in
......
......@@ -98,19 +98,19 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/common.m4 \
$(top_srcdir)/m4/libcfile.m4 $(top_srcdir)/m4/libclocale.m4 \
$(top_srcdir)/m4/libcnotify.m4 $(top_srcdir)/m4/libcpath.m4 \
$(top_srcdir)/m4/libcrypto.m4 $(top_srcdir)/m4/libcsplit.m4 \
$(top_srcdir)/m4/libcstring.m4 $(top_srcdir)/m4/libcsystem.m4 \
$(top_srcdir)/m4/libcthreads.m4 $(top_srcdir)/m4/libfcache.m4 \
$(top_srcdir)/m4/libfdata.m4 $(top_srcdir)/m4/libfguid.m4 \
$(top_srcdir)/m4/libfuse.m4 $(top_srcdir)/m4/libfvalue.m4 \
$(top_srcdir)/m4/libhmac.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/libuna.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
$(top_srcdir)/m4/pthread.m4 $(top_srcdir)/m4/python.m4 \
$(top_srcdir)/m4/tests.m4 $(top_srcdir)/m4/types.m4 \
$(top_srcdir)/m4/wincrypt.m4 $(top_srcdir)/m4/zlib.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/m4/libfplist.m4 $(top_srcdir)/m4/libfuse.m4 \
$(top_srcdir)/m4/libfvalue.m4 $(top_srcdir)/m4/libhmac.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libuna.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/pthread.m4 \
$(top_srcdir)/m4/python.m4 $(top_srcdir)/m4/tests.m4 \
$(top_srcdir)/m4/types.m4 $(top_srcdir)/m4/wincrypt.m4 \
$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
......@@ -202,12 +202,11 @@ HAVE_LIBCLOCALE = @HAVE_LIBCLOCALE@
HAVE_LIBCNOTIFY = @HAVE_LIBCNOTIFY@
HAVE_LIBCPATH = @HAVE_LIBCPATH@
HAVE_LIBCSPLIT = @HAVE_LIBCSPLIT@
HAVE_LIBCSTRING = @HAVE_LIBCSTRING@
HAVE_LIBCSYSTEM = @HAVE_LIBCSYSTEM@
HAVE_LIBCTHREADS = @HAVE_LIBCTHREADS@
HAVE_LIBFCACHE = @HAVE_LIBFCACHE@
HAVE_LIBFDATA = @HAVE_LIBFDATA@
HAVE_LIBFGUID = @HAVE_LIBFGUID@
HAVE_LIBFPLIST = @HAVE_LIBFPLIST@
HAVE_LIBFUSE = @HAVE_LIBFUSE@
HAVE_LIBFVALUE = @HAVE_LIBFVALUE@
HAVE_LIBHMAC = @HAVE_LIBHMAC@
......@@ -221,12 +220,11 @@ HAVE_LOCAL_LIBCLOCALE = @HAVE_LOCAL_LIBCLOCALE@
HAVE_LOCAL_LIBCNOTIFY = @HAVE_LOCAL_LIBCNOTIFY@
HAVE_LOCAL_LIBCPATH = @HAVE_LOCAL_LIBCPATH@
HAVE_LOCAL_LIBCSPLIT = @HAVE_LOCAL_LIBCSPLIT@
HAVE_LOCAL_LIBCSTRING = @HAVE_LOCAL_LIBCSTRING@
HAVE_LOCAL_LIBCSYSTEM = @HAVE_LOCAL_LIBCSYSTEM@
HAVE_LOCAL_LIBCTHREADS = @HAVE_LOCAL_LIBCTHREADS@
HAVE_LOCAL_LIBFCACHE = @HAVE_LOCAL_LIBFCACHE@
HAVE_LOCAL_LIBFDATA = @HAVE_LOCAL_LIBFDATA@
HAVE_LOCAL_LIBFGUID = @HAVE_LOCAL_LIBFGUID@
HAVE_LOCAL_LIBFPLIST = @HAVE_LOCAL_LIBFPLIST@
HAVE_LOCAL_LIBFVALUE = @HAVE_LOCAL_LIBFVALUE@
HAVE_LOCAL_LIBHMAC = @HAVE_LOCAL_LIBHMAC@
HAVE_LOCAL_LIBUNA = @HAVE_LOCAL_LIBUNA@
......@@ -275,10 +273,6 @@ LIBCRYPTO_CPPFLAGS = @LIBCRYPTO_CPPFLAGS@
LIBCRYPTO_LIBADD = @LIBCRYPTO_LIBADD@
LIBCSPLIT_CPPFLAGS = @LIBCSPLIT_CPPFLAGS@
LIBCSPLIT_LIBADD = @LIBCSPLIT_LIBADD@
LIBCSTRING_CPPFLAGS = @LIBCSTRING_CPPFLAGS@
LIBCSTRING_LIBADD = @LIBCSTRING_LIBADD@
LIBCSYSTEM_CPPFLAGS = @LIBCSYSTEM_CPPFLAGS@
LIBCSYSTEM_LIBADD = @LIBCSYSTEM_LIBADD@
LIBCTHREADS_CPPFLAGS = @LIBCTHREADS_CPPFLAGS@
LIBCTHREADS_LIBADD = @LIBCTHREADS_LIBADD@
LIBDL_LIBADD = @LIBDL_LIBADD@
......@@ -288,6 +282,8 @@ LIBFDATA_CPPFLAGS = @LIBFDATA_CPPFLAGS@
LIBFDATA_LIBADD = @LIBFDATA_LIBADD@
LIBFGUID_CPPFLAGS = @LIBFGUID_CPPFLAGS@
LIBFGUID_LIBADD = @LIBFGUID_LIBADD@
LIBFPLIST_CPPFLAGS = @LIBFPLIST_CPPFLAGS@
LIBFPLIST_LIBADD = @LIBFPLIST_LIBADD@
LIBFUSE_CPPFLAGS = @LIBFUSE_CPPFLAGS@
LIBFUSE_LIBADD = @LIBFUSE_LIBADD@
LIBFVALUE_CPPFLAGS = @LIBFVALUE_CPPFLAGS@
......@@ -308,6 +304,7 @@ LN_S = @LN_S@
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
......@@ -335,7 +332,6 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSUB = @POSUB@
PTHREAD_CPPFLAGS = @PTHREAD_CPPFLAGS@
PTHREAD_LIBADD = @PTHREAD_LIBADD@
PWD = @PWD@
PYTHON = @PYTHON@
PYTHON2 = @PYTHON2@
PYTHON2_CONFIG = @PYTHON2_CONFIG@
......@@ -424,12 +420,6 @@ ax_libcrypto_spec_requires = @ax_libcrypto_spec_requires@
ax_libcsplit_pc_libs_private = @ax_libcsplit_pc_libs_private@
ax_libcsplit_spec_build_requires = @ax_libcsplit_spec_build_requires@
ax_libcsplit_spec_requires = @ax_libcsplit_spec_requires@
ax_libcstring_pc_libs_private = @ax_libcstring_pc_libs_private@
ax_libcstring_spec_build_requires = @ax_libcstring_spec_build_requires@
ax_libcstring_spec_requires = @ax_libcstring_spec_requires@
ax_libcsystem_pc_libs_private = @ax_libcsystem_pc_libs_private@
ax_libcsystem_spec_build_requires = @ax_libcsystem_spec_build_requires@
ax_libcsystem_spec_requires = @ax_libcsystem_spec_requires@
ax_libcthreads_pc_libs_private = @ax_libcthreads_pc_libs_private@
ax_libcthreads_spec_build_requires = @ax_libcthreads_spec_build_requires@
ax_libcthreads_spec_requires = @ax_libcthreads_spec_requires@
......@@ -442,6 +432,9 @@ ax_libfdata_spec_requires = @ax_libfdata_spec_requires@
ax_libfguid_pc_libs_private = @ax_libfguid_pc_libs_private@
ax_libfguid_spec_build_requires = @ax_libfguid_spec_build_requires@
ax_libfguid_spec_requires = @ax_libfguid_spec_requires@
ax_libfplist_pc_libs_private = @ax_libfplist_pc_libs_private@
ax_libfplist_spec_build_requires = @ax_libfplist_spec_build_requires@
ax_libfplist_spec_requires = @ax_libfplist_spec_requires@
ax_libfuse_pc_libs_private = @ax_libfuse_pc_libs_private@
ax_libfuse_spec_build_requires = @ax_libfuse_spec_build_requires@
ax_libfuse_spec_requires = @ax_libfuse_spec_requires@
......@@ -500,10 +493,6 @@ libcpath_CFLAGS = @libcpath_CFLAGS@
libcpath_LIBS = @libcpath_LIBS@
libcsplit_CFLAGS = @libcsplit_CFLAGS@
libcsplit_LIBS = @libcsplit_LIBS@
libcstring_CFLAGS = @libcstring_CFLAGS@
libcstring_LIBS = @libcstring_LIBS@
libcsystem_CFLAGS = @libcsystem_CFLAGS@
libcsystem_LIBS = @libcsystem_LIBS@
libcthreads_CFLAGS = @libcthreads_CFLAGS@
libcthreads_LIBS = @libcthreads_LIBS@
libdir = @libdir@
......@@ -514,6 +503,8 @@ libfdata_CFLAGS = @libfdata_CFLAGS@
libfdata_LIBS = @libfdata_LIBS@
libfguid_CFLAGS = @libfguid_CFLAGS@
libfguid_LIBS = @libfguid_LIBS@
libfplist_CFLAGS = @libfplist_CFLAGS@
libfplist_LIBS = @libfplist_LIBS@
libfvalue_CFLAGS = @libfvalue_CFLAGS@
libfvalue_LIBS = @libfvalue_LIBS@
libfvde_spec_build_requires = @libfvde_spec_build_requires@
......@@ -560,8 +551,11 @@ EXTRA_DIST = \
config_winapi.h \
file_stream.h \
memory.h \
narrow_string.h \
system_string.h \
types.h \
types.h.in
types.h.in \
wide_string.h
MAINTAINERCLEANFILES = \
Makefile.in
......
/*
* Byte stream functions
*
* Copyright (C) 2011-2016, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2011-2017, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......
/*
* Common include file
*
* Copyright (C) 2011-2016, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2011-2017, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......@@ -23,21 +23,21 @@
#define _COMMON_H
#if defined( HAVE_CONFIG_H )
#include <config.h>
#include "config.h"
#endif
/* Include the Borland/CodeGear C++ Builder compiler specific configuration
*/
#if defined( __BORLANDC__ )
#include <config_borlandc.h>
#include "config_borlandc.h"
/* Include the Microsoft Visual Studio C++ compiler specific configuration
*/
#elif defined( _MSC_VER )
#include <config_msc.h>
#include "config_msc.h"
#endif
#include <config_winapi.h>
#include "config_winapi.h"
#endif /* !defined( _COMMON_H ) */
......@@ -50,19 +50,19 @@
#define HAVE_ERRNO_H 1
/* Define to 1 if you have the `EVP_md5' function". */
#define HAVE_EVP_MD5 1
/* #undef HAVE_EVP_MD5 */
/* Define to 1 if you have the `EVP_sha1' function". */
#define HAVE_EVP_SHA1 1
/* #undef HAVE_EVP_SHA1 */
/* Define to 1 if you have the `EVP_sha224' function". */
#define HAVE_EVP_SHA224 1
/* #undef HAVE_EVP_SHA224 */
/* Define to 1 if you have the `EVP_sha256' function". */
#define HAVE_EVP_SHA256 1
/* #undef HAVE_EVP_SHA256 */
/* Define to 1 if you have the `EVP_sha512' function". */
#define HAVE_EVP_SHA512 1
/* #undef HAVE_EVP_SHA512 */
/* Define to 1 if you have the `fclose' function. */
#define HAVE_FCLOSE 1
......@@ -127,9 +127,6 @@
/* Define if the GNU gettext() function is already present or preinstalled. */
#define HAVE_GETTEXT 1
/* Define to 1 if you have the <glob.h> header file. */