[src/trunk]: src/sys/opencrypto make camellia-cbc known to the opencrypto fra...

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

details:   https://anonhg.NetBSD.org/src/rev/4b1c275f0e5a
branches:  trunk
changeset: 764812:4b1c275f0e5a
user:      drochner <drochner%NetBSD.org@localhost>
date:      Thu May 05 17:42:17 2011 +0000

description:
make camellia-cbc known to the opencrypto framework

diffstat:

 sys/opencrypto/cryptodev.h |  3 ++-
 sys/opencrypto/xform.c     |  9 +++++++--
 sys/opencrypto/xform.h     |  3 ++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diffs (64 lines):

diff -r 52fb5bbf75af -r 4b1c275f0e5a sys/opencrypto/cryptodev.h
--- a/sys/opencrypto/cryptodev.h        Thu May 05 17:38:35 2011 +0000
+++ b/sys/opencrypto/cryptodev.h        Thu May 05 17:42:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cryptodev.h,v 1.19 2011/02/25 20:13:10 drochner Exp $ */
+/*     $NetBSD: cryptodev.h,v 1.20 2011/05/05 17:42:17 drochner Exp $ */
 /*     $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.6 2003/07/02 17:04:50 sam Exp $        */
 /*     $OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $      */
 
@@ -137,6 +137,7 @@
 #define CRYPTO_DEFLATE_COMP_NOGROW 23 /* Deflate, fail if not compressible */
 #define CRYPTO_SHA2_384_HMAC   24
 #define CRYPTO_SHA2_512_HMAC   25
+#define CRYPTO_CAMELLIA_CBC    26
 #define CRYPTO_ALGORITHM_MAX   26 /* Keep updated - see below */
 
 /* Algorithm flags */
diff -r 52fb5bbf75af -r 4b1c275f0e5a sys/opencrypto/xform.c
--- a/sys/opencrypto/xform.c    Thu May 05 17:38:35 2011 +0000
+++ b/sys/opencrypto/xform.c    Thu May 05 17:42:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform.c,v 1.21 2011/03/09 11:43:36 drochner Exp $ */
+/*     $NetBSD: xform.c,v 1.22 2011/05/05 17:42:17 drochner Exp $ */
 /*     $FreeBSD: src/sys/opencrypto/xform.c,v 1.1.2.1 2002/11/21 23:34:23 sam Exp $    */
 /*     $OpenBSD: xform.c,v 1.19 2002/08/16 22:47:25 dhartmei Exp $     */
 
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform.c,v 1.21 2011/03/09 11:43:36 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform.c,v 1.22 2011/05/05 17:42:17 drochner Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -130,6 +130,11 @@
        1, 1, 32
 };
 
+const struct enc_xform enc_xform_camellia = {
+       CRYPTO_CAMELLIA_CBC, "Camellia",
+       16, 8, 32
+};
+
 /* Authentication instances */
 const struct auth_hash auth_hash_null = {
        CRYPTO_NULL_HMAC, "NULL-HMAC",
diff -r 52fb5bbf75af -r 4b1c275f0e5a sys/opencrypto/xform.h
--- a/sys/opencrypto/xform.h    Thu May 05 17:38:35 2011 +0000
+++ b/sys/opencrypto/xform.h    Thu May 05 17:42:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform.h,v 1.13 2011/03/09 11:43:36 drochner Exp $ */
+/*     $NetBSD: xform.h,v 1.14 2011/05/05 17:42:17 drochner Exp $ */
 /*     $FreeBSD: src/sys/opencrypto/xform.h,v 1.1.2.1 2002/11/21 23:34:23 sam Exp $    */
 /*     $OpenBSD: xform.h,v 1.10 2002/04/22 23:10:09 deraadt Exp $      */
 
@@ -69,6 +69,7 @@
 extern const struct enc_xform enc_xform_skipjack;
 extern const struct enc_xform enc_xform_rijndael128;
 extern const struct enc_xform enc_xform_arc4;
+extern const struct enc_xform enc_xform_camellia;
 
 extern const struct auth_hash auth_hash_null;
 extern const struct auth_hash auth_hash_md5;