Module Name: src
Committed By: maxv
Date: Sat May 19 19:23:15 UTC 2018
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: admin.c grabmyaddr.c
ipsec_doi.c isakmp.c isakmp_agg.c isakmp_base.c isakmp_ident.c
isakmp_inf.c main.c oakley.c privsep.c remoteconf.c session.c
vendorid.c
Log Message:
Remove unused variables.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/crypto/dist/ipsec-tools/src/racoon/admin.c
cvs rdiff -u -r1.35 -r1.36 \
src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
cvs rdiff -u -r1.49 -r1.50 src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c
cvs rdiff -u -r1.76 -r1.77 src/crypto/dist/ipsec-tools/src/racoon/isakmp.c
cvs rdiff -u -r1.16 -r1.17 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_base.c
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c
cvs rdiff -u -r1.51 -r1.52 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c
cvs rdiff -u -r1.14 -r1.15 src/crypto/dist/ipsec-tools/src/racoon/main.c
cvs rdiff -u -r1.24 -r1.25 src/crypto/dist/ipsec-tools/src/racoon/oakley.c
cvs rdiff -u -r1.23 -r1.24 src/crypto/dist/ipsec-tools/src/racoon/privsep.c
cvs rdiff -u -r1.28 -r1.29 \
src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c
cvs rdiff -u -r1.32 -r1.33 src/crypto/dist/ipsec-tools/src/racoon/session.c
cvs rdiff -u -r1.8 -r1.9 src/crypto/dist/ipsec-tools/src/racoon/vendorid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/admin.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/admin.c:1.39 src/crypto/dist/ipsec-tools/src/racoon/admin.c:1.40
--- src/crypto/dist/ipsec-tools/src/racoon/admin.c:1.39 Mon Jun 3 05:49:31 2013
+++ src/crypto/dist/ipsec-tools/src/racoon/admin.c Sat May 19 19:23:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: admin.c,v 1.39 2013/06/03 05:49:31 tteras Exp $ */
+/* $NetBSD: admin.c,v 1.40 2018/05/19 19:23:15 maxv Exp $ */
/* Id: admin.c,v 1.25 2006/04/06 14:31:04 manubsd Exp */
@@ -327,7 +327,6 @@ admin_process(so2, combuf)
#ifdef ENABLE_HYBRID
case ADMIN_LOGOUT_USER: {
- struct ph1handle *iph1;
char user[LOGINLEN+1];
int found = 0, len = com->ac_len - sizeof(*com);
@@ -427,7 +426,6 @@ admin_process(so2, combuf)
case ADMIN_PROTO_ISAKMP: {
struct ph1handle *ph1;
struct remoteconf *rmconf;
- u_int16_t port;
l_ac_errno = -1;
Index: src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.35 src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.36
--- src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.35 Wed Apr 12 16:47:39 2017
+++ src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c Sat May 19 19:23:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: grabmyaddr.c,v 1.35 2017/04/12 16:47:39 roy Exp $ */
+/* $NetBSD: grabmyaddr.c,v 1.36 2018/05/19 19:23:15 maxv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (C) 2008 Timo Teras <[email protected]>.
@@ -140,7 +140,7 @@ myaddr_open_all_configured(addr)
struct sockaddr *addr;
{
/* create all configured, not already opened addresses */
- struct myaddr *cfg, *my;
+ struct myaddr *cfg;
if (addr != NULL) {
switch (addr->sa_family) {
@@ -859,7 +859,6 @@ kernel_sync()
caddr_t ref, buf, end;
size_t bufsiz;
struct if_msghdr *ifm;
- struct interface *ifp;
#define MIBSIZ 6
int mib[MIBSIZ] = {
Index: src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c:1.49 src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c:1.50
--- src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c:1.49 Tue Jun 18 05:39:50 2013
+++ src/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c Sat May 19 19:23:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_doi.c,v 1.49 2013/06/18 05:39:50 tteras Exp $ */
+/* $NetBSD: ipsec_doi.c,v 1.50 2018/05/19 19:23:15 maxv Exp $ */
/* Id: ipsec_doi.c,v 1.55 2006/08/17 09:20:41 vanhu Exp */
@@ -264,8 +264,6 @@ get_ph1approval(iph1, doitype, sittype,
for (s = pair[i]; s; s = s->next) {
/* compare proposal and select one */
for (p = s; p; p = p->tnext) {
- struct isakmp_pl_p *prop = p->prop;
-
sa = newisakmpsa();
ctx.p = p;
ctx.sa = sa;
@@ -3894,7 +3892,7 @@ set_identifier_qual(vpp, type, value, qu
if (loglevel >= LLV_DEBUG) {
X509_NAME *xn;
BIO *bio;
- unsigned char *ptr = (unsigned char *) new->v, *buf;
+ unsigned char *ptr = (unsigned char *) new->v;
size_t len;
char save;
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp.c:1.76 src/crypto/dist/ipsec-tools/src/racoon/isakmp.c:1.77
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp.c:1.76 Tue Jan 24 19:23:56 2017
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp.c Sat May 19 19:23:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp.c,v 1.76 2017/01/24 19:23:56 christos Exp $ */
+/* $NetBSD: isakmp.c,v 1.77 2018/05/19 19:23:15 maxv Exp $ */
/* Id: isakmp.c,v 1.74 2006/05/07 21:32:59 manubsd Exp */
@@ -1581,7 +1581,7 @@ int
isakmp_open(struct sockaddr *addr, int udp_encap)
{
const int yes = 1;
- int ifnum = 0, encap_ifnum = 0, fd;
+ int fd;
struct sockaddr_in *sin = (struct sockaddr_in *) addr;
#ifdef INET6
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) addr;
@@ -1963,7 +1963,6 @@ isakmp_ph1dying(iph1)
{
struct ph1handle *new_iph1;
struct ph2handle *p;
- struct remoteconf *rmconf;
if (iph1->status >= PHASE1ST_DYING)
return;
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c:1.16 src/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c:1.17
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c:1.16 Fri Sep 18 10:31:11 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c Sat May 19 19:23:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_agg.c,v 1.16 2009/09/18 10:31:11 tteras Exp $ */
+/* $NetBSD: isakmp_agg.c,v 1.17 2018/05/19 19:23:15 maxv Exp $ */
/* Id: isakmp_agg.c,v 1.28 2006/04/06 16:46:08 manubsd Exp */
@@ -329,10 +329,6 @@ agg_i2recv(iph1, msg)
vchar_t *satmp = NULL;
int error = -1;
int ptype;
-#ifdef ENABLE_HYBRID
- vchar_t *unity_vid;
- vchar_t *xauth_vid;
-#endif
#ifdef HAVE_GSSAPI
vchar_t *gsstoken = NULL;
#endif
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_base.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_base.c:1.12 src/crypto/dist/ipsec-tools/src/racoon/isakmp_base.c:1.13
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_base.c:1.12 Thu Mar 12 10:57:26 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_base.c Sat May 19 19:23:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_base.c,v 1.12 2009/03/12 10:57:26 tteras Exp $ */
+/* $NetBSD: isakmp_base.c,v 1.13 2018/05/19 19:23:15 maxv Exp $ */
/* $KAME: isakmp_base.c,v 1.49 2003/11/13 02:30:20 sakane Exp $ */
@@ -297,10 +297,6 @@ base_i2recv(iph1, msg)
struct isakmp_parse_t *pa;
vchar_t *satmp = NULL;
int error = -1;
-#ifdef ENABLE_HYBRID
- vchar_t *unity_vid;
- vchar_t *xauth_vid;
-#endif
/* validity check */
if (iph1->status != PHASE1ST_MSG1SENT) {
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c:1.15 src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c:1.16
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c:1.15 Wed Mar 16 21:09:39 2016
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c Sat May 19 19:23:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_ident.c,v 1.15 2016/03/16 21:09:39 christos Exp $ */
+/* $NetBSD: isakmp_ident.c,v 1.16 2018/05/19 19:23:15 maxv Exp $ */
/* Id: isakmp_ident.c,v 1.21 2006/04/06 16:46:08 manubsd Exp */
@@ -1746,7 +1746,6 @@ ident_ir3mx(iph1)
int need_cert = 0;
int error = -1;
#ifdef HAVE_GSSAPI
- int nptype;
vchar_t *gsstoken = NULL;
vchar_t *gsshash = NULL;
#endif
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c:1.51 src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c:1.52
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c:1.51 Tue Jan 24 19:23:56 2017
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c Sat May 19 19:23:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_inf.c,v 1.51 2017/01/24 19:23:56 christos Exp $ */
+/* $NetBSD: isakmp_inf.c,v 1.52 2018/05/19 19:23:15 maxv Exp $ */
/* Id: isakmp_inf.c,v 1.44 2006/05/06 20:45:52 manubsd Exp */
@@ -129,7 +129,7 @@ isakmp_info_recv(iph1, msg0)
int error = -1;
struct isakmp *isakmp;
struct isakmp_gen *gen;
- struct isakmp_parse_t *pa, *pap;
+ struct isakmp_parse_t *pa;
void *p;
vchar_t *hash, *payload;
struct isakmp_gen *nd;
@@ -453,10 +453,7 @@ isakmp_info_recv_d(iph1, delete, msgid,
int encrypted;
{
int tlen, num_spi;
- vchar_t *pbuf;
- int protected = 0;
struct ph1handle *del_ph1;
- struct ph2handle *iph2;
union {
u_int32_t spi32;
u_int16_t spi16[2];
Index: src/crypto/dist/ipsec-tools/src/racoon/main.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/main.c:1.14 src/crypto/dist/ipsec-tools/src/racoon/main.c:1.15
--- src/crypto/dist/ipsec-tools/src/racoon/main.c:1.14 Sat May 19 18:51:59 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/main.c Sat May 19 19:23:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.14 2018/05/19 18:51:59 maxv Exp $ */
+/* $NetBSD: main.c,v 1.15 2018/05/19 19:23:15 maxv Exp $ */
/* Id: main.c,v 1.25 2006/06/20 20:31:34 manubsd Exp */
@@ -90,7 +90,7 @@ static char version[] = "@(#) racoon / I
#endif
static void
-print_version()
+print_version(void)
{
printf("%s\n"
"\n"
@@ -133,7 +133,7 @@ print_version()
}
static void
-usage()
+usage(void)
{
printf("usage: racoon [-BdFv"
#ifdef INET6
@@ -264,8 +264,6 @@ parse(int ac, char **av)
int
main(int ac, char **av)
{
- int error;
-
initlcconf();
parse(ac, av);
Index: src/crypto/dist/ipsec-tools/src/racoon/oakley.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/oakley.c:1.24 src/crypto/dist/ipsec-tools/src/racoon/oakley.c:1.25
--- src/crypto/dist/ipsec-tools/src/racoon/oakley.c:1.24 Wed Aug 29 11:34:37 2012
+++ src/crypto/dist/ipsec-tools/src/racoon/oakley.c Sat May 19 19:23:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: oakley.c,v 1.24 2012/08/29 11:34:37 tteras Exp $ */
+/* $NetBSD: oakley.c,v 1.25 2018/05/19 19:23:15 maxv Exp $ */
/* Id: oakley.c,v 1.32 2006/05/26 12:19:46 manubsd Exp */
@@ -1674,9 +1674,6 @@ get_plainrsa_fromlocal(iph1, my)
struct ph1handle *iph1;
int my;
{
- char path[MAXPATHLEN];
- vchar_t *cert = NULL;
- char *certfile;
int error = -1;
iph1->rsa_candidates = rsa_lookup_keys(iph1, my);
@@ -2091,8 +2088,6 @@ oakley_savecert(iph1, gen)
}
for (i = 0; i < sk_X509_num(certs); i++) {
- int len;
- u_char *bp;
X509 *cert = sk_X509_value(certs,i);
plog(LLV_DEBUG, LOCATION, NULL,
Index: src/crypto/dist/ipsec-tools/src/racoon/privsep.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/privsep.c:1.23 src/crypto/dist/ipsec-tools/src/racoon/privsep.c:1.24
--- src/crypto/dist/ipsec-tools/src/racoon/privsep.c:1.23 Fri Mar 11 18:28:43 2016
+++ src/crypto/dist/ipsec-tools/src/racoon/privsep.c Sat May 19 19:23:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: privsep.c,v 1.23 2016/03/11 18:28:43 christos Exp $ */
+/* $NetBSD: privsep.c,v 1.24 2018/05/19 19:23:15 maxv Exp $ */
/* Id: privsep.c,v 1.15 2005/08/08 11:23:44 vanhu Exp */
@@ -332,7 +332,6 @@ privsep_init(void)
struct privsep_com_msg *combuf;
struct privsep_com_msg *reply;
char *data;
- size_t *buflen;
size_t totallen;
char *bufs[PRIVSEP_NBUF_MAX];
int i;
@@ -698,7 +697,6 @@ privsep_init(void)
#ifdef ENABLE_HYBRID
case PRIVSEP_ACCOUNTING_SYSTEM: {
- int pool_size;
int port;
int inout;
struct sockaddr *raddr;
@@ -1059,7 +1057,6 @@ privsep_getpsk(str, keylen)
vchar_t *psk;
struct privsep_com_msg *msg;
size_t len;
- int *keylenp;
char *data;
if (geteuid() == 0)
@@ -1121,7 +1118,7 @@ privsep_socket(domain, type, protocol)
size_t len;
char *data;
struct socket_args socket_args;
- int s, saved_errno = 0;
+ int s;
if (geteuid() == 0)
return socket(domain, type, protocol);
@@ -1381,7 +1378,6 @@ privsep_accounting_system(port, raddr, u
struct privsep_com_msg *msg;
size_t len;
char *data;
- int result;
if (geteuid() == 0)
return isakmp_cfg_accounting_system(port, raddr,
@@ -1637,7 +1633,6 @@ privsep_accounting_pam(port, inout)
int *port_data;
int *inout_data;
int *pool_size_data;
- int result;
if (geteuid() == 0)
return isakmp_cfg_accounting_pam(port, inout);
@@ -1697,7 +1692,6 @@ privsep_xauth_login_pam(port, raddr, usr
struct privsep_com_msg *msg;
size_t len;
char *data;
- int result;
if (geteuid() == 0)
return xauth_login_pam(port, raddr, usr, pwd);
@@ -1765,7 +1759,6 @@ privsep_cleanup_pam(port)
struct privsep_com_msg *msg;
size_t len;
char *data;
- int result;
if (geteuid() == 0)
return cleanup_pam(port);
Index: src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c:1.28 src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c:1.29
--- src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c:1.28 Sun Jan 1 15:57:31 2012
+++ src/crypto/dist/ipsec-tools/src/racoon/remoteconf.c Sat May 19 19:23:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: remoteconf.c,v 1.28 2012/01/01 15:57:31 tteras Exp $ */
+/* $NetBSD: remoteconf.c,v 1.29 2018/05/19 19:23:15 maxv Exp $ */
/* Id: remoteconf.c,v 1.38 2006/05/06 15:52:44 manubsd Exp */
@@ -168,8 +168,6 @@ rmconf_match_etype_and_approval(rmconf,
int etype;
struct isakmpsa *approval;
{
- struct isakmpsa *p;
-
if (check_etypeok(rmconf, (void *) (intptr_t) etype) == 0)
return ISAKMP_NTYPE_NO_PROPOSAL_CHOSEN;
@@ -392,7 +390,6 @@ getrmconf(remote, flags)
int flags;
{
struct rmconf_find_context ctx;
- int n = 0;
memset(&ctx, 0, sizeof(ctx));
ctx.sel.flags = flags;
@@ -592,7 +589,6 @@ duprmconf_shallow (rmconf)
struct remoteconf *rmconf;
{
struct remoteconf *new;
- struct proposalspec *prspec;
new = racoon_calloc(1, sizeof(*new));
if (new == NULL)
@@ -1109,10 +1105,7 @@ script_path_add(path)
{
char *script_dir;
vchar_t *new_path;
- vchar_t *new_storage;
- vchar_t **sp;
size_t len;
- size_t size;
script_dir = lcconf->pathinfo[LC_PATHTYPE_SCRIPT];
Index: src/crypto/dist/ipsec-tools/src/racoon/session.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/session.c:1.32 src/crypto/dist/ipsec-tools/src/racoon/session.c:1.33
--- src/crypto/dist/ipsec-tools/src/racoon/session.c:1.32 Wed Mar 2 15:09:16 2011
+++ src/crypto/dist/ipsec-tools/src/racoon/session.c Sat May 19 19:23:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: session.c,v 1.32 2011/03/02 15:09:16 vanhu Exp $ */
+/* $NetBSD: session.c,v 1.33 2018/05/19 19:23:15 maxv Exp $ */
/* $KAME: session.c,v 1.32 2003/09/24 02:01:17 jinmei Exp $ */
@@ -124,7 +124,6 @@ static TAILQ_HEAD(fd_monitor_list, fd_mo
static int nfds = 0;
static volatile sig_atomic_t sigreq[NSIG + 1];
-static struct sched scflushsa = SCHED_INITIALIZER();
void
monitor_fd(int fd, int (*callback)(void *, int), void *ctx, int priority)
Index: src/crypto/dist/ipsec-tools/src/racoon/vendorid.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/vendorid.c:1.8 src/crypto/dist/ipsec-tools/src/racoon/vendorid.c:1.9
--- src/crypto/dist/ipsec-tools/src/racoon/vendorid.c:1.8 Tue Sep 1 12:22:09 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/vendorid.c Sat May 19 19:23:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vendorid.c,v 1.8 2009/09/01 12:22:09 tteras Exp $ */
+/* $NetBSD: vendorid.c,v 1.9 2018/05/19 19:23:15 maxv Exp $ */
/* Id: vendorid.c,v 1.10 2006/02/22 16:10:21 vanhu Exp */
@@ -133,7 +133,6 @@ static struct vendor_id *
lookup_vendor_id_by_hash (const char *hash)
{
int i;
- unsigned char *h = (unsigned char *)hash;
for (i = 0; i < NUMVENDORIDS; i++)
if (strncmp(all_vendor_ids[i].hash->v, hash,
@@ -186,7 +185,6 @@ vchar_t *
set_vendorid(int vendorid)
{
struct vendor_id *current;
- vchar_t vid, *new;
if (vendorid == VENDORID_UNKNOWN) {
/*
@@ -218,8 +216,7 @@ set_vendorid(int vendorid)
static int
check_vendorid(struct isakmp_gen *gen)
{
- vchar_t vid, *vidhash;
- int i, vidlen;
+ int vidlen;
struct vendor_id *current;
if (gen == NULL)
