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

Commit 2685b267 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: (48 commits)
  [NETFILTER]: Fix non-ANSI func. decl.
  [TG3]: Identify Serdes devices more clearly.
  [TG3]: Use msleep.
  [TG3]: Use netif_msg_*.
  [TG3]: Allow partial speed advertisement.
  [TG3]: Add TG3_FLG2_IS_NIC flag.
  [TG3]: Add 5787F device ID.
  [TG3]: Fix Phy loopback.
  [WANROUTER]: Kill kmalloc debugging code.
  [TCP] inet_twdr_hangman: Delete unnecessary memory barrier().
  [NET]: Memory barrier cleanups
  [IPSEC]: Fix inetpeer leak in ipv4 xfrm dst entries.
  audit: disable ipsec auditing when CONFIG_AUDITSYSCALL=n
  audit: Add auditing to ipsec
  [IRDA] irlan: Fix compile warning when CONFIG_PROC_FS=n
  [IrDA]: Incorrect TTP header reservation
  [IrDA]: PXA FIR code device model conversion
  [GENETLINK]: Fix misplaced command flags.
  [NETLIK]: Add a pointer to the Generic Netlink wiki page.
  [IPV6] RAW: Don't release unlocked sock.
  ...
parents 4522d582 272491ef

Documentation/networking/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ fore200e.txt 
	- FORE Systems PCA-200E/SBA-200E ATM NIC driver info.

framerelay.txt

	- info on using Frame Relay/Data Link Connection Identifier (DLCI).

generic_netlink.txt

	- info on Generic Netlink

ip-sysctl.txt

	- /proc/sys/net/ipv4/* variables

ip_dynaddr.txt

Documentation/networking/generic_netlink.txt

0 → 100644
+3 −0
Original line number Diff line number Diff line 
A wiki document on how to use Generic Netlink can be found here:



 * http://linux-net.osdl.org/index.php/Generic_Netlink_HOWTO

crypto/Kconfig

+34 −0
Original line number Diff line number Diff line
@@ -39,6 +39,17 @@ config CRYPTO_HMAC 
	  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_NULL

	tristate "Null algorithms"

	select CRYPTO_ALGAPI
@@ -128,6 +139,16 @@ config CRYPTO_TGR192 
	  See also:

	  <http://www.cs.technion.ac.il/~biham/Reports/Tiger/>.



config CRYPTO_GF128MUL

	tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"

	depends on 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_ECB

	tristate "ECB support"

	select CRYPTO_BLKCIPHER
@@ -147,6 +168,19 @@ config CRYPTO_CBC 
	  CBC: Cipher Block Chaining mode

	  This block cipher algorithm is required for IPSec.



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_DES

	tristate "DES and Triple DES EDE cipher algorithms"

	select CRYPTO_ALGAPI

crypto/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ obj-$(CONFIG_CRYPTO_HASH) += crypto_hash.o 


obj-$(CONFIG_CRYPTO_MANAGER) += cryptomgr.o

obj-$(CONFIG_CRYPTO_HMAC) += hmac.o

obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o

obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o

obj-$(CONFIG_CRYPTO_MD4) += md4.o

obj-$(CONFIG_CRYPTO_MD5) += md5.o
@@ -23,8 +24,10 @@ obj-$(CONFIG_CRYPTO_SHA256) += sha256.o 
obj-$(CONFIG_CRYPTO_SHA512) += sha512.o

obj-$(CONFIG_CRYPTO_WP512) += wp512.o

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_LRW) += lrw.o

obj-$(CONFIG_CRYPTO_DES) += des.o

obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish.o

obj-$(CONFIG_CRYPTO_TWOFISH) += twofish.o

crypto/api.c

+0 −15
Original line number Diff line number Diff line
@@ -466,23 +466,8 @@ void crypto_free_tfm(struct crypto_tfm *tfm) 
	kfree(tfm);

}



int crypto_alg_available(const char *name, u32 flags)

{

	int ret = 0;

	struct crypto_alg *alg = crypto_alg_mod_lookup(name, 0,

						       CRYPTO_ALG_ASYNC);

	

	if (!IS_ERR(alg)) {

		crypto_mod_put(alg);

		ret = 1;

	}

	

	return ret;

}



EXPORT_SYMBOL_GPL(crypto_alloc_tfm);

EXPORT_SYMBOL_GPL(crypto_free_tfm);

EXPORT_SYMBOL_GPL(crypto_alg_available);



int crypto_has_alg(const char *name, u32 type, u32 mask)

{