CVS commit: src/sys/netipsec

[Matthias Drochner]

Module Name:    src
Committed By:   drochner
Date:           Wed Aug 29 20:37:51 UTC 2012

Modified Files:
        src/sys/netipsec: key.c keydb.h

Log Message:
g/c unused struct member


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/netipsec/key.c
cvs rdiff -u -r1.11 -r1.12 src/sys/netipsec/keydb.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.76 src/sys/netipsec/key.c:1.77
--- src/sys/netipsec/key.c:1.76	Mon Jan  9 15:42:08 2012
+++ src/sys/netipsec/key.c	Wed Aug 29 20:37:50 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: key.c,v 1.76 2012/01/09 15:42:08 drochner Exp $	*/
+/*	$NetBSD: key.c,v 1.77 2012/08/29 20:37:50 drochner Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $	*/
 /*	$KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $	*/
 	
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.76 2012/01/09 15:42:08 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.77 2012/08/29 20:37:50 drochner Exp $");
 
 /*
  * This code is referd to RFC 2367
@@ -3052,11 +3052,6 @@ key_delsav(struct secasvar *sav)
 		KFREE(sav->key_enc);
 		sav->key_enc = NULL;
 	}
-	if (sav->sched) {
-		memset(sav->sched, 0, sav->schedlen);
-		KFREE(sav->sched);
-		sav->sched = NULL;
-	}
 	if (sav->replay != NULL) {
 		KFREE(sav->replay);
 		sav->replay = NULL;
@@ -3189,8 +3184,6 @@ key_setsaval(struct secasvar *sav, struc
 	sav->replay = NULL;
 	sav->key_auth = NULL;
 	sav->key_enc = NULL;
-	sav->sched = NULL;
-	sav->schedlen = 0;
 	sav->lft_c = NULL;
 	sav->lft_h = NULL;
 	sav->lft_s = NULL;
@@ -3412,10 +3405,6 @@ key_setsaval(struct secasvar *sav, struc
 		KFREE(sav->key_enc);
 		sav->key_enc = NULL;
 	}
-	if (sav->sched) {
-		KFREE(sav->sched);
-		sav->sched = NULL;
-	}
 	if (sav->lft_c != NULL) {
 		KFREE(sav->lft_c);
 		sav->lft_c = NULL;

Index: src/sys/netipsec/keydb.h
diff -u src/sys/netipsec/keydb.h:1.11 src/sys/netipsec/keydb.h:1.12
--- src/sys/netipsec/keydb.h:1.11	Wed Jan 11 14:37:45 2012
+++ src/sys/netipsec/keydb.h	Wed Aug 29 20:37:51 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: keydb.h,v 1.11 2012/01/11 14:37:45 drochner Exp $	*/
+/*	$NetBSD: keydb.h,v 1.12 2012/08/29 20:37:51 drochner Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/keydb.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $	*/
 /*	$KAME: keydb.h,v 1.14 2000/08/02 17:58:26 sakane Exp $	*/
 
@@ -104,8 +104,6 @@ struct secasvar {
 	struct sadb_key *key_auth;	/* Key for Authentication */
 	struct sadb_key *key_enc;	/* Key for Encryption */
 	u_int ivlen;			/* length of IV */
-	void *sched;			/* intermediate encryption key */
-	size_t schedlen;
 
 	struct secreplay *replay;	/* replay prevention */
 	time_t created;			/* for lifetime */