[src/trunk]: src/sys/netkey remove #ifdef notdef part. sync with kame.

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

details:   https://anonhg.NetBSD.org/src/rev/d027a3ca82ae
branches:  trunk
changeset: 495319:d027a3ca82ae
user:      itojun <itojun%NetBSD.org@localhost>
date:      Wed Jul 26 07:40:52 2000 +0000

description:
remove #ifdef notdef part.  sync with kame.

diffstat:

 sys/netkey/key.c   |  56 +----------------------------------------------------
 sys/netkey/keydb.h |   9 +------
 2 files changed, 4 insertions(+), 61 deletions(-)

diffs (114 lines):

diff -r 202a7f7416b3 -r d027a3ca82ae sys/netkey/key.c
--- a/sys/netkey/key.c  Wed Jul 26 07:28:56 2000 +0000
+++ b/sys/netkey/key.c  Wed Jul 26 07:40:52 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: key.c,v 1.28 2000/07/23 05:23:05 itojun Exp $  */
-/*     $KAME: key.c,v 1.143 2000/07/20 17:41:01 itojun Exp $   */
+/*     $NetBSD: key.c,v 1.29 2000/07/26 07:40:52 itojun Exp $  */
+/*     $KAME: key.c,v 1.144 2000/07/25 20:16:54 sakane Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -2493,14 +2493,6 @@
                KFREE(sav->lft_s);
        if (sav->iv != NULL)
                KFREE(sav->iv);
-#if notyet
-       if (sav->misc1 != NULL)
-               KFREE(sav->misc1);
-       if (sav->misc2 != NULL)
-               KFREE(sav->misc2);
-       if (sav->misc3 != NULL)
-               KFREE(sav->misc3);
-#endif
 
        KFREE(sav);
 
@@ -2638,11 +2630,6 @@
        sav->lft_c = NULL;
        sav->lft_h = NULL;
        sav->lft_s = NULL;
-#if notyet
-       sav->misc1 = NULL;
-       sav->misc2 = NULL;
-       sav->misc3 = NULL;
-#endif
 
        /* SA */
        if (mhp->ext[SADB_EXT_SA] != NULL) {
@@ -2860,37 +2847,6 @@
        }
     }
 
-#if notyet
-       /* pre-processing for DES */
-       switch (sav->alg_enc) {
-       case SADB_EALG_DESCBC:
-               if (des_key_sched((C_Block *)_KEYBUF(sav->key_enc),
-                                 (des_key_schedule)sav->misc1) != 0) {
-#ifdef IPSEC_DEBUG
-                       printf("key_setsaval: error des_key_sched.\n");
-#endif
-                       sav->misc1 = NULL;
-                       /* THROUGH */
-               }
-               break;
-       case SADB_EALG_3DESCBC:
-               if (des_key_sched((C_Block *)_KEYBUF(sav->key_enc),
-                                 (des_key_schedule)sav->misc1) != 0
-                || des_key_sched((C_Block *)(_KEYBUF(sav->key_enc) + 8),
-                                 (des_key_schedule)sav->misc2) != 0
-                || des_key_sched((C_Block *)(_KEYBUF(sav->key_enc) + 16),
-                                 (des_key_schedule)sav->misc3) != 0) {
-#ifdef IPSEC_DEBUG
-                       printf("key_setsaval: error des_key_sched.\n");
-#endif
-                       sav->misc1 = NULL;
-                       sav->misc2 = NULL;
-                       sav->misc3 = NULL;
-                       /* THROUGH */
-               }
-       }
-#endif
-
        return 0;
 
  fail:
@@ -2911,14 +2867,6 @@
                KFREE(sav->lft_h);
        if (sav->lft_s != NULL)
                KFREE(sav->lft_s);
-#if notyet
-       if (sav->misc1 != NULL)
-               KFREE(sav->misc1);
-       if (sav->misc2 != NULL)
-               KFREE(sav->misc2);
-       if (sav->misc3 != NULL)
-               KFREE(sav->misc3);
-#endif
 
        return error;
 }
diff -r 202a7f7416b3 -r d027a3ca82ae sys/netkey/keydb.h
--- a/sys/netkey/keydb.h        Wed Jul 26 07:28:56 2000 +0000
+++ b/sys/netkey/keydb.h        Wed Jul 26 07:40:52 2000 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: keydb.h,v 1.7 2000/07/23 05:23:05 itojun Exp $ */
-/*     $KAME: keydb.h,v 1.12 2000/07/20 17:41:02 itojun Exp $  */
+/*     $NetBSD: keydb.h,v 1.8 2000/07/26 07:40:54 itojun Exp $ */
+/*     $KAME: keydb.h,v 1.13 2000/07/25 20:16:54 sakane Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -82,11 +82,6 @@
        struct sadb_key *key_enc;       /* Key for Encryption */
        caddr_t iv;                     /* Initilization Vector */
        u_int ivlen;                    /* length of IV */
-#if 0
-       caddr_t misc1;
-       caddr_t misc2;
-       caddr_t misc3;
-#endif
        void *sched;                    /* intermediate encryption key */
        size_t schedlen;