Skip to content

Commit

Permalink
Applied updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Jan 8, 2016
1 parent 76134ef commit 82c2461
Show file tree
Hide file tree
Showing 126 changed files with 292 additions and 151 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
@@ -1,5 +1,5 @@
Acknowledgements: libfvde

Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
Joachim Metz <joachim.metz@gmail.com>

48 changes: 41 additions & 7 deletions autogen.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Script to generate ./configure using the autotools
#
# Version: 20141007
# Version: 20160106

EXIT_SUCCESS=0;
EXIT_FAILURE=1;
Expand Down Expand Up @@ -47,6 +47,10 @@ LIBTOOLIZE="${BINDIR}/libtoolize";
if test -x "${AUTORECONF}";
then
${AUTORECONF} --force --install
if test $? -ne 0;
then
exit $?;
fi
else
if ! test -x "${ACLOCAL}";
then
Expand Down Expand Up @@ -90,12 +94,42 @@ else
exit ${EXIT_FAILURE};
fi

${AUTOPOINT} --force
${ACLOCAL} --force -I m4
${LIBTOOLIZE} --force
${AUTOHEADER} --force
${AUTOCONF} --force
${AUTOMAKE} --force --add-missing
${AUTOPOINT} --force;
if test $? -ne 0;
then
exit $?;
fi

${ACLOCAL} --force -I m4;
if test $? -ne 0;
then
exit $?;
fi

${LIBTOOLIZE} --force;
if test $? -ne 0;
then
exit $?;
fi

${AUTOHEADER} --force;
if test $? -ne 0;
then
exit $?;
fi

${AUTOCONF} --force;
if test $? -ne 0;
then
exit $?;
fi

${AUTOMAKE} --force --add-missing;
if test $? -ne 0;
then
exit $?;
fi

fi

exit ${EXIT_SUCCESS};
Expand Down
2 changes: 1 addition & 1 deletion common/byte_stream.h
@@ -1,7 +1,7 @@
/*
* Byte stream functions
*
* Copyright (C) 2006-2015, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/common.h
@@ -1,7 +1,7 @@
/*
* Common include file
*
* Copyright (C) 2006-2015, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/config_borlandc.h
@@ -1,7 +1,7 @@
/*
* Configuration for the Borland/CodeGear C++ Builder compiler
*
* Copyright (C) 2006-2015, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/config_msc.h
@@ -1,7 +1,7 @@
/*
* Configuration for the Microsoft Visual Studio C++ compiler
*
* Copyright (C) 2006-2015, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/config_winapi.h
@@ -1,7 +1,7 @@
/*
* Configuration file for WINAPI
*
* Copyright (C) 2006-2015, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/file_stream.h
@@ -1,7 +1,7 @@
/*
* FILE stream functions
*
* Copyright (C) 2006-2015, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/memory.h
@@ -1,7 +1,7 @@
/*
* Memory functions
*
* Copyright (C) 2006-2015, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion common/types.h.in
@@ -1,7 +1,7 @@
/*
* Type and type-support defintions
*
* Copyright (C) 2006-2015, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2006-2016, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )

AC_INIT(
[libfvde],
[20151018],
[20160108],
[joachim.metz@gmail.com])

AC_CONFIG_SRCDIR(
Expand Down
4 changes: 2 additions & 2 deletions dpkg/copyright.in
Expand Up @@ -10,7 +10,7 @@ Upstream Author(s):

Copyright:

Copyright (C) 2011-2015, Joachim Metz <joachim.metz@gmail.com>
Copyright (C) 2011-2016, Joachim Metz <joachim.metz@gmail.com>

License:

Expand All @@ -33,7 +33,7 @@ Public License can be found in `/usr/share/common-licenses/LGPL-3'.

The Debian packaging is:

Copyright (C) 2011-2015, Joachim Metz <joachim.metz@gmail.com>
Copyright (C) 2011-2016, Joachim Metz <joachim.metz@gmail.com>

and is licensed under the GNU Lesser General Public License,
see `/usr/share/common-licenses/LGPL-3'.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/fvdeinfo.c
@@ -1,7 +1,7 @@
/*
* Shows information obtained from a FileVault Drive Encryption (FVDE) encrypted volume
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/fvdemount.c
@@ -1,7 +1,7 @@
/*
* Mounts a MacOS-X FileVault Drive Encryption (FVDE) encrypted volume
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
4 changes: 2 additions & 2 deletions fvdetools/fvdeoutput.c
@@ -1,7 +1,7 @@
/*
* Common output functions for the fvdetools
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down Expand Up @@ -48,7 +48,7 @@ void fvdeoutput_copyright_fprint(
*/
fprintf(
stream,
_( "Copyright (C) 2011-2015, %s.\n" ),
_( "Copyright (C) 2011-2016, %s.\n" ),
_( "Omar Choudary, Joachim Metz" ) );

fprintf(
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/fvdeoutput.h
@@ -1,7 +1,7 @@
/*
* Common output functions for the fvdetools
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/fvdetools_libbfio.h
@@ -1,7 +1,7 @@
/*
* The libbfio header wrapper
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/fvdetools_libcerror.h
@@ -1,7 +1,7 @@
/*
* The internal libcerror header
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/fvdetools_libclocale.h
@@ -1,7 +1,7 @@
/*
* The internal libclocale header
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/fvdetools_libcnotify.h
@@ -1,7 +1,7 @@
/*
* The internal libcnotify header
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/fvdetools_libcsplit.h
@@ -1,7 +1,7 @@
/*
* The internal libcsplit header
*
* Copyright (C) 2011-2015, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2011-2016, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/fvdetools_libcstring.h
@@ -1,7 +1,7 @@
/*
* The internal libcstring header
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/fvdetools_libcsystem.h
Expand Up @@ -2,7 +2,7 @@
* Library for system independent implementation of functionality
* for programs
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/fvdetools_libfvde.h
@@ -1,7 +1,7 @@
/*
* The internal libfvde header
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/fvdetools_libuna.h
@@ -1,7 +1,7 @@
/*
* The libuna header wrapper
*
* Copyright (C) 2011-2015, Joachim Metz <joachim.metz@gmail.com>
* Copyright (C) 2011-2016, Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
*
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/fvdewipekey.c
@@ -1,7 +1,7 @@
/*
* Decrypts a EncryptedRoot.plist.wipekey file
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/info_handle.c
@@ -1,7 +1,7 @@
/*
* Info handle
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/info_handle.h
@@ -1,7 +1,7 @@
/*
* Info handle
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/mount_handle.c
@@ -1,7 +1,7 @@
/*
* Mount handle
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/mount_handle.h
@@ -1,7 +1,7 @@
/*
* Mount handle
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/wipekey_handle.c
@@ -1,7 +1,7 @@
/*
* Wipekey handle
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion fvdetools/wipekey_handle.h
@@ -1,7 +1,7 @@
/*
* Wipekey handle
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion include/libfvde.h.in
@@ -1,7 +1,7 @@
/*
* Library to access the FileVault Drive Encryption (FVDE) format
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion include/libfvde/codepage.h
@@ -1,7 +1,7 @@
/*
* Codepage definitions for libfvde
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion include/libfvde/definitions.h.in
@@ -1,7 +1,7 @@
/*
* Definitions for libfvde
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down
2 changes: 1 addition & 1 deletion include/libfvde/error.h
@@ -1,7 +1,7 @@
/*
* The error code definitions for libfvde
*
* Copyright (C) 2011-2015, Omar Choudary <choudary.omar@gmail.com>
* Copyright (C) 2011-2016, Omar Choudary <choudary.omar@gmail.com>
* Joachim Metz <joachim.metz@gmail.com>
*
* Refer to AUTHORS for acknowledgements.
Expand Down

0 comments on commit 82c2461

Please sign in to comment.