Merge branch 'master' of git+ssh://openadk.org/git/openadk

10 files changed, 99216 insertions, 47 deletions

diff --git a/mk/build.mk b/mk/build.mk
index cb531addb..886ecaf09 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -316,6 +316,16 @@ endif
 ifneq (,$(filter CYGWIN%,${OStype}))
 	@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig
 endif
+ifeq ($(ADKtype),shuttle-sa76)
+	@echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
+	@echo ADK_TARGET_SYSTEM_SHUTTLE_SA76=y >> $(TOPDIR)/.defconfig
+	@sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
+		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
+	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
+	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
+	@echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
+	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
+endif
 ifeq ($(ADKtype),ibm-x40)
 	@echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
 	@echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/.defconfig
@@ -400,7 +410,16 @@ endif
 ifneq (,$(filter CYGWIN%,${OStype}))
 	@echo ADK_HOST_CYGWIN=y > $(TOPDIR)/all.config
 endif
-ifeq ($(ADKtype),ibmx-40)
+ifeq ($(ADKtype),shuttle-sa76)
+	@echo ADK_TARGET_SYSTEM_SHUTTLE_SA76=y >> $(TOPDIR)/all.config
+	@sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
+		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
+	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
+	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
+	@echo "source \"target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)\"" >> $(TOPDIR)/target/config/Config.in.native
+	@echo "endchoice" >> $(TOPDIR)/target/config/Config.in.native
+endif
+ifeq ($(ADKtype),ibm-x40)
 	@echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/all.config
 	@sed -e "s#TARGET#NATIVE#" target/$(ARCH_FOR_BUILD)/sys-available/$(ADKtype) > \
 		target/$(ARCH_FOR_BUILD)/sys-enabled/.$(ADKtype)
diff --git a/package/gettext/patches/patch-gettext-tools_gnulib-lib_libxml_xmlversion_in_h b/package/gettext/patches/patch-gettext-tools_gnulib-lib_libxml_xmlversion_in_h
new file mode 100644
index 000000000..f329c1ee1
--- /dev/null
+++ b/package/gettext/patches/patch-gettext-tools_gnulib-lib_libxml_xmlversion_in_h
@@ -0,0 +1,11 @@
+--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/libxml/xmlversion.in.h	2010-06-06 14:49:58.000000000 +0200
++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/libxml/xmlversion.in.h	2011-10-17 03:58:30.336558512 +0200
+@@ -263,7 +263,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(i
+  *
+  * Whether iconv support is available
+  */
+-#if 1
++#if 0
+ #define LIBXML_ICONV_ENABLED
+ #endif
+ 
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index cae954797..e9115efbb 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -19,6 +19,7 @@ PKGSD_LIBXML2_DEV:=	XML parser headers
 PKGSC_LIBXML2_DEV:=	devel
 PKGSD_LIBXML2_PYTHON:=	XML python bindings
 PKGSC_LIBXML2_PYTHON:=	libs
+PKGSB_LIBXML2_PYTHON:=	python2
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/microperl/Makefile b/package/microperl/Makefile
index 040daa12d..6507939b5 100644
--- a/package/microperl/Makefile
+++ b/package/microperl/Makefile
@@ -26,7 +26,7 @@ MAKE_FLAGS+=		CC="${TARGET_CC}" OPTIMIZE="${TARGET_CFLAGS}"
 MAKE_FILE:=		Makefile.micro
 
 pre-configure:
-	$(CP) ./files/uconfig.h.$(ARCH) $(WRKBUILD)/uconfig.h
+	$(CP) ./files/uconfig.h.$(CPU_ARCH) $(WRKBUILD)/uconfig.h
 
 do-install:
 	${INSTALL_DIR} ${IDIR_MICROPERL}/usr/bin
diff --git a/package/python2/Makefile b/package/python2/Makefile
index 2aed3ed49..b28b5d49e 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -30,6 +30,7 @@ $(eval $(call PKG_template,PYTHON2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P
 $(eval $(call PKG_template,PYTHON2_BZIP2,${PKG_NAME}-bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PYTHON2_BZIP2},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,PYTHON2_READLINE,${PKG_NAME}-readline,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PYTHON2_READLINE},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+TARGET_CFLAGS+=		-fPIC
 MAKE_ENV+=		OPT="$(TARGET_CFLAGS)" \
 			RANLIB="${TARGET_CROSS}ranlib" \
 			HOSTPYTHON=./hostpython \
@@ -74,10 +75,11 @@ post-install:
 	${CP} ${WRKINST}/usr/lib/python2.7/* ${IDIR_PYTHON2}/usr/lib/python2.7
 	${CP} ${WRKINST}/usr/include/python2.7/* ${IDIR_PYTHON2}/usr/include/python2.7
 	-find ${IDIR_PYTHON2} -name "\*.pyc" -o -name "*\.pyo" -exec rm {} \;
-	rm ${IDIR_PYTHON2}/usr/lib/python2.7/lib-dynload/readline.so
-	rm ${IDIR_PYTHON2}/usr/lib/python2.7/lib-dynload/bz2.so
+	-rm ${IDIR_PYTHON2}/usr/lib/python2.7/lib-dynload/readline.so
+	-rm ${IDIR_PYTHON2}/usr/lib/python2.7/lib-dynload/bz2.so
 	# workaround, copy host python-config to target scripts directory
 	${CP} ${STAGING_HOST_DIR}/usr/bin/python*-config ${STAGING_DIR}/scripts
+	(cd ${STAGING_DIR}/usr/bin/ && ln -sf $(STAGING_HOST_DIR)/usr/bin/hostpython hostpython)
 
 python2-readline-install:
 	${INSTALL_DIR} ${IDIR_PYTHON2_READLINE}/usr/lib/python2.7/lib-dynload
diff --git a/package/samba/Makefile b/package/samba/Makefile
index f083e0ac4..0485febc2 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		samba
-PKG_VERSION:=		3.5.3
+PKG_VERSION:=		3.6.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		7c8d2a34b649380d5df838c3e030dbec
+PKG_MD5SUM:=		e297e0ea7923c7de8d7c1d8fd0ec0a05
 PKG_DESCR:=		NetBIOS/SMB file and print server
 PKG_SECTION:=		net/fs
 PKG_BUILDDEP:=		gettext
diff --git a/package/samba/patches/patch-client_mount_cifs_c b/package/samba/patches/patch-client_mount_cifs_c
deleted file mode 100644
index 4ddd91f9c..000000000
--- a/package/samba/patches/patch-client_mount_cifs_c
+++ /dev/null
@@ -1,19 +0,0 @@
---- samba-3.5.3.orig/client/mount.cifs.c	2010-05-17 13:51:23.000000000 +0200
-+++ samba-3.5.3/client/mount.cifs.c	2010-06-11 12:39:34.501613636 +0200
-@@ -39,7 +39,6 @@
- #include <mntent.h>
- #include <fcntl.h>
- #include <limits.h>
--#include <fstab.h>
- #include "mount.h"
- 
- #define MOUNT_CIFS_VERSION_MAJOR "1"
-@@ -112,7 +111,7 @@
-  * The legacy behavior is now disabled by default. To reenable it, set the
-  * following #define to true.
-  */
--#define CIFS_LEGACY_SETUID_CHECK 0
-+#define CIFS_LEGACY_SETUID_CHECK 1
- 
- /*
-  * When an unprivileged user runs a setuid mount.cifs, we set certain mount
diff --git a/package/samba/patches/patch-source3_registry_reg_perfcount_c b/package/samba/patches/patch-source3_registry_reg_perfcount_c
deleted file mode 100644
index 684036b5b..000000000
--- a/package/samba/patches/patch-source3_registry_reg_perfcount_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- samba-3.5.3.orig/source3/registry/reg_perfcount.c	2010-05-17 13:51:23.000000000 +0200
-+++ samba-3.5.3/source3/registry/reg_perfcount.c	2010-06-11 12:21:42.911613348 +0200
-@@ -618,14 +618,14 @@ static bool _reg_perfcount_add_counter(s
- 	obj = NULL;
- 	memset(buf, 0, PERFCOUNT_MAX_LEN);
- 	memcpy(buf, data.dptr, data.dsize);
--	begin = index(buf, '[');
--	end = index(buf, ']');
-+	begin = strchr(buf, '[');
-+	end = strchr(buf, ']');
- 	if(begin == NULL || end == NULL)
- 		return False;
- 	start = begin+1;
- 
- 	while(start < end) {
--		stop = index(start, ',');
-+		stop = strchr(start, ',');
- 		if(stop == NULL)
- 			stop = end;
- 		*stop = '\0';
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 871c222c3..ce526441b 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -4,8 +4,6 @@ config ADK_KERNEL_BLOCK
 config ADK_KERNEL_MD
 	boolean
 
-config ADK_KERNEL_SWAP
-	boolean
 
 config ADK_KERNEL_LBD
 	boolean
@@ -312,6 +310,7 @@ config ADK_KPACKAGE_KMOD_MD_RAID0
 	prompt "kmod-md-raid0..................... RAID0 support (module)"
 	tristate
 	depends on ADK_KPACKAGE_KMOD_BLK_DEV_MD
+	depends on !ADK_KERNEL_MD_RAID0
 	help
 
 config ADK_KERNEL_MD_RAID1
@@ -387,5 +386,11 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_DRBD
 	depends on !ADK_TARGET_SYSTEM_FOXBOARD_LX
 	help
           DRBD - http://www.drbd.org
+          
+config ADK_KERNEL_SWAP
+	prompt "swap.............................. SWAP support"
+	boolean
+	help
+	  Kernel swap support.
 
 endmenu
diff --git a/target/linux/patches/3.0.4/ocf-20110720.patch b/target/linux/patches/3.0.4/ocf-20110720.patch
new file mode 100644
index 000000000..b5a257324
--- /dev/null
+++ b/target/linux/patches/3.0.4/ocf-20110720.patch
@@ -0,0 +1,99170 @@
+diff -Nur linux-3.0.4.orig/crypto/Kconfig linux-3.0.4/crypto/Kconfig
+--- linux-3.0.4.orig/crypto/Kconfig	2011-08-29 22:56:30.000000000 +0200
++++ linux-3.0.4/crypto/Kconfig	2011-10-17 04:36:27.356574299 +0200
+@@ -860,3 +860,6 @@
+ source "drivers/crypto/Kconfig"
+ 
+ endif	# if CRYPTO
++
++source "crypto/ocf/Kconfig"
++
+diff -Nur linux-3.0.4.orig/crypto/Kconfig.orig linux-3.0.4/crypto/Kconfig.orig
+--- linux-3.0.4.orig/crypto/Kconfig.orig	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.4/crypto/Kconfig.orig	2011-08-29 22:56:30.000000000 +0200
+@@ -0,0 +1,862 @@
++#
++# Generic algorithms support
++#
++config XOR_BLOCKS
++	tristate
++
++#
++# async_tx api: hardware offloaded memory transfer/transform support
++#
++source "crypto/async_tx/Kconfig"
++
++#
++# Cryptographic API Configuration
++#
++menuconfig CRYPTO
++	tristate "Cryptographic API"
++	help
++	  This option provides the core Cryptographic API.
++
++if CRYPTO
++
++comment "Crypto core or helper"
++
++config CRYPTO_FIPS
++	bool "FIPS 200 compliance"
++	depends on CRYPTO_ANSI_CPRNG && !CRYPTO_MANAGER_DISABLE_TESTS
++	help
++	  This options enables the fips boot option which is
++	  required if you want to system to operate in a FIPS 200
++	  certification.  You should say no unless you know what
++	  this is.
++
++config CRYPTO_ALGAPI
++	tristate
++	select CRYPTO_ALGAPI2
++	help
++	  This option provides the API for cryptographic algorithms.
++
++config CRYPTO_ALGAPI2
++	tristate
++
++config CRYPTO_AEAD
++	tristate
++	select CRYPTO_AEAD2
++	select CRYPTO_ALGAPI
++
++config CRYPTO_AEAD2
++	tristate
++	select CRYPTO_ALGAPI2
++
++config CRYPTO_BLKCIPHER
++	tristate
++	select CRYPTO_BLKCIPHER2
++	select CRYPTO_ALGAPI
++
++config CRYPTO_BLKCIPHER2
++	tristate
++	select CRYPTO_ALGAPI2
++	select CRYPTO_RNG2
++	select CRYPTO_WORKQUEUE
++
++config CRYPTO_HASH
++	tristate
++	select CRYPTO_HASH2
++	select CRYPTO_ALGAPI
++
++config CRYPTO_HASH2
++	tristate
++	select CRYPTO_ALGAPI2
++
++config CRYPTO_RNG
++	tristate
++	select CRYPTO_RNG2
++	select CRYPTO_ALGAPI
++
++config CRYPTO_RNG2
++	tristate
++	select CRYPTO_ALGAPI2
++
++config CRYPTO_PCOMP
++	tristate
++	select CRYPTO_PCOMP2
++	select CRYPTO_ALGAPI
++
++config CRYPTO_PCOMP2
++	tristate
++	select CRYPTO_ALGAPI2
++
++config CRYPTO_MANAGER
++	tristate "Cryptographic algorithm manager"
++	select CRYPTO_MANAGER2
++	help
++	  Create default cryptographic template instantiations such as
++	  cbc(aes).
++
++config CRYPTO_MANAGER2
++	def_tristate CRYPTO_MANAGER || (CRYPTO_MANAGER!=n && CRYPTO_ALGAPI=y)
++	select CRYPTO_AEAD2
++	select CRYPTO_HASH2
++	select CRYPTO_BLKCIPHER2
++	select CRYPTO_PCOMP2
++
++config CRYPTO_MANAGER_DISABLE_TESTS
++	bool "Disable run-time self tests"
++	default y
++	depends on CRYPTO_MANAGER2
++	help
++	  Disable run-time self tests that normally take place at
++	  algorithm registration.
++
++config CRYPTO_GF128MUL
++	tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"
++	help
++	  Efficient table driven implementation of multiplications in the
++	  field GF(2^128).  This is needed by some cypher modes. This
++	  option will be selected automatically if you select such a
++	  cipher mode.  Only select this option by hand if you expect to load
++	  an external module that requires these functions.
++
++config CRYPTO_NULL
++	tristate "Null algorithms"
++	select CRYPTO_ALGAPI
++	select CRYPTO_BLKCIPHER
++	select CRYPTO_HASH
++	help
++	  These are 'Null' algorithms, used by IPsec, which do nothing.
++
++config CRYPTO_PCRYPT
++	tristate "Parallel crypto engine (EXPERIMENTAL)"
++	depends on SMP && EXPERIMENTAL
++	select PADATA
++	select CRYPTO_MANAGER
++	select CRYPTO_AEAD
++	help
++	  This converts an arbitrary crypto algorithm into a parallel
++	  algorithm that executes in kernel threads.
++
++config CRYPTO_WORKQUEUE
++       tristate
++
++config CRYPTO_CRYPTD
++	tristate "Software async crypto daemon"
++	select CRYPTO_BLKCIPHER
++	select CRYPTO_HASH
++	select CRYPTO_MANAGER
++	select CRYPTO_WORKQUEUE
++	help
++	  This is a generic software asynchronous crypto daemon that
++	  converts an arbitrary synchronous software crypto algorithm
++	  into an asynchronous algorithm that executes in a kernel thread.
++
++config CRYPTO_AUTHENC
++	tristate "Authenc support"
++	select CRYPTO_AEAD
++	select CRYPTO_BLKCIPHER
++	select CRYPTO_MANAGER
++	select CRYPTO_HASH
++	help
++	  Authenc: Combined mode wrapper for IPsec.
++	  This is required for IPSec.
++
++config CRYPTO_TEST
++	tristate "Testing module"
++	depends on m
++	select CRYPTO_MANAGER
++	help
++	  Quick & dirty crypto test module.
++
++comment "Authenticated Encryption with Associated Data"
++
++config CRYPTO_CCM
++	tristate "CCM support"
++	select CRYPTO_CTR
++	select CRYPTO_AEAD
++	help
++	  Support for Counter with CBC MAC. Required for IPsec.
++
++config CRYPTO_GCM
++	tristate "GCM/GMAC support"
++	select CRYPTO_CTR
++	select CRYPTO_AEAD
++	select CRYPTO_GHASH
++	help
++	  Support for Galois/Counter Mode (GCM) and Galois Message
++	  Authentication Code (GMAC). Required for IPSec.
++
++config CRYPTO_SEQIV
++	tristate "Sequence Number IV Generator"
++	select CRYPTO_AEAD
++	select CRYPTO_BLKCIPHER
++	select CRYPTO_RNG
++	help
++	  This IV generator generates an IV based on a sequence number by
++	  xoring it with a salt.  This algorithm is mainly useful for CTR
++
++comment "Block modes"
++
++config CRYPTO_CBC
++	tristate "CBC support"
++	select CRYPTO_BLKCIPHER
++	select CRYPTO_MANAGER
++	help
++	  CBC: Cipher Block Chaining mode
++	  This block cipher algorithm is required for IPSec.
++
++config CRYPTO_CTR
++	tristate "CTR support"
++	select CRYPTO_BLKCIPHER
++	select CRYPTO_SEQIV
++	select CRYPTO_MANAGER
++	help
++	  CTR: Counter mode
++	  This block cipher algorithm is required for IPSec.
++
++config CRYPTO_CTS
++	tristate "CTS support"
++	select CRYPTO_BLKCIPHER
++	help
++	  CTS: Cipher Text Stealing
++	  This is the Cipher Text Stealing mode as described by
++	  Section 8 of rfc2040 and referenced by rfc3962.
++	  (rfc3962 includes errata information in its Appendix A)
++	  This mode is required for Kerberos gss mechanism support
++	  for AES encryption.
++
++config CRYPTO_ECB
++	tristate "ECB support"
++	select CRYPTO_BLKCIPHER
++	select CRYPTO_MANAGER
++	help
++	  ECB: Electronic CodeBook mode
++	  This is the simplest block cipher algorithm.  It simply encrypts
++	  the input block by block.
++
++config CRYPTO_LRW
++	tristate "LRW support (EXPERIMENTAL)"
++	depends on EXPERIMENTAL
++	select CRYPTO_BLKCIPHER
++	select CRYPTO_MANAGER
++	select CRYPTO_GF128MUL
++	help
++	  LRW: Liskov Rivest Wagner, a tweakable, non malleable, non movable
++	  narrow block cipher mode for dm-crypt.  Use it with cipher
++	  specification string aes-lrw-benbi, the key must be 256, 320 or 384.
++	  The first 128, 192 or 256 bits in the key are used for AES and the
++	  rest is used to tie each cipher block to its logical position.
++
++config CRYPTO_PCBC
++	tristate "PCBC support"
++	select CRYPTO_BLKCIPHER
++	select CRYPTO_MANAGER
++	help
++	  PCBC: Propagating Cipher Block Chaining mode
++	  This block cipher algorithm is required for RxRPC.
++
++config CRYPTO_XTS
++	tristate "XTS support (EXPERIMENTAL)"
++	depends on EXPERIMENTAL
++	select CRYPTO_BLKCIPHER
++	select CRYPTO_MANAGER
++	select CRYPTO_GF128MUL
++	help
++	  XTS: IEEE1619/D16 narrow block cipher use with aes-xts-plain,
++	  key size 256, 384 or 512 bits. This implementation currently
++	  can't handle a sectorsize which is not a multiple of 16 bytes.
++
++comment "Hash modes"
++
++config CRYPTO_HMAC
++	tristate "HMAC support"
++	select CRYPTO_HASH
++	select CRYPTO_MANAGER
++	help
++	  HMAC: Keyed-Hashing for Message Authentication (RFC2104).
++	  This is required for IPSec.
++
++config CRYPTO_XCBC
++	tristate "XCBC support"
++	depends on EXPERIMENTAL
++	select CRYPTO_HASH
++	select CRYPTO_MANAGER
++	help
++	  XCBC: Keyed-Hashing with encryption algorithm
++		http://www.ietf.org/rfc/rfc3566.txt
++		http://csrc.nist.gov/encryption/modes/proposedmodes/
++		 xcbc-mac/xcbc-mac-spec.pdf
++
++config CRYPTO_VMAC
++	tristate "VMAC support"
++	depends on EXPERIMENTAL
++	select CRYPTO_HASH
++	select CRYPTO_MANAGER
++	help
++	  VMAC is a message authentication algorithm designed for
++	  very high speed on 64-bit architectures.
++
++	  See also:
++	  <http://fastcrypto.org/vmac>
++
++comment "Digest"
++
++config CRYPTO_CRC32C
++	tristate "CRC32c CRC algorithm"
++	select CRYPTO_HASH
++	help
++	  Castagnoli, et al Cyclic Redundancy-Check Algorithm.  Used
++	  by iSCSI for header and data digests and by others.
++	  See Castagnoli93.  Module will be crc32c.
++
++config CRYPTO_CRC32C_INTEL
++	tristate "CRC32c INTEL hardware acceleration"
++	depends on X86
++	select CRYPTO_HASH
++	help
++	  In Intel processor with SSE4.2 supported, the processor will
++	  support CRC32C implementation using hardware accelerated CRC32
++	  instruction. This option will create 'crc32c-intel' module,
++	  which will enable any routine to use the CRC32 instruction to
++	  gain performance compared with software implementation.
++	  Module will be crc32c-intel.
++
++config CRYPTO_GHASH
++	tristate "GHASH digest algorithm"
++	select CRYPTO_SHASH
++	select CRYPTO_GF128MUL
++	help
++	  GHASH is message digest algorithm for GCM (Galois/Counter Mode).
++
++config CRYPTO_MD4
++	tristate "MD4 digest algorithm"
++	select CRYPTO_HASH
++	help
++	  MD4 message digest algorithm (RFC1320).
++
++config CRYPTO_MD5
++	tristate "MD5 digest algorithm"
++	select CRYPTO_HASH
++	help
++	  MD5 message digest algorithm (RFC1321).
++
++config CRYPTO_MICHAEL_MIC
++	tristate "Michael MIC keyed digest algorithm"
++	select CRYPTO_HASH
++	help
++	  Michael MIC is used for message integrity protection in TKIP
++	  (IEEE 802.11i). This algorithm is required for TKIP, but it
++	  should not be used for other purposes because of the weakness
++	  of the algorithm.
++
++config CRYPTO_RMD128
++	tristate "RIPEMD-128 digest algorithm"
++	select CRYPTO_HASH
++	help
++	  RIPEMD-128 (ISO/IEC 10118-3:2004).
++
++	  RIPEMD-128 is a 128-bit cryptographic hash function. It should only
++	  to be used as a secure replacement for RIPEMD. For other use cases
++	  RIPEMD-160 should be used.
++
++	  Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
++	  See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
++
++config CRYPTO_RMD160
++	tristate "RIPEMD-160 digest algorithm"
++	select CRYPTO_HASH
++	help
++	  RIPEMD-160 (ISO/IEC 10118-3:2004).
++
++	  RIPEMD-160 is a 160-bit cryptographic hash function. It is intended
++	  to be used as a secure replacement for the 128-bit hash functions
++	  MD4, MD5 and it's predecessor RIPEMD
++	  (not to be confused with RIPEMD-128).
++
++	  It's speed is comparable to SHA1 and there are no known attacks
++	  against RIPEMD-160.
++
++	  Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
++	  See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
++
++config CRYPTO_RMD256
++	tristate "RIPEMD-256 digest algorithm"
++	select CRYPTO_HASH
++	help
++	  RIPEMD-256 is an optional extension of RIPEMD-128 with a
++	  256 bit hash. It is intended for applications that require
++	  longer hash-results, without needing a larger security level
++	  (than RIPEMD-128).
++
++	  Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
++	  See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
++
++config CRYPTO_RMD320
++	tristate "RIPEMD-320 digest algorithm"
++	select CRYPTO_HASH
++	help
++	  RIPEMD-320 is an optional extension of RIPEMD-160 with a
++	  320 bit hash. It is intended for applications that require
++	  longer hash-results, without needing a larger security level
++	  (than RIPEMD-160).
++
++	  Developed by Hans Dobbertin, Antoon Bosselaers and Bart Preneel.
++	  See <http://homes.esat.kuleuven.be/~bosselae/ripemd160.html>
++
++config CRYPTO_SHA1
++	tristate "SHA1 digest algorithm"
++	select CRYPTO_HASH
++	help
++	  SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
++
++config CRYPTO_SHA256
++	tristate "SHA224 and SHA256 digest algorithm"
++	select CRYPTO_HASH
++	help
++	  SHA256 secure hash standard (DFIPS 180-2).
++
++	  This version of SHA implements a 256 bit hash with 128 bits of
++	  security against collision attacks.
++
++	  This code also includes SHA-224, a 224 bit hash with 112 bits
++	  of security against collision attacks.
++
++config CRYPTO_SHA512
++	tristate "SHA384 and SHA512 digest algorithms"
++	select CRYPTO_HASH
++	help
++	  SHA512 secure hash standard (DFIPS 180-2).
++
++	  This version of SHA implements a 512 bit hash with 256 bits of
++	  security against collision attacks.
++
++	  This code also includes SHA-384, a 384 bit hash with 192 bits
++	  of security against collision attacks.
++
++config CRYPTO_TGR192
++	tristate "Tiger digest algorithms"
++	select CRYPTO_HASH
++	help
++	  Tiger hash algorithm 192, 160 and 128-bit hashes
++
++	  Tiger is a hash function optimized for 64-bit processors while
++	  still having decent performance on 32-bit processors.
++	  Tiger was developed by Ross Anderson and Eli Biham.
++
++	  See also:
++	  <http://www.cs.technion.ac.il/~biham/Reports/Tiger/>.
++
++config CRYPTO_WP512
++	tristate "Whirlpool digest algorithms"
++	select CRYPTO_HASH
++	help
++	  Whirlpool hash algorithm 512, 384 and 256-bit hashes
++
++	  Whirlpool-512 is part of the NESSIE cryptographic primitives.
++	  Whirlpool will be part of the ISO/IEC 10118-3:2003(E) standard
++
++	  See also:
++	  <http://www.larc.usp.br/~pbarreto/WhirlpoolPage.html>
++
++config CRYPTO_GHASH_CLMUL_NI_INTEL
++	tristate "GHASH digest algorithm (CLMUL-NI accelerated)"
++	depends on (X86 || UML_X86) && 64BIT
++	select CRYPTO_SHASH
++	select CRYPTO_CRYPTD
++	help
++	  GHASH is message digest algorithm for GCM (Galois/Counter Mode).
++	  The implementation is accelerated by CLMUL-NI of Intel.
++
++comment "Ciphers"
++
++config CRYPTO_AES
++	tristate "AES cipher algorithms"
++	select CRYPTO_ALGAPI
++	help
++	  AES cipher algorithms (FIPS-197). AES uses the Rijndael
++	  algorithm.
++
++	  Rijndael appears to be consistently a very good performer in
++	  both hardware and software across a wide range of computing
++	  environments regardless of its use in feedback or non-feedback
++	  modes. Its key setup time is excellent, and its key agility is
++	  good. Rijndael's very low memory requirements make it very well
++	  suited for restricted-space environments, in which it also
++	  demonstrates excellent performance. Rijndael's operations are
++	  among the easiest to defend against power and timing attacks.
++
++	  The AES specifies three key sizes: 128, 192 and 256 bits
++
++	  See <http://csrc.nist.gov/CryptoToolkit/aes/> for more information.
++
++config CRYPTO_AES_586
++	tristate "AES cipher algorithms (i586)"
++	depends on (X86 || UML_X86) && !64BIT
++	select CRYPTO_ALGAPI
++	select CRYPTO_AES
++	help
++	  AES cipher algorithms (FIPS-197). AES uses the Rijndael
++	  algorithm.
++
++	  Rijndael appears to be consistently a very good performer in
++	  both hardware and software across a wide range of computing
++	  environments regardless of its use in feedback or non-feedback
++	  modes. Its key setup time is excellent, and its key agility is
++	  good. Rijndael's very low memory requirements make it very well
++	  suited for restricted-space environments, in which it also
++	  demonstrates excellent performance. Rijndael's operations are
++	  among the easiest to defend against power and timing attacks.
++
++	  The AES specifies three key sizes: 128, 192 and 256 bits
++
++	  See <http://csrc.nist.gov/encryption/aes/> for more information.
++
++config CRYPTO_AES_X86_64
++	tristate "AES cipher algorithms (x86_64)"
++	depends on (X86 || UML_X86) && 64BIT
++	select CRYPTO_ALGAPI
++	select CRYPTO_AES
++	help
++	  AES cipher algorithms (FIPS-197). AES uses the Rijndael
++	  algorithm.
++
++	  Rijndael appears to be consistently a very good performer in
++	  both hardware and software across a wide range of computing
++	  environments regardless of its use in feedback or non-feedback
++	  modes. Its key setup time is excellent, and its key agility is
++	  good. Rijndael's very low memory requirements make it very well
++	  suited for restricted-space environments, in which it also
++	  demonstrates excellent performance. Rijndael's operations are
++	  among the easiest to defend against power and timing attacks.
++
++	  The AES specifies three key sizes: 128, 192 and 256 bits
++
++	  See <http://csrc.nist.gov/encryption/aes/> for more information.
++
++config CRYPTO_AES_NI_INTEL
++	tristate "AES cipher algorithms (AES-NI)"
++	depends on (X86 || UML_X86)
++	select CRYPTO_AES_X86_64 if 64BIT
++	select CRYPTO_AES_586 if !64BIT
++	select CRYPTO_CRYPTD
++	select CRYPTO_ALGAPI
++	help
++	  Use Intel AES-NI instructions for AES algorithm.
++
++	  AES cipher algorithms (FIPS-197). AES uses the Rijndael
++	  algorithm.
++
++	  Rijndael appears to be consistently a very good performer in
++	  both hardware and software across a wide range of computing
++	  environments regardless of its use in feedback or non-feedback
++	  modes. Its key setup time is excellent, and its key agility is
++	  good. Rijndael's very low memory requirements make it very well
++	  suited for restricted-space environments, in which it also
++	  demonstrates excellent performance. Rijndael's operations are
++	  among the easiest to defend against power and timing attacks.
++
++	  The AES specifies three key sizes: 128, 192 and 256 bits
++
++	  See <http://csrc.nist.gov/encryption/aes/> for more information.
++
++	  In addition to AES cipher algorithm support, the acceleration
++	  for some popular block cipher mode is supported too, including
++	  ECB, CBC, LRW, PCBC, XTS. The 64 bit version has additional
++	  acceleration for CTR.
++
++config CRYPTO_ANUBIS
++	tristate "Anubis cipher algorithm"
++	select CRYPTO_ALGAPI
++	help
++	  Anubis cipher algorithm.
++
++	  Anubis is a variable key length cipher which can use keys from
++	  128 bits to 320 bits in length.  It was evaluated as a entrant
++	  in the NESSIE competition.
++
++	  See also:
++	  <https://www.cosic.esat.kuleuven.be/nessie/reports/>
++	  <http://www.larc.usp.br/~pbarreto/AnubisPage.html>
++
++config CRYPTO_ARC4
++	tristate "ARC4 cipher algorithm"
++	select CRYPTO_ALGAPI
++	help
++	  ARC4 cipher algorithm.
++
++	  ARC4 is a stream cipher using keys ranging from 8 bits to 2048
++	  bits in length.  This algorithm is required for driver-based
++	  WEP, but it should not be for other purposes because of the
++	  weakness of the algorithm.
++
++config CRYPTO_BLOWFISH
++	tristate "Blowfish cipher algorithm"
++	select CRYPTO_ALGAPI
++	help
++	  Blowfish cipher algorithm, by Bruce Schneier.
++
++	  This is a variable key length cipher which can use keys from 32
++	  bits to 448 bits in length.  It's fast, simple and specifically
++	  designed for use on "large microprocessors".
++
++	  See also:
++	  <http://www.schneier.com/blowfish.html>
++
++config CRYPTO_CAMELLIA
++	tristate "Camellia cipher algorithms"
++	depends on CRYPTO
++	select CRYPTO_ALGAPI
++	help
++	  Camellia cipher algorithms module.
++
++	  Camellia is a symmetric key block cipher developed jointly
++	  at NTT and Mitsubishi Electric Corporation.
++
++	  The Camellia specifies three key sizes: 128, 192 and 256 bits.
++
++	  See also:
++	  <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
++
++config CRYPTO_CAST5
++	tristate "CAST5 (CAST-128) cipher algorithm"
++	select CRYPTO_ALGAPI
++	help
++	  The CAST5 encryption algorithm (synonymous with CAST-128) is
++	  described in RFC2144.
++
++config CRYPTO_CAST6
++	tristate "CAST6 (CAST-256) cipher algorithm"
++	select CRYPTO_ALGAPI
++	help
++	  The CAST6 encryption algorithm (synonymous with CAST-256) is
++	  described in RFC2612.
++
++config CRYPTO_DES
++	tristate "DES and Triple DES EDE cipher algorithms"
++	select CRYPTO_ALGAPI
++	help
++	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
++
++config CRYPTO_FCRYPT
++	tristate "FCrypt cipher algorithm"
++	select CRYPTO_ALGAPI
++	select CRYPTO_BLKCIPHER
++	help
++	  FCrypt algorithm used by RxRPC.
++
++config CRYPTO_KHAZAD
++	tristate "Khazad cipher algorithm"
++	select CRYPTO_ALGAPI
++	help
++	  Khazad cipher algorithm.
++
++	  Khazad was a finalist in the initial NESSIE competition.  It is
++	  an algorithm optimized for 64-bit processors with good performance
++	  on 32-bit processors.  Khazad uses an 128 bit key size.
++
++	  See also:
++	  <http://www.larc.usp.br/~pbarreto/KhazadPage.html>
++
++config CRYPTO_SALSA20
++	tristate "Salsa20 stream cipher algorithm (EXPERIMENTAL)"
++	depends on EXPERIMENTAL
++	select CRYPTO_BLKCIPHER
++	help
++	  Salsa20 stream cipher algorithm.
++
++	  Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT
++	  Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/>
++
++	  The Salsa20 stream cipher algorithm is designed by Daniel J.
++	  Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
++
++config CRYPTO_SALSA20_586
++	tristate "Salsa20 stream cipher algorithm (i586) (EXPERIMENTAL)"
++	depends on (X86 || UML_X86) && !64BIT
++	depends on EXPERIMENTAL
++	select CRYPTO_BLKCIPHER
++	help
++	  Salsa20 stream cipher algorithm.
++
++	  Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT
++	  Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/>
++
++	  The Salsa20 stream cipher algorithm is designed by Daniel J.
++	  Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
++
++config CRYPTO_SALSA20_X86_64
++	tristate "Salsa20 stream cipher algorithm (x86_64) (EXPERIMENTAL)"
++	depends on (X86 || UML_X86) && 64BIT
++	depends on EXPERIMENTAL
++	select CRYPTO_BLKCIPHER
++	help
++	  Salsa20 stream cipher algorithm.
++
++	  Salsa20 is a stream cipher submitted to eSTREAM, the ECRYPT
++	  Stream Cipher Project. See <http://www.ecrypt.eu.org/stream/>
++
++	  The Salsa20 stream cipher algorithm is designed by Daniel J.
++	  Bernstein <djb@cr.yp.to>. See <http://cr.yp.to/snuffle.html>
++
++config CRYPTO_SEED
++	tristate "SEED cipher algorithm"
++	select CRYPTO_ALGAPI
++	help
++	  SEED cipher algorithm (RFC4269).
++
++	  SEED is a 128-bit symmetric key block cipher that has been
++	  developed by KISA (Korea Information Security Agency) as a
++	  national standard encryption algorithm of the Republic of Korea.
++	  It is a 16 round block cipher with the key size of 128 bit.
++
++	  See also:
++	  <http://www.kisa.or.kr/kisa/seed/jsp/seed_eng.jsp>
++
++config CRYPTO_SERPENT
++	tristate "Serpent cipher algorithm"
++	select CRYPTO_ALGAPI
++	help
++	  Serpent cipher algorithm, by Anderson, Biham & Knudsen.
++
++	  Keys are allowed to be from 0 to 256 bits in length, in steps
++	  of 8 bits.  Also includes the 'Tnepres' algorithm, a reversed
++	  variant of Serpent for compatibility with old kerneli.org code.
++
++	  See also:
++	  <http://www.cl.cam.ac.uk/~rja14/serpent.html>
++
++config CRYPTO_TEA
++	tristate "TEA, XTEA and XETA cipher algorithms"
++	select CRYPTO_ALGAPI
++	help
++	  TEA cipher algorithm.
++
++	  Tiny Encryption Algorithm is a simple cipher that uses
++	  many rounds for security.  It is very fast and uses
++	  little memory.
++
++	  Xtendend Tiny Encryption Algorithm is a modification to
++	  the TEA algorithm to address a potential key weakness
++	  in the TEA algorithm.
++
++	  Xtendend Encryption Tiny Algorithm is a mis-implementation
++	  of the XTEA algorithm for compatibility purposes.
++
++config CRYPTO_TWOFISH
++	tristate "Twofish cipher algorithm"
++	select CRYPTO_ALGAPI
++	select CRYPTO_TWOFISH_COMMON
++	help
++	  Twofish cipher algorithm.
++
++	  Twofish was submitted as an AES (Advanced Encryption Standard)