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

Commit 91925175 authored by Stefan Richter's avatar Stefan Richter
Browse files

Merge branch 'mainline' into upstream-linus

parents c394f1ea 3eeab61a
Loading
Loading
Loading
Loading
+22 −14
Original line number Diff line number Diff line
@@ -19,15 +19,14 @@ At the lowest level are algorithms, which register dynamically with the
API.

'Transforms' are user-instantiated objects, which maintain state, handle all
of the implementation logic (e.g. manipulating page vectors), provide an 
abstraction to the underlying algorithms, and handle common logical 
operations (e.g. cipher modes, HMAC for digests).  However, at the user 
of the implementation logic (e.g. manipulating page vectors) and provide an 
abstraction to the underlying algorithms.  However, at the user 
level they are very simple.

Conceptually, the API layering looks like this:

  [transform api]  (user interface)
  [transform ops]  (per-type logic glue e.g. cipher.c, digest.c)
  [transform ops]  (per-type logic glue e.g. cipher.c, compress.c)
  [algorithm api]  (for registering algorithms)
  
The idea is to make the user interface and algorithm registration API
@@ -44,22 +43,27 @@ under development.
Here's an example of how to use the API:

	#include <linux/crypto.h>
	#include <linux/err.h>
	#include <linux/scatterlist.h>
	
	struct scatterlist sg[2];
	char result[128];
	struct crypto_tfm *tfm;
	struct crypto_hash *tfm;
	struct hash_desc desc;
	
	tfm = crypto_alloc_tfm("md5", 0);
	if (tfm == NULL)
	tfm = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);
	if (IS_ERR(tfm))
		fail();
		
	/* ... set up the scatterlists ... */

	crypto_digest_init(tfm);
	crypto_digest_update(tfm, &sg, 2);
	crypto_digest_final(tfm, result);
	desc.tfm = tfm;
	desc.flags = 0;
	
	crypto_free_tfm(tfm);
	if (crypto_hash_digest(&desc, &sg, 2, result))
		fail();
	
	crypto_free_hash(tfm);

    
Many real examples are available in the regression test module (tcrypt.c).
@@ -126,7 +130,7 @@ might already be working on.
BUGS

Send bug reports to:
James Morris <jmorris@redhat.com>
Herbert Xu <herbert@gondor.apana.org.au>
Cc: David S. Miller <davem@redhat.com>


@@ -134,13 +138,14 @@ FURTHER INFORMATION

For further patches and various updates, including the current TODO
list, see:
http://samba.org/~jamesm/crypto/
http://gondor.apana.org.au/~herbert/crypto/


AUTHORS

James Morris
David S. Miller
Herbert Xu


CREDITS
@@ -238,8 +243,11 @@ Anubis algorithm contributors:
Tiger algorithm contributors:
  Aaron Grothe

VIA PadLock contributors:
  Michal Ludvig

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

Please send any credits updates or corrections to:
James Morris <jmorris@redhat.com>
Herbert Xu <herbert@gondor.apana.org.au>
+13 −0
Original line number Diff line number Diff line
@@ -272,3 +272,16 @@ Why: The deferred output hooks are a layering violation causing unusual
Who:	Patrick McHardy <kaber@trash.net>

---------------------------

What:	frame diverter
When:	November 2006
Why:	The frame diverter is included in most distribution kernels, but is
	broken. It does not correctly handle many things:
	- IPV6
	- non-linear skb's
	- network device RCU on removal
	- input frames not correctly checked for protocol errors
	It also adds allocation overhead even if not enabled.
	It is not clear if anyone is still using it.
Who:	Stephen Hemminger <shemminger@osdl.org>
+6 −2
Original line number Diff line number Diff line
@@ -697,6 +697,12 @@ running once the system is up.
	ips=		[HW,SCSI] Adaptec / IBM ServeRAID controller
			See header of drivers/scsi/ips.c.

	ports=		[IP_VS_FTP] IPVS ftp helper module
			Default is 21.
			Up to 8 (IP_VS_APP_MAX_PORTS) ports
			may be specified.
			Format: <port>,<port>....

	irqfixup	[HW]
			When an interrupt is not handled search all handlers
			for it. Intended to get systems with badly broken
@@ -1183,8 +1189,6 @@ running once the system is up.
				Mechanism 2.
		nommconf	[IA-32,X86_64] Disable use of MMCONFIG for PCI
				Configuration
		mmconf		[IA-32,X86_64] Force MMCONFIG. This is useful
				to override the builtin blacklist.
		nomsi		[MSI] If the PCI_MSI kernel config parameter is
				enabled, this kernel boot option can be used to
				disable the use of MSI interrupts system-wide.
+9 −3
Original line number Diff line number Diff line
@@ -102,9 +102,15 @@ inet_peer_gc_maxtime - INTEGER
TCP variables: 

tcp_abc - INTEGER
	Controls Appropriate Byte Count defined in RFC3465. If set to
	0 then does congestion avoid once per ack. 1 is conservative
	value, and 2 is more agressive.
	Controls Appropriate Byte Count (ABC) defined in RFC3465.
	ABC is a way of increasing congestion window (cwnd) more slowly
	in response to partial acknowledgments.
	Possible values are:
		0 increase cwnd once per acknowledgment (no ABC)
		1 increase cwnd once per acknowledgment of full sized segment
		2 allow increase cwnd by two if acknowledgment is
		  of two segments to compensate for delayed acknowledgments.
	Default: 0 (off)

tcp_syn_retries - INTEGER
	Number of times initial SYNs for an active TCP connection attempt
+34 −1
Original line number Diff line number Diff line
@@ -298,6 +298,14 @@ L: info-linux@geode.amd.com
W:	http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
S:	Supported

AMSO1100 RNIC DRIVER
P:	Tom Tucker
M:	tom@opengridcomputing.com
P:	Steve Wise
M:	swise@opengridcomputing.com
L:	openib-general@openib.org
S:	Maintained

AOA (Apple Onboard Audio) ALSA DRIVER
P:	Johannes Berg
M:	johannes@sipsolutions.net
@@ -416,7 +424,7 @@ S: Supported
ATM
P:	Chas Williams
M:	chas@cmf.nrl.navy.mil
L:	linux-atm-general@lists.sourceforge.net
L:	linux-atm-general@lists.sourceforge.net (subscribers-only)
W:	http://linux-atm.sourceforge.net
S:	Maintained

@@ -991,6 +999,14 @@ EFS FILESYSTEM
W:	http://aeschi.ch.eu.org/efs/
S:	Orphan

EHCA (IBM GX bus InfiniBand adapter) DRIVER:
P:	Hoang-Nam Nguyen
M:	hnguyen@de.ibm.com
P:	Christoph Raisch
M:	raisch@de.ibm.com
L:	openib-general@openib.org
S:	Supported

EMU10K1 SOUND DRIVER
P:	James Courtier-Dutton
M:	James@superbug.demon.co.uk
@@ -1766,6 +1782,13 @@ W: http://www.penguinppc.org/
L:     linuxppc-embedded@ozlabs.org
S:     Maintained

LINUX FOR POWERPC PA SEMI PWRFICIENT
P:	Olof Johansson
M:	olof@lixom.net
W:	http://www.pasemi.com/
L:	linuxppc-dev@ozlabs.org
S:	Supported

LLC (802.2)
P:	Arnaldo Carvalho de Melo
M:	acme@conectiva.com.br
@@ -2428,6 +2451,8 @@ S: Maintained
S390
P:	Martin Schwidefsky
M:	schwidefsky@de.ibm.com
P:	Heiko Carstens
M:	heiko.carstens@de.ibm.com
M:	linux390@de.ibm.com
L:	linux-390@vm.marist.edu
W:	http://www.ibm.com/developerworks/linux/linux390/
@@ -2793,6 +2818,14 @@ M: hadi@cyberus.ca
L:	netdev@vger.kernel.org
S:	Maintained

TCP LOW PRIORITY MODULE
P:	Wong Hoi Sing, Edison
M:	hswong3i@gmail.com
P:	Hung Hing Lun, Mike
M:	hlhung3i@gmail.com
W:	http://tcp-lp-mod.sourceforge.net/
S:	Maintained

TI OMAP RANDOM NUMBER GENERATOR SUPPORT
P:	Deepak Saxena
M:	dsaxena@plexity.net
Loading