---

yaml
---
r: 34970
b: refs/heads/master
c: 892e4fb
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7425b160db500520c33f241edb066fc5c413f03
+refs/heads/master: 892e4fba1cb5cdc70f3acc65e024e541c0b2d559

trunk/CREDITS

@@ -2384,13 +2384,6 @@ 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/

trunk/Documentation/00-INDEX

@@ -184,8 +184,6 @@ 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

trunk/Documentation/crypto/api-intro.txt

@@ -19,14 +19,15 @@ 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) and provide an 
-abstraction to the underlying algorithms.  However, at the user 
+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 
 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, compress.c)
+  [transform ops]  (per-type logic glue e.g. cipher.c, digest.c)
   [algorithm api]  (for registering algorithms)
 
 The idea is to make the user interface and algorithm registration API
@@ -43,27 +44,22 @@ 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_hash *tfm;
-	struct hash_desc desc;
+	struct crypto_tfm *tfm;
 
-	tfm = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC);
-	if (IS_ERR(tfm))
+	tfm = crypto_alloc_tfm("md5", 0);
+	if (tfm == NULL)
 		fail();
 
 	/* ... set up the scatterlists ... */
-
-	desc.tfm = tfm;
-	desc.flags = 0;
 
-	if (crypto_hash_digest(&desc, &sg, 2, result))
-		fail();
+	crypto_digest_init(tfm);
+	crypto_digest_update(tfm, &sg, 2);
+	crypto_digest_final(tfm, result);
 
-	crypto_free_hash(tfm);
+	crypto_free_tfm(tfm);
 
 
 Many real examples are available in the regression test module (tcrypt.c).
@@ -130,22 +126,21 @@ might already be working on.
 BUGS
 
 Send bug reports to:
-Herbert Xu <herbert@gondor.apana.org.au>
+James Morris <jmorris@redhat.com>
 Cc: David S. Miller <davem@redhat.com>
 
 
 FURTHER INFORMATION
 
 For further patches and various updates, including the current TODO
 list, see:
-http://gondor.apana.org.au/~herbert/crypto/
+http://samba.org/~jamesm/crypto/
 
 
 AUTHORS
 
 James Morris
 David S. Miller
-Herbert Xu
 
 
 CREDITS
@@ -243,11 +238,8 @@ 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:
-Herbert Xu <herbert@gondor.apana.org.au>
+James Morris <jmorris@redhat.com>