diff options
| -rw-r--r-- | sbin/isakmpd/ipsec.c | 4 | ||||
| -rw-r--r-- | sbin/isakmpd/pf_key_v2.c | 9 | ||||
| -rw-r--r-- | sbin/isakmpd/udp_encap.c | 5 | ||||
| -rw-r--r-- | sbin/isakmpd/x509.c | 6 |
4 files changed, 6 insertions, 18 deletions
diff --git a/sbin/isakmpd/ipsec.c b/sbin/isakmpd/ipsec.c index 3954c5670ae..6c3e264a6e1 100644 --- a/sbin/isakmpd/ipsec.c +++ b/sbin/isakmpd/ipsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec.c,v 1.151 2021/10/22 12:30:53 bluhm Exp $ */ +/* $OpenBSD: ipsec.c,v 1.152 2022/01/16 14:30:11 naddy Exp $ */ /* $EOM: ipsec.c,v 1.143 2000/12/11 23:57:42 niklas Exp $ */ /* @@ -2090,7 +2090,6 @@ ipsec_decode_id(char *buf, size_t size, u_int8_t *id, size_t id_len, { int id_type; char *addr = 0, *mask = 0; - u_int32_t *idp; if (id) { if (!isakmpform) { @@ -2102,7 +2101,6 @@ ipsec_decode_id(char *buf, size_t size, u_int8_t *id, size_t id_len, id_len += ISAKMP_GEN_SZ; } id_type = GET_ISAKMP_ID_TYPE(id); - idp = (u_int32_t *) (id + ISAKMP_ID_DATA_OFF); switch (id_type) { case IPSEC_ID_IPV4_ADDR: util_ntoa(&addr, AF_INET, id + ISAKMP_ID_DATA_OFF); diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c index 04e867dedaf..67fa921bb37 100644 --- a/sbin/isakmpd/pf_key_v2.c +++ b/sbin/isakmpd/pf_key_v2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_key_v2.c,v 1.202 2021/10/22 12:30:54 bluhm Exp $ */ +/* $OpenBSD: pf_key_v2.c,v 1.203 2022/01/16 14:30:11 naddy Exp $ */ /* $EOM: pf_key_v2.c,v 1.79 2000/12/12 00:33:19 niklas Exp $ */ /* @@ -2310,8 +2310,6 @@ pf_key_v2_acquire(struct pf_key_v2_msg *pmsg) struct sadb_x_policy policy; struct sadb_address *dst = 0, *src = 0; struct sockaddr *dstaddr, *srcaddr = 0; - struct sadb_comb *scmb = 0; - struct sadb_prop *sprp = 0; struct sadb_ident *srcident = 0, *dstident = 0; char dstbuf[ADDRESS_MAX], srcbuf[ADDRESS_MAX], *peer = 0; char confname[120], *conn = 0; @@ -2354,11 +2352,6 @@ pf_key_v2_acquire(struct pf_key_v2_msg *pmsg) if (ext) src = ext->seg; - ext = pf_key_v2_find_ext(pmsg, SADB_EXT_PROPOSAL); - if (ext) { - sprp = ext->seg; - scmb = (struct sadb_comb *) (sprp + 1); - } ext = pf_key_v2_find_ext(pmsg, SADB_EXT_IDENTITY_SRC); if (ext) srcident = ext->seg; diff --git a/sbin/isakmpd/udp_encap.c b/sbin/isakmpd/udp_encap.c index ae20f98fada..b449fbac4ed 100644 --- a/sbin/isakmpd/udp_encap.c +++ b/sbin/isakmpd/udp_encap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udp_encap.c,v 1.23 2015/08/20 22:02:21 deraadt Exp $ */ +/* $OpenBSD: udp_encap.c,v 1.24 2022/01/16 14:30:11 naddy Exp $ */ /* * Copyright (c) 1998, 1999, 2001 Niklas Hallqvist. All rights reserved. @@ -227,7 +227,7 @@ udp_encap_create(char *name) { struct virtual_transport *v; struct udp_transport *u; - struct transport *rv, *t; + struct transport *rv; struct sockaddr *dst, *addr; struct conf_list *addr_list = 0; struct conf_list_node *addr_node; @@ -303,7 +303,6 @@ udp_encap_create(char *name) rv = 0; goto ret; } - t = (struct transport *)v; rv = udp_clone(v->encap, dst); if (rv) rv->vtbl = &udp_encap_transport_vtbl; diff --git a/sbin/isakmpd/x509.c b/sbin/isakmpd/x509.c index 4ccaf072875..989553897e2 100644 --- a/sbin/isakmpd/x509.c +++ b/sbin/isakmpd/x509.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509.c,v 1.124 2021/11/19 23:15:59 tb Exp $ */ +/* $OpenBSD: x509.c,v 1.125 2022/01/16 14:30:11 naddy Exp $ */ /* $EOM: x509.c,v 1.54 2001/01/16 18:42:16 ho Exp $ */ /* @@ -680,7 +680,7 @@ x509_read_crls_from_dir(X509_STORE *ctx, char *name) struct stat sb; char fullname[PATH_MAX]; char file[PATH_MAX]; - int fd, off, size; + int fd; if (strlen(name) >= sizeof fullname - 1) { log_print("x509_read_crls_from_dir: directory name too long"); @@ -695,8 +695,6 @@ x509_read_crls_from_dir(X509_STORE *ctx, char *name) return 0; } strlcpy(fullname, name, sizeof fullname); - off = strlen(fullname); - size = sizeof fullname - off; while ((fd = monitor_readdir(file, sizeof file)) != -1) { LOG_DBG((LOG_CRYPTO, 60, "x509_read_crls_from_dir: reading " |