|
From: Anton A. <ai...@de...> - 2007-07-05 20:50:27
|
Changes by: aia21
Update of /cvs/linux-ntfs/ntfsprogs
In directory delta357:/tmp/cvs-serv31212
Modified Files:
ChangeLog configure.ac
Log Message:
ntfsdecrypt: Major improvement! We now validate the .pfx file to be
the right type of RSA key and we also determine the thumbprint and
compare the one in the keys to the one in the .pfx file thus we only
try to decrypt the FEK once we have the correct key. Several other
bug fixes leading to crashes. Also make compilation work on OS X
when gnutls is otherwise not found. (Anton, Yura)
Index: ChangeLog
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -p -r1.441 -r1.442
--- ChangeLog 27 Jun 2007 15:31:37 -0000 1.441
+++ ChangeLog 5 Jul 2007 20:50:18 -0000 1.442
@@ -135,6 +135,12 @@ xx/07/2007 - 2.0.0 - ntfsmount sports fu
- libntfs: Ignore bootsector checksum inconsistencies as too many 3rd
party utilities update the boot sector without correcting the
checksum. Ported change from kernel driver. (Anton)
+ - ntfsdecrypt: Major improvement! We now validate the .pfx file to be
+ the right type of RSA key and we also determine the thumbprint and
+ compare the one in the keys to the one in the .pfx file thus we only
+ try to decrypt the FEK once we have the correct key. Several other
+ bug fixes leading to crashes. Also make compilation work on OS X
+ when gnutls is otherwise not found. (Anton, Yura)
21/06/2006 - 1.13.1 - Various fixes.
Index: configure.ac
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- configure.ac 19 Mar 2007 14:39:44 -0000 1.118
+++ configure.ac 5 Jul 2007 20:50:18 -0000 1.119
@@ -137,7 +137,7 @@ AC_ARG_ENABLE(test,
)
AM_CONDITIONAL(ENABLE_TEST, test "$enable_test" = yes)
if test "$enable_test" = "yes"; then
- CFLAGS="$CFLAGS -DNTFS_TEST"
+ CFLAGS="${CFLAGS} -DNTFS_TEST"
fi
AH_TEMPLATE([NTFS_DISABLE_DEBUG_LOGGING],
@@ -212,7 +212,7 @@ AM_CONDITIONAL(ENABLE_FUSE, $compile_ntf
compile_crypto=false
if test "$enable_crypto" != "no"; then
have_libgcrypt=false
- AM_PATH_LIBGCRYPT(1.2.0, [ have_libgcrypt=true ],
+ AM_PATH_LIBGCRYPT(1.2.2, [ have_libgcrypt=true ],
[
if test "$enable_crypto" = "yes"; then
AC_MSG_ERROR([Linux-NTFS crypto code requires the gcrypt library.])
@@ -220,15 +220,13 @@ if test "$enable_crypto" != "no"; then
AC_MSG_WARN([Linux-NTFS crypto code requires the gcrypt library.])
fi
])
- have_libgnutls=false
- AM_PATH_LIBGNUTLS(1.2.8, [ have_libgnutls=true ],
- [
+ PKG_CHECK_MODULES(GNUTLS, gnutls >= 1.4.4, [ have_libgnutls=true ],
if test "$enable_crypto" = "yes"; then
AC_MSG_ERROR([Linux-NTFS crypto code requires the gnutls library.])
else
AC_MSG_WARN([Linux-NTFS crypto code requires the gnutls library.])
fi
- ])
+ )
if test "$have_libgcrypt" = "true"; then
if test "$have_libgnutls" = "true"; then
compile_crypto=true
@@ -236,6 +234,7 @@ if test "$enable_crypto" != "no"; then
fi
fi
AM_CONDITIONAL(ENABLE_CRYPTO, $compile_crypto)
+CFLAGS="${CFLAGS} ${GNUTLS_CFLAGS}"
# add --with-extra-includes and --with-extra-libs switch to ./configure
all_libraries="$all_libraries $USER_LDFLAGS"
|
