Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/dist/ipsec-tools/src/racoon Remove unused variables.
details: https://anonhg.NetBSD.org/src/rev/696f75aefaaa
branches: trunk
changeset: 322844:696f75aefaaa
user: maxv <maxv%NetBSD.org@localhost>
date: Sat May 19 19:23:15 2018 +0000
description:
Remove unused variables.
diffstat:
crypto/dist/ipsec-tools/src/racoon/admin.c | 4 +---
crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c | 5 ++---
crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c | 6 ++----
crypto/dist/ipsec-tools/src/racoon/isakmp.c | 5 ++---
crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c | 6 +-----
crypto/dist/ipsec-tools/src/racoon/isakmp_base.c | 6 +-----
crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c | 3 +--
crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c | 7 ++-----
crypto/dist/ipsec-tools/src/racoon/main.c | 8 +++-----
crypto/dist/ipsec-tools/src/racoon/oakley.c | 7 +------
crypto/dist/ipsec-tools/src/racoon/privsep.c | 11 ++---------
crypto/dist/ipsec-tools/src/racoon/remoteconf.c | 9 +--------
crypto/dist/ipsec-tools/src/racoon/session.c | 3 +--
crypto/dist/ipsec-tools/src/racoon/vendorid.c | 7 ++-----
14 files changed, 22 insertions(+), 65 deletions(-)
diffs (truncated from 425 to 300 lines):
diff -r 1e16a6c1e8d2 -r 696f75aefaaa crypto/dist/ipsec-tools/src/racoon/admin.c
--- a/crypto/dist/ipsec-tools/src/racoon/admin.c Sat May 19 18:51:59 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/admin.c Sat May 19 19:23:15 2018 +0000
@@ -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 @@
#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 @@
case ADMIN_PROTO_ISAKMP: {
struct ph1handle *ph1;
struct remoteconf *rmconf;
- u_int16_t port;
l_ac_errno = -1;
diff -r 1e16a6c1e8d2 -r 696f75aefaaa crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
--- a/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c Sat May 19 18:51:59 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c Sat May 19 19:23:15 2018 +0000
@@ -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 <timo.teras%iki.fi@localhost>.
@@ -140,7 +140,7 @@
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 @@
caddr_t ref, buf, end;
size_t bufsiz;
struct if_msghdr *ifm;
- struct interface *ifp;
#define MIBSIZ 6
int mib[MIBSIZ] = {
diff -r 1e16a6c1e8d2 -r 696f75aefaaa crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c
--- a/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c Sat May 19 18:51:59 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/ipsec_doi.c Sat May 19 19:23:15 2018 +0000
@@ -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 @@
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 @@
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;
diff -r 1e16a6c1e8d2 -r 696f75aefaaa crypto/dist/ipsec-tools/src/racoon/isakmp.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp.c Sat May 19 18:51:59 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp.c Sat May 19 19:23:15 2018 +0000
@@ -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 @@
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 @@
{
struct ph1handle *new_iph1;
struct ph2handle *p;
- struct remoteconf *rmconf;
if (iph1->status >= PHASE1ST_DYING)
return;
diff -r 1e16a6c1e8d2 -r 696f75aefaaa crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c Sat May 19 18:51:59 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_agg.c Sat May 19 19:23:15 2018 +0000
@@ -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 @@
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
diff -r 1e16a6c1e8d2 -r 696f75aefaaa crypto/dist/ipsec-tools/src/racoon/isakmp_base.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_base.c Sat May 19 18:51:59 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_base.c Sat May 19 19:23:15 2018 +0000
@@ -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 @@
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) {
diff -r 1e16a6c1e8d2 -r 696f75aefaaa crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c Sat May 19 18:51:59 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_ident.c Sat May 19 19:23:15 2018 +0000
@@ -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 @@
int need_cert = 0;
int error = -1;
#ifdef HAVE_GSSAPI
- int nptype;
vchar_t *gsstoken = NULL;
vchar_t *gsshash = NULL;
#endif
diff -r 1e16a6c1e8d2 -r 696f75aefaaa crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c
--- a/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c Sat May 19 18:51:59 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/isakmp_inf.c Sat May 19 19:23:15 2018 +0000
@@ -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 @@
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 @@
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];
diff -r 1e16a6c1e8d2 -r 696f75aefaaa crypto/dist/ipsec-tools/src/racoon/main.c
--- a/crypto/dist/ipsec-tools/src/racoon/main.c Sat May 19 18:51:59 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/main.c Sat May 19 19:23:15 2018 +0000
@@ -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 @@
#endif
static void
-print_version()
+print_version(void)
{
printf("%s\n"
"\n"
@@ -133,7 +133,7 @@
}
static void
-usage()
+usage(void)
{
printf("usage: racoon [-BdFv"
#ifdef INET6
@@ -264,8 +264,6 @@
int
main(int ac, char **av)
{
- int error;
-
initlcconf();
parse(ac, av);
diff -r 1e16a6c1e8d2 -r 696f75aefaaa crypto/dist/ipsec-tools/src/racoon/oakley.c
--- a/crypto/dist/ipsec-tools/src/racoon/oakley.c Sat May 19 18:51:59 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/oakley.c Sat May 19 19:23:15 2018 +0000
@@ -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 @@
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 @@
}
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,
diff -r 1e16a6c1e8d2 -r 696f75aefaaa crypto/dist/ipsec-tools/src/racoon/privsep.c
--- a/crypto/dist/ipsec-tools/src/racoon/privsep.c Sat May 19 18:51:59 2018 +0000
+++ b/crypto/dist/ipsec-tools/src/racoon/privsep.c Sat May 19 19:23:15 2018 +0000
@@ -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 @@
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 @@
#ifdef ENABLE_HYBRID
case PRIVSEP_ACCOUNTING_SYSTEM: {
- int pool_size;
int port;
int inout;
struct sockaddr *raddr;
@@ -1059,7 +1057,6 @@
vchar_t *psk;
struct privsep_com_msg *msg;
size_t len;
- int *keylenp;
char *data;
if (geteuid() == 0)
@@ -1121,7 +1118,7 @@
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 @@
struct privsep_com_msg *msg;
size_t len;
char *data;
Home |
Main Index |
Thread Index |
Old Index