Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f049274b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (79 commits)
  [IPX]: Fix NULL pointer dereference on ipx unload
  [ATM]: atmarp.h needs to always include linux/types.h
  [NET]: Fix net/socket.c warnings.
  [NET]: cleanup sock_from_file()
  [NET]: change layout of ehash table
  [S390]: Add AF_IUCV socket support
  [S390]: Adapt special message interface to new IUCV API
  [S390]: Adapt netiucv driver to new IUCV API
  [S390]: Adapt vmlogrdr driver to new IUCV API
  [S390]: Adapt monreader driver to new IUCV API
  [S390]: Rewrite of the IUCV base code, part 2
  [S390]: Rewrite of the IUCV base code, part 1
  [X.25]: Adds /proc/net/x25/forward to view active forwarded calls.
  [X.25]: Adds /proc/sys/net/x25/x25_forward to control forwarding.
  [X.25]: Add call forwarding
  [XFRM]: xfrm_migrate() needs exporting to modules.
  [PFKEYV2]: CONFIG_NET_KEY_MIGRATE option
  [PFKEYV2]: Extension for dynamic update of endpoint address(es)
  [XFRM]: CONFIG_XFRM_MIGRATE option
  [XFRM]: User interface for handling XFRM_MSG_MIGRATE
  ...
parents b37df859 1539b98b

Documentation/crypto/api-intro.txt

+4 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ Original developers of the crypto algorithms: 
  Kartikey Mahendra Bhatt (CAST6)

  Jon Oberheide (ARC4)

  Jouni Malinen (Michael MIC)

  NTT(Nippon Telegraph and Telephone Corporation) (Camellia)



SHA1 algorithm contributors:

  Jean-Francois Dive
@@ -246,6 +247,9 @@ Tiger algorithm contributors: 
VIA PadLock contributors:

  Michal Ludvig



Camellia algorithm contributors:

  NTT(Nippon Telegraph and Telephone Corporation) (Camellia)



Generic scatterwalk code by Adam J. Richter <adam@yggdrasil.com>



Please send any credits updates or corrections to:

arch/s390/defconfig

+2 −1
Original line number Diff line number Diff line
@@ -179,6 +179,8 @@ CONFIG_XFRM=y 
# CONFIG_XFRM_USER is not set

# CONFIG_XFRM_SUB_POLICY is not set

CONFIG_NET_KEY=y

CONFIG_IUCV=m

CONFIG_AFIUCV=m

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

# CONFIG_IP_ADVANCED_ROUTER is not set
@@ -508,7 +510,6 @@ CONFIG_NET_ETHERNET=y 
#

CONFIG_LCS=m

CONFIG_CTC=m

CONFIG_IUCV=m

# CONFIG_NETIUCV is not set

# CONFIG_SMSGIUCV is not set

# CONFIG_CLAW is not set

crypto/Kconfig

+31 −0
Original line number Diff line number Diff line
@@ -149,6 +149,15 @@ config CRYPTO_CBC 
	  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 +177,13 @@ config CRYPTO_DES 
	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
@@ -409,6 +425,21 @@ config CRYPTO_CRC32C 
	  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

crypto/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -27,13 +27,16 @@ obj-$(CONFIG_CRYPTO_TGR192) += tgr192.o 
obj-$(CONFIG_CRYPTO_GF128MUL) += gf128mul.o

obj-$(CONFIG_CRYPTO_ECB) += ecb.o

obj-$(CONFIG_CRYPTO_CBC) += cbc.o

obj-$(CONFIG_CRYPTO_PCBC) += pcbc.o

obj-$(CONFIG_CRYPTO_LRW) += lrw.o

obj-$(CONFIG_CRYPTO_DES) += des.o

obj-$(CONFIG_CRYPTO_FCRYPT) += fcrypt.o

obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish.o

obj-$(CONFIG_CRYPTO_TWOFISH) += twofish.o

obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o

obj-$(CONFIG_CRYPTO_SERPENT) += serpent.o

obj-$(CONFIG_CRYPTO_AES) += aes.o

obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia.o

obj-$(CONFIG_CRYPTO_CAST5) += cast5.o

obj-$(CONFIG_CRYPTO_CAST6) += cast6.o

obj-$(CONFIG_CRYPTO_ARC4) += arc4.o

crypto/algapi.c

+12 −3
Original line number Diff line number Diff line
@@ -377,7 +377,8 @@ void crypto_drop_spawn(struct crypto_spawn *spawn) 
}

EXPORT_SYMBOL_GPL(crypto_drop_spawn);



struct crypto_tfm *crypto_spawn_tfm(struct crypto_spawn *spawn)

struct crypto_tfm *crypto_spawn_tfm(struct crypto_spawn *spawn, u32 type,

				    u32 mask)

{

	struct crypto_alg *alg;

	struct crypto_alg *alg2;
@@ -396,11 +397,19 @@ struct crypto_tfm *crypto_spawn_tfm(struct crypto_spawn *spawn) 
		return ERR_PTR(-EAGAIN);

	}



	tfm = __crypto_alloc_tfm(alg, 0);

	tfm = ERR_PTR(-EINVAL);

	if (unlikely((alg->cra_flags ^ type) & mask))

		goto out_put_alg;



	tfm = __crypto_alloc_tfm(alg, type, mask);

	if (IS_ERR(tfm))

		crypto_mod_put(alg);

		goto out_put_alg;



	return tfm;



out_put_alg:

	crypto_mod_put(alg);

	return tfm;

}

EXPORT_SYMBOL_GPL(crypto_spawn_tfm);