Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

g/c unused struct member

This commit is contained in:
drochner 2012-08-29 20:37:50 +00:00
parent c9ea1856a7
commit a01fe2e22b
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/netipsec/key.c
View File

@ -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, struct mbuf *m,
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, struct mbuf *m,
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;

4
sys/netipsec/keydb.h
View File

@ -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 */