[src/trunk]: src/sys/netinet6 add algorithm name into algorithm table. (comm...

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

details:   https://anonhg.NetBSD.org/src/rev/3d97e774f4ec
branches:  trunk
changeset: 487876:3d97e774f4ec
user:      itojun <itojun%NetBSD.org@localhost>
date:      Wed Jun 14 11:27:35 2000 +0000

description:
add algorithm name into algorithm table.  (commit to crypto-intl will follow)

diffstat:

 sys/netinet6/ah.h      |   5 +++--
 sys/netinet6/ah_core.c |  14 +++++++-------
 sys/netinet6/esp.h     |   8 +++++---
 3 files changed, 15 insertions(+), 12 deletions(-)

diffs (84 lines):

diff -r 940a1dca0ab4 -r 3d97e774f4ec sys/netinet6/ah.h
--- a/sys/netinet6/ah.h Wed Jun 14 11:15:58 2000 +0000
+++ b/sys/netinet6/ah.h Wed Jun 14 11:27:35 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ah.h,v 1.9 2000/06/02 18:20:15 itojun Exp $    */
-/*     $KAME: ah.h,v 1.8 2000/05/29 08:05:02 itojun Exp $      */
+/*     $NetBSD: ah.h,v 1.10 2000/06/14 11:27:35 itojun Exp $   */
+/*     $KAME: ah.h,v 1.9 2000/06/14 11:14:03 itojun Exp $      */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -70,6 +70,7 @@
        int (*mature) __P((struct secasvar *));
        int keymin;     /* in bits */
        int keymax;     /* in bits */
+       const char *name;
        int (*init) __P((struct ah_algorithm_state *, struct secasvar *));
        void (*update) __P((struct ah_algorithm_state *, caddr_t, size_t));
        void (*result) __P((struct ah_algorithm_state *, caddr_t));
diff -r 940a1dca0ab4 -r 3d97e774f4ec sys/netinet6/ah_core.c
--- a/sys/netinet6/ah_core.c    Wed Jun 14 11:15:58 2000 +0000
+++ b/sys/netinet6/ah_core.c    Wed Jun 14 11:27:35 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ah_core.c,v 1.18 2000/06/02 18:20:15 itojun Exp $      */
-/*     $KAME: ah_core.c,v 1.34 2000/05/29 08:05:02 itojun Exp $        */
+/*     $NetBSD: ah_core.c,v 1.19 2000/06/14 11:27:35 itojun Exp $      */
+/*     $KAME: ah_core.c,v 1.35 2000/06/14 11:14:03 itojun Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -132,15 +132,15 @@
 /* NOTE: The order depends on SADB_AALG_x in net/pfkeyv2.h */
 struct ah_algorithm ah_algorithms[] = {
        { 0, 0, 0, 0, 0, 0, },
-       { ah_sumsiz_1216, ah_hmac_md5_mature, 128, 128,
+       { ah_sumsiz_1216, ah_hmac_md5_mature, 128, 128, "hmac-md5",
                ah_hmac_md5_init, ah_hmac_md5_loop, ah_hmac_md5_result, },
-       { ah_sumsiz_1216, ah_hmac_sha1_mature, 160, 160,
+       { ah_sumsiz_1216, ah_hmac_sha1_mature, 160, 160, "hmac-sha1",
                ah_hmac_sha1_init, ah_hmac_sha1_loop, ah_hmac_sha1_result, },
-       { ah_sumsiz_1216, ah_keyed_md5_mature, 128, 128,
+       { ah_sumsiz_1216, ah_keyed_md5_mature, 128, 128, "keyed-md5",
                ah_keyed_md5_init, ah_keyed_md5_loop, ah_keyed_md5_result, },
-       { ah_sumsiz_1216, ah_keyed_sha1_mature, 160, 160,
+       { ah_sumsiz_1216, ah_keyed_sha1_mature, 160, 160, "keyed-sha1",
                ah_keyed_sha1_init, ah_keyed_sha1_loop, ah_keyed_sha1_result, },
-       { ah_sumsiz_zero, ah_none_mature, 0, 2048,
+       { ah_sumsiz_zero, ah_none_mature, 0, 2048, "none",
                ah_none_init, ah_none_loop, ah_none_result, },
 };
 
diff -r 940a1dca0ab4 -r 3d97e774f4ec sys/netinet6/esp.h
--- a/sys/netinet6/esp.h        Wed Jun 14 11:15:58 2000 +0000
+++ b/sys/netinet6/esp.h        Wed Jun 14 11:27:35 2000 +0000
@@ -1,9 +1,10 @@
-/*     $NetBSD: esp.h,v 1.7 2000/01/31 14:19:02 itojun Exp $   */
+/*     $NetBSD: esp.h,v 1.8 2000/06/14 11:27:36 itojun Exp $   */
+/*     $KAME: esp.h,v 1.7 2000/06/14 10:41:17 itojun Exp $     */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -15,7 +16,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -81,6 +82,7 @@
        int (*mature) __P((struct secasvar *));
        int keymin;     /* in bits */
        int keymax;     /* in bits */
+       const char *name;
        int (*ivlen) __P((struct secasvar *));
        int (*decrypt) __P((struct mbuf *, size_t,
                struct secasvar *, struct esp_algorithm *, int));