[src/trunk]: src/sys/opencrypto fix building of a linked list if multiple alg...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f1d84e851ea9
branches:  trunk
changeset: 765432:f1d84e851ea9
user:      drochner <drochner%NetBSD.org@localhost>
date:      Thu May 26 20:33:24 2011 +0000

description:
fix building of a linked list if multiple algorithms are requested
in a session -- this just didn't work

diffstat:

 sys/opencrypto/cryptodev.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (50 lines):

diff -r d51ad5d35583 -r f1d84e851ea9 sys/opencrypto/cryptodev.c
--- a/sys/opencrypto/cryptodev.c        Thu May 26 16:42:15 2011 +0000
+++ b/sys/opencrypto/cryptodev.c        Thu May 26 20:33:24 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cryptodev.c,v 1.64 2011/05/24 19:12:53 drochner Exp $ */
+/*     $NetBSD: cryptodev.c,v 1.65 2011/05/26 20:33:24 drochner Exp $ */
 /*     $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $        */
 /*     $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $   */
 
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.64 2011/05/24 19:12:53 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.65 2011/05/26 20:33:24 drochner Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1620,10 +1620,10 @@
                DPRINTF(("tcomp->type = %d\n", tcomp->type));
 
                crihead = &cric;
-               if (thash) {
+               if (txform) {
+                       cric.cri_next = &crie;
+               } else if (thash) {
                        cric.cri_next = &cria;
-               } else if (txform) {
-                       cric.cri_next = &crie;
                }
        }
 
@@ -1644,6 +1644,8 @@
                if (!crihead) {
                        crihead = &crie;
                }
+               if (thash)
+                       crie.cri_next = &cria;
        } 
 
        if (thash) {
@@ -1663,8 +1665,6 @@
                                goto bail;
                        }
                }
-               if (txform)
-                       cria.cri_next = &crie;  /* XXX forces enc then hash? */
                if (!crihead) {
                        crihead = &cria;
                }