Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:

 - use-after-free in algif_aead

 - modular aesni regression when pcbc is modular but absent

 - bug causing IO page faults in ccp

 - double list add in ccp

 - NULL pointer dereference in qat (two patches)

 - panic in chcr

 - NULL pointer dereference in chcr

 - out-of-bound access in chcr

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: chcr - Fix key length for RFC4106
  crypto: algif_aead - Fix kernel panic on list_del
  crypto: aesni - Fix failure when pcbc module is absent
  crypto: ccp - Fix double add when creating new DMA command
  crypto: ccp - Fix DMA operations when IOMMU is enabled
  crypto: chcr - Check device is allocated before use
  crypto: chcr - Fix panic on dma_unmap_sg
  crypto: qat - zero esram only for DH85x devices
  crypto: qat - fix bar discovery for c62x

1 files changed, 3 insertions, 3 deletions

diff --git a/configure b/configure
index 8d8f1b0..e2b62fe 100755
--- a/configure
+++ b/configure
@@ -789,8 +789,8 @@ gen_version_appendix
 if [ "$MISSING_DEFS" == "1" ] ; then
 	echo "[!] Some libraries or header definitions are missing or too old. Thus"
 	echo "    certain tools will not be built (see below) or they will be built"
-	echo "    with reduced functionality. Please refer to the INSTALL file"
-	echo "    for the libraries needed to build the complete netsniff-ng toolkit"
+	echo "    with reduced functionality. Please refer to the INSTALL file for"
+	echo "    the libraries needed to build the complete netsniff-ng toolkit"
 fi
 
 if [ "$MISSING_NACL" == "1" ] ; then
@@ -814,7 +814,7 @@ fi
 
 echo "CONFIG_LIBNL=$HAVE_LIBNL" >> Config
 
-if [ "$HAVE_LIBGEOIP" == "1" -a "$HAVE_LIBZ" == "1"  ] ; then
+if [ "$HAVE_LIBGEOIP" == "1" -a "$HAVE_LIBZ" == "1" ] ; then
 	echo "CONFIG_GEOIP=1" >> Config
 else
 	echo "CONFIG_GEOIP=0" >> Config