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

Commit 23930fa1 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream

parents 36b35a5b 4f5537de

CREDITS

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

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

E: jmorris@namei.org

W: http://namei.org/

Documentation/00-INDEX

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

nbd.txt

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

netlabel/

	- directory with information on the NetLabel subsystem.

networking/

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

nfsroot.txt

Documentation/crypto/api-intro.txt

+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>

Documentation/kernel-parameters.txt

+0 −2
Original line number Diff line number Diff line
@@ -1189,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.

Documentation/netlabel/00-INDEX

0 → 100644
+10 −0
Original line number 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.