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

Conflicts:

	crypto/Kconfig

diff --combined crypto/Kconfig
index 918b4d8,c2a85bd..086fcec
--- 1/crypto/Kconfig
--- 2/crypto/Kconfig
+++ b/crypto/Kconfig
@@@ -74,6 -74,14 +74,6 @@@ config CRYPTO_SHA
        help
          SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
  
 -config CRYPTO_SHA1_S390
 -      tristate "SHA1 digest algorithm (s390)"
 -      depends on S390
 -      select CRYPTO_ALGAPI
 -      help
 -        This is the s390 hardware accelerated implementation of the
 -        SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
 -
  config CRYPTO_SHA256
        tristate "SHA256 digest algorithm"
        select CRYPTO_ALGAPI
@@@ -83,6 -91,17 +83,6 @@@
          This version of SHA implements a 256 bit hash with 128 bits of
          security against collision attacks.
  
 -config CRYPTO_SHA256_S390
 -      tristate "SHA256 digest algorithm (s390)"
 -      depends on S390
 -      select CRYPTO_ALGAPI
 -      help
 -        This is the s390 hardware accelerated implementation of the
 -        SHA256 secure hash standard (DFIPS 180-2).
 -
 -        This version of SHA implements a 256 bit hash with 128 bits of
 -        security against collision attacks.
 -
  config CRYPTO_SHA512
        tristate "SHA384 and SHA512 digest algorithms"
        select CRYPTO_ALGAPI
@@@ -149,6 -168,15 +149,15 @@@ config CRYPTO_CB
          CBC: Cipher Block Chaining mode
          This block cipher algorithm is required for IPSec.
  
+ config CRYPTO_PCBC
+       tristate "PCBC support"
+       select CRYPTO_BLKCIPHER
+       select CRYPTO_MANAGER
+       default m
+       help
+         PCBC: Propagating Cipher Block Chaining mode
+         This block cipher algorithm is required for RxRPC.
+ 
  config CRYPTO_LRW
        tristate "LRW support (EXPERIMENTAL)"
        depends on EXPERIMENTAL
@@@ -168,6 -196,21 +177,13 @@@ config CRYPTO_DE
        help
          DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
  
 -config CRYPTO_DES_S390
 -      tristate "DES and Triple DES cipher algorithms (s390)"
 -      depends on S390
 -      select CRYPTO_ALGAPI
 -      select CRYPTO_BLKCIPHER
 -      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_BLOWFISH
        tristate "Blowfish cipher algorithm"
        select CRYPTO_ALGAPI
@@@ -309,6 -352,28 +325,6 @@@ config CRYPTO_AES_X86_6
  
          See <http://csrc.nist.gov/encryption/aes/> for more information.
  
 -config CRYPTO_AES_S390
 -      tristate "AES cipher algorithms (s390)"
 -      depends on S390
 -      select CRYPTO_ALGAPI
 -      select CRYPTO_BLKCIPHER
 -      help
 -        This is the s390 hardware accelerated implementation of the
 -        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.
 -
 -        On s390 the System z9-109 currently only supports the key size
 -        of 128 bit.
 -
  config CRYPTO_CAST5
        tristate "CAST5 (CAST-128) cipher algorithm"
        select CRYPTO_ALGAPI
@@@ -409,6 -474,21 +425,21 @@@ config CRYPTO_CRC32
          See Castagnoli93.  This implementation uses lib/libcrc32c.
            Module will be crc32c.
  
+ 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_TEST
        tristate "Testing module"
        depends on m

diff --combined include/linux/pfkeyv2.h
index 26a518b,52ed4a5..d9db5f6
--- 1/include/linux/pfkeyv2.h
--- 2/include/linux/pfkeyv2.h
+++ b/include/linux/pfkeyv2.h
@@@ -251,8 -251,7 +251,8 @@@ struct sadb_x_sec_ctx 
  #define SADB_X_SPDEXPIRE      21
  #define SADB_X_SPDDELETE2     22
  #define SADB_X_NAT_T_NEW_MAPPING      23
 -#define SADB_MAX              23
 +#define SADB_X_MIGRATE                24
 +#define SADB_MAX              24
  
  /* Security Association flags */
  #define SADB_SAFLAGS_PFS      1
@@@ -298,6 -297,7 +298,7 @@@
  #define SADB_X_EALG_BLOWFISHCBC               7
  #define SADB_EALG_NULL                        11
  #define SADB_X_EALG_AESCBC            12
+ #define SADB_X_EALG_CAMELLIACBC               22
  #define SADB_EALG_MAX                   253 /* last EALG */
  /* private allocations should use 249-255 (RFC2407) */
  #define SADB_X_EALG_SERPENTCBC  252     /* draft-ietf-ipsec-ciph-aes-cbc-00 */