Module Name: src
Committed By: bouyer
Date: Sun Feb 14 13:36:57 UTC 2010
Modified Files:
src/sys/opencrypto [netbsd-5]: cryptodev.c
Log Message:
Pull up following revision(s) (requested by hubertf in ticket #1291):
sys/opencrypto/cryptodev.c: revision 1.52
Add missing "break" for CRYPTO_CAST_CBC, and some assorted comment fixes.
openssl(1) checks for CAST (and others) on ~every startup.
To generate a diff of this commit:
cvs rdiff -u -r1.44.8.3 -r1.44.8.4 src/sys/opencrypto/cryptodev.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.44.8.3 src/sys/opencrypto/cryptodev.c:1.44.8.4
--- src/sys/opencrypto/cryptodev.c:1.44.8.3 Sun May 3 17:24:45 2009
+++ src/sys/opencrypto/cryptodev.c Sun Feb 14 13:36:57 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.44.8.3 2009/05/03 17:24:45 snj Exp $ */
+/* $NetBSD: cryptodev.c,v 1.44.8.4 2010/02/14 13:36:57 bouyer 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.44.8.3 2009/05/03 17:24:45 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.44.8.4 2010/02/14 13:36:57 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -572,7 +572,6 @@
* XXX disabled on NetBSD since 1.6O due to a race condition.
* XXX But crypto_dispatch went to splcrypto() itself! (And
* XXX now takes the crypto_mtx mutex itself). We do, however,
- *
* XXX need to hold the mutex across the call to cv_wait().
* XXX (should we arrange for crypto_dispatch to return to
* XXX us with it held? it seems quite ugly to do so.)
@@ -586,7 +585,7 @@
/*
* If the request was going to be completed by the
* ioctl thread then it would have been done by now.
- * Remove the F_USER flag it so crypto_done() is not confused
+ * Remove the F_USER flag so crypto_done() is not confused
* if the crypto device calls it after this point.
*/
crp->crp_flags &= ~(CRYPTO_F_USER);
@@ -1470,6 +1469,7 @@
break;
case CRYPTO_CAST_CBC:
txform = &enc_xform_cast5;
+ break;
case CRYPTO_SKIPJACK_CBC:
txform = &enc_xform_skipjack;
break;
