diff --git a/ChangeLog b/ChangeLog index 402690d..f32830f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Sep 5 2010 Valient Gough + * fix mount failures when using certain options, due to changes in + option passing mechanism in 1.7 + * allow per-block random bytes to be configured independently of + per-block MAC. + * bundle as version 1.7.2 + Sun Aug 29 2010 Valient Gough * new IV initialization * tag version 1.7 diff --git a/configure.ac b/configure.ac index b7400c4..c433bc9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(encfs/encfs.h) dnl a source file from your sub dir -AM_INIT_AUTOMAKE(encfs, 1.7.1) dnl searches for some needed programs +AM_INIT_AUTOMAKE(encfs, 1.7.2) dnl searches for some needed programs AC_CANONICAL_HOST AM_CONDITIONAL([DARWIN], diff --git a/encfs/MACFileIO.cpp b/encfs/MACFileIO.cpp index 061d8da..816e64b 100644 --- a/encfs/MACFileIO.cpp +++ b/encfs/MACFileIO.cpp @@ -41,13 +41,14 @@ static RLogChannel *Info = DEF_CHANNEL("info/MACFileIO", Log_Info); // Version 2.0 takes [blockSize - headerSize] worth of user data and writes // [blockSize] bytes. That way the size going into the crypto engine is // valid from what was selected based on the crypto module allowed ranges! +// Version 2.1 allows per-block rand bytes to be used without enabling MAC. // // The information about MACFileIO currently does not make its way into the // configuration file, so there is no easy way to make this backward // compatible, except at a high level by checking a revision number for the // filesystem... // -static rel::Interface MACFileIO_iface("FileIO/MAC", 2, 0, 0); +static rel::Interface MACFileIO_iface("FileIO/MAC", 2, 1, 0); int dataBlockSize(const FSConfigPtr &cfg) {