diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/bgpd/bgpd.h | 10 | ||||
| -rw-r--r-- | usr.sbin/bgpd/parse.y | 10 | ||||
| -rw-r--r-- | usr.sbin/bgpd/pfkey.c | 6 | ||||
| -rw-r--r-- | usr.sbin/bgpd/printconf.c | 8 | ||||
| -rw-r--r-- | usr.sbin/bgpd/session.c | 6 |
5 files changed, 20 insertions, 20 deletions
diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h index c5e9d24bd75..2567ef517ce 100644 --- a/usr.sbin/bgpd/bgpd.h +++ b/usr.sbin/bgpd/bgpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.h,v 1.114 2004/04/27 22:42:13 henning Exp $ */ +/* $OpenBSD: bgpd.h,v 1.115 2004/04/28 00:38:39 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -147,10 +147,10 @@ struct filter_set { }; enum auth_method { - MD5SIG = 1, - IPSEC_MANUAL_ESP, - IPSEC_MANUAL_AH, - IPSEC_IKE + AUTH_MD5SIG = 1, + AUTH_IPSEC_MANUAL_ESP, + AUTH_IPSEC_MANUAL_AH, + AUTH_IPSEC_IKE }; struct peer_auth { diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index 005851368d2..f70545d1abb 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.92 2004/04/27 23:15:28 markus Exp $ */ +/* $OpenBSD: parse.y,v 1.93 2004/04/28 00:38:39 henning Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -515,7 +515,7 @@ peeropts : REMOTEAS asnumber { free($4); YYERROR; } - curpeer->conf.auth.method = MD5SIG; + curpeer->conf.auth.method = AUTH_MD5SIG; free($4); } | TCP MD5SIG KEY string { @@ -547,11 +547,11 @@ peeropts : REMOTEAS asnumber { curpeer->conf.auth.md5key[i] = strtoul(s, NULL, 16); } - curpeer->conf.auth.method = MD5SIG; + curpeer->conf.auth.method = AUTH_MD5SIG; free($4); } | IPSEC IKE { - curpeer->conf.auth.method = IPSEC_IKE; + curpeer->conf.auth.method = AUTH_IPSEC_IKE; } | IPSEC ESP inout SPI number STRING STRING encspec { unsigned i; @@ -559,7 +559,7 @@ peeropts : REMOTEAS asnumber { u_int32_t auth_alg; u_int8_t keylen; - curpeer->conf.auth.method = IPSEC_MANUAL_ESP; + curpeer->conf.auth.method = AUTH_IPSEC_MANUAL_ESP; if (!strcmp($6, "sha1")) { auth_alg = SADB_AALG_SHA1HMAC; diff --git a/usr.sbin/bgpd/pfkey.c b/usr.sbin/bgpd/pfkey.c index 02af2722aef..7bbcf8ca47b 100644 --- a/usr.sbin/bgpd/pfkey.c +++ b/usr.sbin/bgpd/pfkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkey.c,v 1.20 2004/04/27 22:42:13 henning Exp $ */ +/* $OpenBSD: pfkey.c,v 1.21 2004/04/28 00:38:39 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -496,7 +496,7 @@ pfkey_sa_remove(struct bgpd_addr *src, struct bgpd_addr *dst, u_int32_t *spi) int pfkey_auth_establish(struct peer *p) { - if (p->conf.auth.method != MD5SIG) + if (p->conf.auth.method != AUTH_MD5SIG) return (0); if (!p->conf.auth.spi_out) @@ -515,7 +515,7 @@ pfkey_auth_establish(struct peer *p) int pfkey_auth_remove(struct peer *p) { - if (p->conf.auth.method != MD5SIG) + if (p->conf.auth.method != AUTH_MD5SIG) return (0); if (p->conf.auth.spi_out) diff --git a/usr.sbin/bgpd/printconf.c b/usr.sbin/bgpd/printconf.c index b7898fdefa0..91bcce1e5a4 100644 --- a/usr.sbin/bgpd/printconf.c +++ b/usr.sbin/bgpd/printconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printconf.c,v 1.15 2004/04/27 23:20:42 henning Exp $ */ +/* $OpenBSD: printconf.c,v 1.16 2004/04/28 00:38:39 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -168,9 +168,9 @@ print_peer(struct peer_config *p) else printf("%s\tannounce ???\n", c); - if (p->auth.method == MD5SIG) + if (p->auth.method == AUTH_MD5SIG) printf("%s\ttcp md5sig\n", c); - else if (p->auth.method == IPSEC_MANUAL_ESP) { + else if (p->auth.method == AUTH_IPSEC_MANUAL_ESP) { printf("%s\tipsec esp in spi %u %s XXXXXX", c, p->auth.spi_in, print_auth_alg(p->auth.auth_alg_in)); if (p->auth.enc_alg_in) @@ -183,7 +183,7 @@ print_peer(struct peer_config *p) printf(" %s XXXXXX", print_enc_alg(p->auth.enc_alg_out)); printf("\n"); - } else if (p->auth.method == IPSEC_IKE) + } else if (p->auth.method == AUTH_IPSEC_IKE) printf("%s\tipsec ike\n", c); if (p->attrset.flags) diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index bab8a4c558d..9164b24ec14 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.158 2004/04/27 22:42:13 henning Exp $ */ +/* $OpenBSD: session.c,v 1.159 2004/04/28 00:38:39 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -795,7 +795,7 @@ session_accept(int listenfd) return; } } - if (p->conf.auth.method == MD5SIG) { + if (p->conf.auth.method == AUTH_MD5SIG) { len = sizeof(opt); if (getsockopt(connfd, IPPROTO_TCP, TCP_MD5SIG, &opt, &len) == -1) @@ -844,7 +844,7 @@ session_connect(struct peer *peer) return (-1); } - if (peer->conf.auth.method == MD5SIG) + if (peer->conf.auth.method == AUTH_MD5SIG) if (setsockopt(peer->sock, IPPROTO_TCP, TCP_MD5SIG, &opt, sizeof(opt)) == -1) { log_peer_warn(&peer->conf, "setsockopt md5sig"); |