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

Commit 02b25fcf authored by David Woodhouse's avatar David Woodhouse
Browse files

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

parents 1694176a a68aa1cc

CREDITS

+7 −0
Original line number Original line Diff line number Diff line
@@ -2384,6 +2384,13 @@ N: Thomas Molina 
E: tmolina@cablespeed.com

E: tmolina@cablespeed.com

D: bug fixes, documentation, minor hackery

D: bug fixes, documentation, minor hackery





N: Paul Moore

E: paul.moore@hp.com

D: NetLabel author

S: Hewlett-Packard

S: 110 Spit Brook Road

S: Nashua, NH 03062



N: James Morris

N: James Morris

E: jmorris@namei.org

E: jmorris@namei.org

W: http://namei.org/

W: http://namei.org/

Documentation/00-INDEX

+2 −0
Original line number Original line Diff line number Diff line
@@ -184,6 +184,8 @@ mtrr.txt 
	- how to use PPro Memory Type Range Registers to increase performance.

	- how to use PPro Memory Type Range Registers to increase performance.

nbd.txt

nbd.txt

	- info on a TCP implementation of a network block device.

	- info on a TCP implementation of a network block device.

netlabel/

	- directory with information on the NetLabel subsystem.

networking/

networking/

	- directory with info on various aspects of networking with Linux.

	- directory with info on various aspects of networking with Linux.

nfsroot.txt

nfsroot.txt

Documentation/DocBook/libata.tmpl

+6 −6
Original line number Original line Diff line number Diff line
@@ -868,18 +868,18 @@ and other resources, etc. 




  <chapter id="libataExt">

  <chapter id="libataExt">

     <title>libata Library</title>

     <title>libata Library</title>

!Edrivers/scsi/libata-core.c

!Edrivers/ata/libata-core.c

  </chapter>

  </chapter>





  <chapter id="libataInt">

  <chapter id="libataInt">

     <title>libata Core Internals</title>

     <title>libata Core Internals</title>

!Idrivers/scsi/libata-core.c

!Idrivers/ata/libata-core.c

  </chapter>

  </chapter>





  <chapter id="libataScsiInt">

  <chapter id="libataScsiInt">

     <title>libata SCSI translation/emulation</title>

     <title>libata SCSI translation/emulation</title>

!Edrivers/scsi/libata-scsi.c

!Edrivers/ata/libata-scsi.c

!Idrivers/scsi/libata-scsi.c

!Idrivers/ata/libata-scsi.c

  </chapter>

  </chapter>





  <chapter id="ataExceptions">

  <chapter id="ataExceptions">
@@ -1600,12 +1600,12 @@ and other resources, etc. 




  <chapter id="PiixInt">

  <chapter id="PiixInt">

     <title>ata_piix Internals</title>

     <title>ata_piix Internals</title>

!Idrivers/scsi/ata_piix.c

!Idrivers/ata/ata_piix.c

  </chapter>

  </chapter>





  <chapter id="SILInt">

  <chapter id="SILInt">

     <title>sata_sil Internals</title>

     <title>sata_sil Internals</title>

!Idrivers/scsi/sata_sil.c

!Idrivers/ata/sata_sil.c

  </chapter>

  </chapter>





  <chapter id="libataThanks">

  <chapter id="libataThanks">

Documentation/crypto/api-intro.txt

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

API.





'Transforms' are user-instantiated objects, which maintain state, handle all

'Transforms' are user-instantiated objects, which maintain state, handle all

of the implementation logic (e.g. manipulating page vectors), provide an 

of the implementation logic (e.g. manipulating page vectors) and provide an 

abstraction to the underlying algorithms, and handle common logical 

abstraction to the underlying algorithms.  However, at the user 

operations (e.g. cipher modes, HMAC for digests).  However, at the user 

level they are very simple.

level they are very simple.





Conceptually, the API layering looks like this:

Conceptually, the API layering looks like this:





  [transform api]  (user interface)

  [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)

  [algorithm api]  (for registering algorithms)

  

  

The idea is to make the user interface and algorithm registration API

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:

Here's an example of how to use the API:





	#include <linux/crypto.h>

	#include <linux/crypto.h>

	#include <linux/err.h>

	#include <linux/scatterlist.h>

	

	

	struct scatterlist sg[2];

	struct scatterlist sg[2];

	char result[128];

	char result[128];

	struct crypto_tfm *tfm;

	struct crypto_hash *tfm;

	struct hash_desc desc;

	

	

	tfm = crypto_alloc_tfm("md5", 0);

	tfm = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);

	if (tfm == NULL)

	if (IS_ERR(tfm))

		fail();

		fail();

		

		

	/* ... set up the scatterlists ... */

	/* ... set up the scatterlists ... */





	crypto_digest_init(tfm);

	desc.tfm = tfm;

	crypto_digest_update(tfm, &sg, 2);

	desc.flags = 0;

	crypto_digest_final(tfm, result);

	

	

	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).

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

BUGS





Send bug reports to:

Send bug reports to:

James Morris <jmorris@redhat.com>

Herbert Xu <herbert@gondor.apana.org.au>

Cc: David S. Miller <davem@redhat.com>

Cc: David S. Miller <davem@redhat.com>
@@ -134,13 +138,14 @@ FURTHER INFORMATION 




For further patches and various updates, including the current TODO

For further patches and various updates, including the current TODO

list, see:

list, see:

http://samba.org/~jamesm/crypto/

http://gondor.apana.org.au/~herbert/crypto/









AUTHORS

AUTHORS





James Morris

James Morris

David S. Miller

David S. Miller

Herbert Xu









CREDITS

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

Tiger algorithm contributors:

  Aaron Grothe

  Aaron Grothe





VIA PadLock contributors:

  Michal Ludvig



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

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





Please send any credits updates or corrections to:

Please send any credits updates or corrections to:

James Morris <jmorris@redhat.com>

Herbert Xu <herbert@gondor.apana.org.au>

Documentation/netlabel/00-INDEX

0 → 100644
+10 −0
Original line number Original line Diff line number Diff line 
00-INDEX

	- this file.

cipso_ipv4.txt

	- documentation on the IPv4 CIPSO protocol engine.

draft-ietf-cipso-ipsecurity-01.txt

	- IETF draft of the CIPSO protocol, dated 16 July 1992.

introduction.txt

	- NetLabel introduction, READ THIS FIRST.

lsm_interface.txt

	- documentation on the NetLabel kernel security module API.