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

Pull crypto fixes from Herbert Xu:
 "This fixes the following issues:

   - missing selection in public_key that may result in a build failure

   - Potential crash in error path in omap-sham

   - ccp AES XTS bug that affects requests larger than 4096"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: ccp - Fix AES XTS error for request sizes above 4096
  crypto: public_key: select CRYPTO_AKCIPHER
  crypto: omap-sham - potential Oops on error in probe

diff --combined crypto/asymmetric_keys/Kconfig
index e28e912000a71ab701f61fc09faa9570f81afe09,477cbf39e0fbc699a028075ccf13f7a45d3d8155..331f6baf2df8ea39148a49f5f7408238adc2fb0f
--- 1/crypto/asymmetric_keys/Kconfig
--- 2/crypto/asymmetric_keys/Kconfig
+++ b/crypto/asymmetric_keys/Kconfig
@@@ -1,5 -1,5 +1,5 @@@
  menuconfig ASYMMETRIC_KEY_TYPE
 -      tristate "Asymmetric (public-key cryptographic) key type"
 +      bool "Asymmetric (public-key cryptographic) key type"
        depends on KEYS
        help
          This option provides support for a key type that holds the data for
@@@ -13,6 -13,7 +13,7 @@@ config ASYMMETRIC_PUBLIC_KEY_SUBTYP
        tristate "Asymmetric public-key crypto algorithm subtype"
        select MPILIB
        select CRYPTO_HASH_INFO
+       select CRYPTO_AKCIPHER
        help
          This option provides support for asymmetric public key type handling.
          If signature generation and/or verification are to be used,
@@@ -40,7 -41,8 +41,7 @@@ config PKCS7_MESSAGE_PARSE
  
  config PKCS7_TEST_KEY
        tristate "PKCS#7 testing key type"
 -      depends on PKCS7_MESSAGE_PARSER
 -      select SYSTEM_TRUSTED_KEYRING
 +      depends on SYSTEM_DATA_VERIFICATION
        help
          This option provides a type of key that can be loaded up from a
          PKCS#7 message - provided the message is signed by a trusted key.  If
@@@ -53,7 -55,6 +54,7 @@@
  config SIGNED_PE_FILE_VERIFICATION
        bool "Support for PE file signature verification"
        depends on PKCS7_MESSAGE_PARSER=y
 +      depends on SYSTEM_DATA_VERIFICATION
        select ASN1
        select OID_REGISTRY
        help