Commit ee943c9b authored by Hilko Bengen's avatar Hilko Bengen

New upstream version 20190104

parent 833f776f
Acknowledgements: libfvde
Copyright (C) 2011-2018, Omar Choudary <choudary.omar@gmail.com>
Copyright (C) 2011-2019, Omar Choudary <choudary.omar@gmail.com>
Joachim Metz <joachim.metz@gmail.com>
......@@ -10,7 +10,7 @@
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
0. Additional Definitions.
As used herein, "this License" refers to version 3 of the GNU Lesser
General Public License, and the "GNU GPL" refers to version 3 of the GNU
......@@ -111,7 +111,7 @@ the following:
a copy of the Library already present on the user's computer
system, and (b) will operate properly with a modified version
of the Library that is interface-compatible with the Linked
Version.
Version.
e) Provide Installation Information, but only if you would otherwise
be required to provide such information under section 6 of the
......
This diff is collapsed.
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -109,9 +109,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/common.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/types.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 $(top_srcdir)/configure \
......@@ -187,7 +186,7 @@ am__recursive_targets = \
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir dist dist-all distcheck
cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
......@@ -386,6 +385,7 @@ LIBFUSE_CPPFLAGS = @LIBFUSE_CPPFLAGS@
LIBFUSE_LIBADD = @LIBFUSE_LIBADD@
LIBFVALUE_CPPFLAGS = @LIBFVALUE_CPPFLAGS@
LIBFVALUE_LIBADD = @LIBFVALUE_LIBADD@
LIBFVDE_DLL_EXPORT = @LIBFVDE_DLL_EXPORT@
LIBFVDE_DLL_IMPORT = @LIBFVDE_DLL_IMPORT@
LIBHMAC_CPPFLAGS = @LIBHMAC_CPPFLAGS@
LIBHMAC_LIBADD = @LIBHMAC_LIBADD@
......@@ -606,7 +606,6 @@ libfplist_CFLAGS = @libfplist_CFLAGS@
libfplist_LIBS = @libfplist_LIBS@
libfvalue_CFLAGS = @libfvalue_CFLAGS@
libfvalue_LIBS = @libfvalue_LIBS@
libfvde_spec_build_requires = @libfvde_spec_build_requires@
libfvde_spec_requires = @libfvde_spec_requires@
libfvde_spec_tools_build_requires = @libfvde_spec_tools_build_requires@
libhmac_CFLAGS = @libhmac_CFLAGS@
......@@ -737,8 +736,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
......@@ -898,7 +897,10 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
......
This diff is collapsed.
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -108,9 +108,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/common.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/types.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)
......@@ -288,6 +287,7 @@ LIBFUSE_CPPFLAGS = @LIBFUSE_CPPFLAGS@
LIBFUSE_LIBADD = @LIBFUSE_LIBADD@
LIBFVALUE_CPPFLAGS = @LIBFVALUE_CPPFLAGS@
LIBFVALUE_LIBADD = @LIBFVALUE_LIBADD@
LIBFVDE_DLL_EXPORT = @LIBFVDE_DLL_EXPORT@
LIBFVDE_DLL_IMPORT = @LIBFVDE_DLL_IMPORT@
LIBHMAC_CPPFLAGS = @LIBHMAC_CPPFLAGS@
LIBHMAC_LIBADD = @LIBHMAC_LIBADD@
......@@ -508,7 +508,6 @@ libfplist_CFLAGS = @libfplist_CFLAGS@
libfplist_LIBS = @libfplist_LIBS@
libfvalue_CFLAGS = @libfvalue_CFLAGS@
libfvalue_LIBS = @libfvalue_LIBS@
libfvde_spec_build_requires = @libfvde_spec_build_requires@
libfvde_spec_requires = @libfvde_spec_requires@
libfvde_spec_tools_build_requires = @libfvde_spec_tools_build_requires@
libhmac_CFLAGS = @libhmac_CFLAGS@
......@@ -582,8 +581,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
......@@ -670,7 +669,10 @@ cscopelist-am: $(am__tagged_files)
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
......
/*
* Byte stream functions
*
* Copyright (C) 2011-2018, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2011-2019, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......
/*
* Common include file
*
* Copyright (C) 2011-2018, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2011-2019, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......
......@@ -5,6 +5,12 @@
language is requested. */
#define ENABLE_NLS 1
/* Define to 1 if you have the `AES_cbc_encrypt' function". */
/* #undef HAVE_AES_CBC_ENCRYPT */
/* Define to 1 if you have the `AES_ecb_encrypt' function". */
/* #undef HAVE_AES_ECB_ENCRYPT */
/* Define to 1 if you have the `bindtextdomain' function. */
#define HAVE_BINDTEXTDOMAIN 1
......@@ -19,6 +25,9 @@
/* Define to 1 if you have the `chdir' function. */
#define HAVE_CHDIR 1
/* Define to 1 if you have the `clock_gettime' function. */
#define HAVE_CLOCK_GETTIME 1
/* Define to 1 if you have the `close' function. */
#define HAVE_CLOSE 1
......@@ -49,20 +58,44 @@
/* Define to 1 if you have the <errno.h> header file. */
#define HAVE_ERRNO_H 1
/* Define to 1 if you have the `EVP_CIPHER_CTX_cleanup' function". */
/* #undef HAVE_EVP_CIPHER_CTX_CLEANUP */
/* Define to 1 if you have the `EVP_CIPHER_CTX_init' function". */
/* #undef HAVE_EVP_CIPHER_CTX_INIT */
/* Define to 1 if you have the `EVP_aes_128_cbc', `EVP_aes_192_cbc' and
`EVP_aes_256_cbc' functions". */
#define HAVE_EVP_CRYPTO_AES_CBC 1
/* Define to 1 if you have the `EVP_aes_128_ecb', `EVP_aes_192_ecb' and
`EVP_aes_256_ecb' functions". */
#define HAVE_EVP_CRYPTO_AES_ECB 1
/* Define to 1 if you have the `EVP_aes_128_xts' and `EVP_aes_256_xts'
functions". */
#define HAVE_EVP_CRYPTO_AES_XTS 1
/* Define to 1 if you have the `EVP_md5' function". */
/* #undef HAVE_EVP_MD5 */
#define HAVE_EVP_MD5 1
/* Define to 1 if you have the `EVP_MD_CTX_cleanup' function". */
/* #undef HAVE_EVP_MD_CTX_CLEANUP */
/* Define to 1 if you have the `EVP_MD_CTX_init' function". */
/* #undef HAVE_EVP_MD_CTX_INIT */
/* Define to 1 if you have the `EVP_sha1' function". */
/* #undef HAVE_EVP_SHA1 */
#define HAVE_EVP_SHA1 1
/* Define to 1 if you have the `EVP_sha224' function". */
/* #undef HAVE_EVP_SHA224 */
#define HAVE_EVP_SHA224 1
/* Define to 1 if you have the `EVP_sha256' function". */
/* #undef HAVE_EVP_SHA256 */
#define HAVE_EVP_SHA256 1
/* Define to 1 if you have the `EVP_sha512' function". */
/* #undef HAVE_EVP_SHA512 */
#define HAVE_EVP_SHA512 1
/* Define to 1 if you have the `fclose' function. */
#define HAVE_FCLOSE 1
......@@ -358,6 +391,9 @@
/* Define to 1 if you have the mkdir function with a second mode argument. */
#define HAVE_MKDIR_MODE 1
/* Define to 1 if you have the `mkstemp' function. */
#define HAVE_MKSTEMP 1
/* Define to 1 if multi thread support should be used. */
#define HAVE_MULTI_THREAD_SUPPORT 1
......@@ -368,19 +404,19 @@
#define HAVE_OPEN 1
/* Define to 1 if you have the <openssl/aes.h> header file. */
#define HAVE_OPENSSL_AES_H 1
/* #undef HAVE_OPENSSL_AES_H */
/* Define to 1 if you have the <openssl/evp.h> header file. */
#define HAVE_OPENSSL_EVP_H 1
/* Define to 1 if you have the <openssl/md5.h> header file. */
#define HAVE_OPENSSL_MD5_H 1
/* #undef HAVE_OPENSSL_MD5_H */
/* Define to 1 if you have the <openssl/opensslv.h> header file. */
/* #undef HAVE_OPENSSL_OPENSSLV_H */
/* Define to 1 if you have the <openssl/sha.h> header file. */
#define HAVE_OPENSSL_SHA_H 1
/* #undef HAVE_OPENSSL_SHA_H */
/* Define to 1 if you have the <osxfuse/fuse.h> header file. */
/* #undef HAVE_OSXFUSE_FUSE_H */
......@@ -400,15 +436,6 @@
/* Define to 1 if you have the <pthread.h> header file. */
#define HAVE_PTHREAD_H 1
/* Define to 1 if you have Python */
/* #undef HAVE_PYTHON */
/* Define to 1 if you have Python 2 */
/* #undef HAVE_PYTHON2 */
/* Define to 1 if you have Python 3 */
/* #undef HAVE_PYTHON3 */
/* Define to 1 if you have the <Python.h> header file. */
/* #undef HAVE_PYTHON_H */
......@@ -574,9 +601,6 @@
/* Define to 1 if wide character type should be used. */
/* #undef HAVE_WIDE_CHARACTER_TYPE */
/* Define to 1 if you have the <wincrypt.h> header file. */
/* #undef HAVE_WINCRYPT_H */
/* Define to 1 if you have the <windows.h> header file. */
/* #undef HAVE_WINDOWS_H */
......@@ -617,7 +641,7 @@
#define PACKAGE_NAME "libfvde"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "libfvde 20180108"
#define PACKAGE_STRING "libfvde 20190104"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libfvde"
......@@ -626,11 +650,14 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
#define PACKAGE_VERSION "20180108"
#define PACKAGE_VERSION "20190104"
/* The size of `int', as computed by sizeof. */
#define SIZEOF_INT 4
/* The size of `long', as computed by sizeof. */
#define SIZEOF_LONG 8
/* The size of `off_t', as computed by sizeof. */
#define SIZEOF_OFF_T 8
......@@ -653,7 +680,7 @@
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
#define VERSION "20180108"
#define VERSION "20190104"
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
......
......@@ -4,6 +4,12 @@
language is requested. */
#undef ENABLE_NLS
/* Define to 1 if you have the `AES_cbc_encrypt' function". */
#undef HAVE_AES_CBC_ENCRYPT
/* Define to 1 if you have the `AES_ecb_encrypt' function". */
#undef HAVE_AES_ECB_ENCRYPT
/* Define to 1 if you have the `bindtextdomain' function. */
#undef HAVE_BINDTEXTDOMAIN
......@@ -18,6 +24,9 @@
/* Define to 1 if you have the `chdir' function. */
#undef HAVE_CHDIR
/* Define to 1 if you have the `clock_gettime' function. */
#undef HAVE_CLOCK_GETTIME
/* Define to 1 if you have the `close' function. */
#undef HAVE_CLOSE
......@@ -48,9 +57,33 @@
/* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H
/* Define to 1 if you have the `EVP_CIPHER_CTX_cleanup' function". */
#undef HAVE_EVP_CIPHER_CTX_CLEANUP
/* Define to 1 if you have the `EVP_CIPHER_CTX_init' function". */
#undef HAVE_EVP_CIPHER_CTX_INIT
/* Define to 1 if you have the `EVP_aes_128_cbc', `EVP_aes_192_cbc' and
`EVP_aes_256_cbc' functions". */
#undef HAVE_EVP_CRYPTO_AES_CBC
/* Define to 1 if you have the `EVP_aes_128_ecb', `EVP_aes_192_ecb' and
`EVP_aes_256_ecb' functions". */
#undef HAVE_EVP_CRYPTO_AES_ECB
/* Define to 1 if you have the `EVP_aes_128_xts' and `EVP_aes_256_xts'
functions". */
#undef HAVE_EVP_CRYPTO_AES_XTS
/* Define to 1 if you have the `EVP_md5' function". */
#undef HAVE_EVP_MD5
/* Define to 1 if you have the `EVP_MD_CTX_cleanup' function". */
#undef HAVE_EVP_MD_CTX_CLEANUP
/* Define to 1 if you have the `EVP_MD_CTX_init' function". */
#undef HAVE_EVP_MD_CTX_INIT
/* Define to 1 if you have the `EVP_sha1' function". */
#undef HAVE_EVP_SHA1
......@@ -357,6 +390,9 @@
/* Define to 1 if you have the mkdir function with a second mode argument. */
#undef HAVE_MKDIR_MODE
/* Define to 1 if you have the `mkstemp' function. */
#undef HAVE_MKSTEMP
/* Define to 1 if multi thread support should be used. */
#undef HAVE_MULTI_THREAD_SUPPORT
......@@ -399,15 +435,6 @@
/* Define to 1 if you have the <pthread.h> header file. */
#undef HAVE_PTHREAD_H
/* Define to 1 if you have Python */
#undef HAVE_PYTHON
/* Define to 1 if you have Python 2 */
#undef HAVE_PYTHON2
/* Define to 1 if you have Python 3 */
#undef HAVE_PYTHON3
/* Define to 1 if you have the <Python.h> header file. */
#undef HAVE_PYTHON_H
......@@ -573,9 +600,6 @@
/* Define to 1 if wide character type should be used. */
#undef HAVE_WIDE_CHARACTER_TYPE
/* Define to 1 if you have the <wincrypt.h> header file. */
#undef HAVE_WINCRYPT_H
/* Define to 1 if you have the <windows.h> header file. */
#undef HAVE_WINDOWS_H
......@@ -630,6 +654,9 @@
/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
/* The size of `off_t', as computed by sizeof. */
#undef SIZEOF_OFF_T
......
/*
* Configuration for the Borland/CodeGear C++ Builder compiler
*
* Copyright (C) 2011-2018, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2011-2019, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
......