Commit 1bcc464e authored by Hilko Bengen's avatar Hilko Bengen

Merge tag 'upstream/20190210' into debian/master

Upstream version 20190210
parents 9fd429ec 1a5956cf
Acknowledgements: libfsapfs Acknowledgements: libfsapfs
Copyright (C) 2018, Joachim Metz <joachim.metz@gmail.com> Copyright (C) 2018-2019, Joachim Metz <joachim.metz@gmail.com>
TODO TODO
* B-tree * B-tree
** Validate (expected) btree level to detect loops ** Validate (expected) btree level to detect loops - added maximum recursion depth for now
* Validate checksum * Validate checksum
** B-tree node ** B-tree node
** Container key bag ** Container key bag
...@@ -63,6 +63,7 @@ Tools: ...@@ -63,6 +63,7 @@ Tools:
** add volume selection support ** add volume selection support
** add extended attributes support ** add extended attributes support
** does fuse override file types such as socket? ** does fuse override file types such as socket?
** dokan add symbolic link support
Tests: Tests:
* add tests for container_key_bag * add tests for container_key_bag
......
...@@ -18,9 +18,10 @@ Supported APFS format features: ...@@ -18,9 +18,10 @@ Supported APFS format features:
Unsupported APFS format features: Unsupported APFS format features:
* APFS version 1 * APFS version 1
* Fusion drive (NX_INCOMPAT_FUSION)
* snapshots
* LZFSE compression, compression methods 11 and 12 * LZFSE compression, compression methods 11 and 12
* "uncompressed", compression methods 1, 9 and 10 * "uncompressed", compression methods 1, 9 and 10
* snapshots
For more information see: For more information see:
......
/* /*
* Byte stream functions * Byte stream functions
* *
* Copyright (C) 2018, Joachim Metz <joachim.metz@gmail.com> * Copyright (C) 2018-2019, Joachim Metz <joachim.metz@gmail.com>
* *
* Refer to AUTHORS for acknowledgements. * Refer to AUTHORS for acknowledgements.
* *
......
/* /*
* Common include file * Common include file
* *
* Copyright (C) 2018, Joachim Metz <joachim.metz@gmail.com> * Copyright (C) 2018-2019, Joachim Metz <joachim.metz@gmail.com>
* *
* Refer to AUTHORS for acknowledgements. * Refer to AUTHORS for acknowledgements.
* *
......
...@@ -5,6 +5,12 @@ ...@@ -5,6 +5,12 @@
language is requested. */ language is requested. */
#define ENABLE_NLS 1 #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 to 1 if you have the `bindtextdomain' function. */
#define HAVE_BINDTEXTDOMAIN 1 #define HAVE_BINDTEXTDOMAIN 1
...@@ -58,6 +64,18 @@ ...@@ -58,6 +64,18 @@
/* Define to 1 if you have the `EVP_CIPHER_CTX_init' function". */ /* Define to 1 if you have the `EVP_CIPHER_CTX_init' function". */
/* #undef HAVE_EVP_CIPHER_CTX_INIT */ /* #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". */ /* Define to 1 if you have the `EVP_md5' function". */
#define HAVE_EVP_MD5 1 #define HAVE_EVP_MD5 1
...@@ -142,7 +160,7 @@ ...@@ -142,7 +160,7 @@
/* Define if the GNU gettext() function is already present or preinstalled. */ /* Define if the GNU gettext() function is already present or preinstalled. */
#define HAVE_GETTEXT 1 #define HAVE_GETTEXT 1
/* Define to 1 if dlsym funtion is available in GNU dl. */ /* Define to 1 if dlsym function is available in GNU dl. */
#define HAVE_GNU_DL_DLSYM 1 #define HAVE_GNU_DL_DLSYM 1
/* Define if you have the iconv() function and it works. */ /* Define if you have the iconv() function and it works. */
...@@ -614,7 +632,7 @@ ...@@ -614,7 +632,7 @@
#define PACKAGE_NAME "libfsapfs" #define PACKAGE_NAME "libfsapfs"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "libfsapfs 20181215" #define PACKAGE_STRING "libfsapfs 20190210"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libfsapfs" #define PACKAGE_TARNAME "libfsapfs"
...@@ -623,7 +641,7 @@ ...@@ -623,7 +641,7 @@
#define PACKAGE_URL "" #define PACKAGE_URL ""
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "20181215" #define PACKAGE_VERSION "20190210"
/* The size of `int', as computed by sizeof. */ /* The size of `int', as computed by sizeof. */
#define SIZEOF_INT 4 #define SIZEOF_INT 4
...@@ -653,7 +671,7 @@ ...@@ -653,7 +671,7 @@
/* #undef TM_IN_SYS_TIME */ /* #undef TM_IN_SYS_TIME */
/* Version number of package */ /* Version number of package */
#define VERSION "20181215" #define VERSION "20190210"
/* Enable large inode numbers on Mac OS X 10.5. */ /* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE #ifndef _DARWIN_USE_64_BIT_INODE
......
...@@ -4,6 +4,12 @@ ...@@ -4,6 +4,12 @@
language is requested. */ language is requested. */
#undef ENABLE_NLS #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. */ /* Define to 1 if you have the `bindtextdomain' function. */
#undef HAVE_BINDTEXTDOMAIN #undef HAVE_BINDTEXTDOMAIN
...@@ -57,6 +63,18 @@ ...@@ -57,6 +63,18 @@
/* Define to 1 if you have the `EVP_CIPHER_CTX_init' function". */ /* Define to 1 if you have the `EVP_CIPHER_CTX_init' function". */
#undef HAVE_EVP_CIPHER_CTX_INIT #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". */ /* Define to 1 if you have the `EVP_md5' function". */
#undef HAVE_EVP_MD5 #undef HAVE_EVP_MD5
...@@ -141,7 +159,7 @@ ...@@ -141,7 +159,7 @@
/* Define if the GNU gettext() function is already present or preinstalled. */ /* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT #undef HAVE_GETTEXT
/* Define to 1 if dlsym funtion is available in GNU dl. */ /* Define to 1 if dlsym function is available in GNU dl. */
#undef HAVE_GNU_DL_DLSYM #undef HAVE_GNU_DL_DLSYM
/* Define if you have the iconv() function and it works. */ /* Define if you have the iconv() function and it works. */
......
/* /*
* Configuration for the Borland/CodeGear C++ Builder compiler * Configuration for the Borland/CodeGear C++ Builder compiler
* *
* Copyright (C) 2018, Joachim Metz <joachim.metz@gmail.com> * Copyright (C) 2018-2019, Joachim Metz <joachim.metz@gmail.com>
* *
* Refer to AUTHORS for acknowledgements. * Refer to AUTHORS for acknowledgements.
* *
......
/* /*
* Configuration for the Microsoft Visual Studio C++ compiler * Configuration for the Microsoft Visual Studio C++ compiler
* *
* Copyright (C) 2018, Joachim Metz <joachim.metz@gmail.com> * Copyright (C) 2018-2019, Joachim Metz <joachim.metz@gmail.com>
* *
* Refer to AUTHORS for acknowledgements. * Refer to AUTHORS for acknowledgements.
* *
......
/* /*
* Configuration file for WINAPI * Configuration file for WINAPI
* *
* Copyright (C) 2018, Joachim Metz <joachim.metz@gmail.com> * Copyright (C) 2018-2019, Joachim Metz <joachim.metz@gmail.com>
* *
* Refer to AUTHORS for acknowledgements. * Refer to AUTHORS for acknowledgements.
* *
......
/* /*
* FILE stream functions * FILE stream functions
* *
* Copyright (C) 2018, Joachim Metz <joachim.metz@gmail.com> * Copyright (C) 2018-2019, Joachim Metz <joachim.metz@gmail.com>
* *
* Refer to AUTHORS for acknowledgements. * Refer to AUTHORS for acknowledgements.
* *
......
/* /*
* Memory functions * Memory functions
* *
* Copyright (C) 2018, Joachim Metz <joachim.metz@gmail.com> * Copyright (C) 2018-2019, Joachim Metz <joachim.metz@gmail.com>
* *
* Refer to AUTHORS for acknowledgements. * Refer to AUTHORS for acknowledgements.
* *
......
/* /*
* Narrow character string functions * Narrow character string functions
* *
* Copyright (C) 2018, Joachim Metz <joachim.metz@gmail.com> * Copyright (C) 2018-2019, Joachim Metz <joachim.metz@gmail.com>
* *
* Refer to AUTHORS for acknowledgements. * Refer to AUTHORS for acknowledgements.
* *
......
/* /*
* System character string functions * System character string functions
* *
* Copyright (C) 2018, Joachim Metz <joachim.metz@gmail.com> * Copyright (C) 2018-2019, Joachim Metz <joachim.metz@gmail.com>
* *
* Refer to AUTHORS for acknowledgements. * Refer to AUTHORS for acknowledgements.
* *
......
/* /*
* Type and type-support defintions * Type and type-support defintions
* *
* Copyright (C) 2018, Joachim Metz <joachim.metz@gmail.com> * Copyright (C) 2018-2019, Joachim Metz <joachim.metz@gmail.com>
* *
* Refer to AUTHORS for acknowledgements. * Refer to AUTHORS for acknowledgements.
* *
......
/* /*
* Type and type-support defintions * Type and type-support defintions
* *
* Copyright (C) 2018, Joachim Metz <joachim.metz@gmail.com> * Copyright (C) 2018-2019, Joachim Metz <joachim.metz@gmail.com>
* *
* Refer to AUTHORS for acknowledgements. * Refer to AUTHORS for acknowledgements.
* *
......
/* /*
* Wide character string functions * Wide character string functions
* *
* Copyright (C) 2018, Joachim Metz <joachim.metz@gmail.com> * Copyright (C) 2018-2019, Joachim Metz <joachim.metz@gmail.com>
* *
* Refer to AUTHORS for acknowledgements. * Refer to AUTHORS for acknowledgements.
* *
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ AC_PREREQ( 2.59 ) ...@@ -2,7 +2,7 @@ AC_PREREQ( 2.59 )
AC_INIT( AC_INIT(
[libfsapfs], [libfsapfs],
[20181215], [20190210],
[joachim.metz@gmail.com]) [joachim.metz@gmail.com])
AC_CONFIG_SRCDIR( AC_CONFIG_SRCDIR(
...@@ -263,7 +263,8 @@ Building: ...@@ -263,7 +263,8 @@ Building:
libhmac support: $ac_cv_libhmac libhmac support: $ac_cv_libhmac
SHA256 support: $ac_cv_libhmac_sha256 SHA256 support: $ac_cv_libhmac_sha256
libcaes support: $ac_cv_libcaes libcaes support: $ac_cv_libcaes
AES support: $ac_cv_libcaes_aes AES-ECB support: $ac_cv_libcaes_aes_ecb
AES-XTS support: $ac_cv_libcaes_aes_xts
FUSE support: $ac_cv_libfuse FUSE support: $ac_cv_libfuse
Features: Features:
......
libfsapfs (20181215-1) unstable; urgency=low libfsapfs (20190210-1) unstable; urgency=low
* Auto-generated * Auto-generated
-- Joachim Metz <joachim.metz@gmail.com> Sat, 15 Dec 2018 07:44:17 +0100 -- Joachim Metz <joachim.metz@gmail.com> Sun, 10 Feb 2019 20:59:53 +0100
...@@ -9,6 +9,8 @@ Homepage: https://github.com/libyal/libfsapfs ...@@ -9,6 +9,8 @@ Homepage: https://github.com/libyal/libfsapfs
Package: libfsapfs Package: libfsapfs
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libfsapfs1
Replaces: libfsapfs1
Suggests: libfsapfs-dbg Suggests: libfsapfs-dbg
Description: Library to access the Apple File System (APFS) format Description: Library to access the Apple File System (APFS) format
libfsapfs is a library to access the Apple File System (APFS) format. libfsapfs is a library to access the Apple File System (APFS) format.
...@@ -31,6 +33,8 @@ Package: libfsapfs-tools ...@@ -31,6 +33,8 @@ Package: libfsapfs-tools
Section: utils Section: utils
Architecture: any Architecture: any
Depends: libfsapfs (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Depends: libfsapfs (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Conflicts: libfsapfs-utils
Replaces: libfsapfs-utils
Description: Several tools for reading Apple File System (APFS) volumes Description: Several tools for reading Apple File System (APFS) volumes
Several tools for reading Apple File System (APFS) volumes. Several tools for reading Apple File System (APFS) volumes.
...@@ -45,6 +49,8 @@ Package: libfsapfs-python ...@@ -45,6 +49,8 @@ Package: libfsapfs-python
Section: python Section: python
Architecture: any Architecture: any
Depends: libfsapfs (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Depends: libfsapfs (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Conflicts: python-libfsapfs
Replaces: python-libfsapfs
Suggests: libfsapfs-python-dbg Suggests: libfsapfs-python-dbg
Description: Python 2 bindings for libfsapfs Description: Python 2 bindings for libfsapfs
Python 2 bindings for libfsapfs. Python 2 bindings for libfsapfs.
...@@ -60,6 +66,8 @@ Package: libfsapfs-python3 ...@@ -60,6 +66,8 @@ Package: libfsapfs-python3
Section: python Section: python
Architecture: any Architecture: any
Depends: libfsapfs (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Depends: libfsapfs (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Conflicts: python3-libfsapfs
Replaces: python3-libfsapfs
Suggests: libfsapfs-python3-dbg Suggests: libfsapfs-python3-dbg
Description: Python 3 bindings for libfsapfs Description: Python 3 bindings for libfsapfs
Python 3 bindings for libfsapfs. Python 3 bindings for libfsapfs.
......
...@@ -3,7 +3,7 @@ Upstream-Name: libfsapfs ...@@ -3,7 +3,7 @@ Upstream-Name: libfsapfs
Source: https://github.com/libyal/libfsapfs Source: https://github.com/libyal/libfsapfs
Files: * Files: *
Copyright: 2018, Joachim Metz <joachim.metz@gmail.com> Copyright: 2018-2019, Joachim Metz <joachim.metz@gmail.com>
License: LGPL-3.0+ License: LGPL-3.0+
License: LGPL-3.0+ License: LGPL-3.0+
......
...@@ -59,6 +59,7 @@ fsapfsmount_SOURCES = \ ...@@ -59,6 +59,7 @@ fsapfsmount_SOURCES = \
fsapfstools_getopt.c fsapfstools_getopt.h \ fsapfstools_getopt.c fsapfstools_getopt.h \
fsapfstools_i18n.h \ fsapfstools_i18n.h \
fsapfstools_libbfio.h \ fsapfstools_libbfio.h \
fsapfstools_libcdata.h \
fsapfstools_libcerror.h \ fsapfstools_libcerror.h \
fsapfstools_libclocale.h \ fsapfstools_libclocale.h \
fsapfstools_libcnotify.h \ fsapfstools_libcnotify.h \
...@@ -68,6 +69,9 @@ fsapfsmount_SOURCES = \ ...@@ -68,6 +69,9 @@ fsapfsmount_SOURCES = \
fsapfstools_output.c fsapfstools_output.h \ fsapfstools_output.c fsapfstools_output.h \
fsapfstools_signal.c fsapfstools_signal.h \ fsapfstools_signal.c fsapfstools_signal.h \
fsapfstools_unused.h \ fsapfstools_unused.h \
mount_dokan.c mount_dokan.h \
mount_file_entry.c mount_file_entry.h \
mount_file_system.c mount_file_system.h \
mount_fuse.c mount_fuse.h \ mount_fuse.c mount_fuse.h \
mount_handle.c mount_handle.h mount_handle.c mount_handle.h
......
...@@ -132,8 +132,9 @@ am__v_lt_0 = --silent ...@@ -132,8 +132,9 @@ am__v_lt_0 = --silent
am__v_lt_1 = am__v_lt_1 =
am_fsapfsmount_OBJECTS = fsapfsmount.$(OBJEXT) \ am_fsapfsmount_OBJECTS = fsapfsmount.$(OBJEXT) \
fsapfstools_getopt.$(OBJEXT) fsapfstools_output.$(OBJEXT) \ fsapfstools_getopt.$(OBJEXT) fsapfstools_output.$(OBJEXT) \
fsapfstools_signal.$(OBJEXT) mount_fuse.$(OBJEXT) \ fsapfstools_signal.$(OBJEXT) mount_dokan.$(OBJEXT) \
mount_handle.$(OBJEXT) mount_file_entry.$(OBJEXT) mount_file_system.$(OBJEXT) \
mount_fuse.$(OBJEXT) mount_handle.$(OBJEXT)
fsapfsmount_OBJECTS = $(am_fsapfsmount_OBJECTS) fsapfsmount_OBJECTS = $(am_fsapfsmount_OBJECTS)
fsapfsmount_DEPENDENCIES = ../libfsapfs/libfsapfs.la fsapfsmount_DEPENDENCIES = ../libfsapfs/libfsapfs.la
AM_V_P = $(am__v_P_@AM_V@) AM_V_P = $(am__v_P_@AM_V@)
...@@ -155,7 +156,9 @@ am__depfiles_remade = ./$(DEPDIR)/fsapfsinfo.Po \ ...@@ -155,7 +156,9 @@ am__depfiles_remade = ./$(DEPDIR)/fsapfsinfo.Po \
./$(DEPDIR)/fsapfsmount.Po ./$(DEPDIR)/fsapfstools_getopt.Po \ ./$(DEPDIR)/fsapfsmount.Po ./$(DEPDIR)/fsapfstools_getopt.Po \
./$(DEPDIR)/fsapfstools_output.Po \ ./$(DEPDIR)/fsapfstools_output.Po \
./$(DEPDIR)/fsapfstools_signal.Po ./$(DEPDIR)/info_handle.Po \ ./$(DEPDIR)/fsapfstools_signal.Po ./$(DEPDIR)/info_handle.Po \
./$(DEPDIR)/mount_fuse.Po ./$(DEPDIR)/mount_handle.Po ./$(DEPDIR)/mount_dokan.Po ./$(DEPDIR)/mount_file_entry.Po \
./$(DEPDIR)/mount_file_system.Po ./$(DEPDIR)/mount_fuse.Po \
./$(DEPDIR)/mount_handle.Po
am__mv = mv -f am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \