diff options
| author |   markus <markus@openbsd.org> | 2004-01-27 09:26:22 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2004-01-27 09:26:22 +0000 |
| commit | 32d1d89f41fae6d3b1e9e611bc6cb54e30c28ecd (patch) | |
| tree | 8fef43987cfc0a8144cbe22fd48a3f4798049bd3 | |
| parent | remove $Header, it was messing up cvs for me. ok deraadt@ (diff) | |
| download | wireguard-openbsd-32d1d89f41fae6d3b1e9e611bc6cb54e30c28ecd.tar.xz wireguard-openbsd-32d1d89f41fae6d3b1e9e611bc6cb54e30c28ecd.zip | |
pass -spi for tcpmd5, too; ok hshoexer@
| -rw-r--r-- | sbin/ipsecadm/ipsecadm.8 | 5 | ||||
| -rw-r--r-- | sbin/ipsecadm/ipsecadm.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sbin/ipsecadm/ipsecadm.8 b/sbin/ipsecadm/ipsecadm.8 index 23eb049cf7b..46187b4bdd8 100644 --- a/sbin/ipsecadm/ipsecadm.8 +++ b/sbin/ipsecadm/ipsecadm.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ipsecadm.8,v 1.64 2004/01/15 12:20:08 markus Exp $ +.\" $OpenBSD: ipsecadm.8,v 1.65 2004/01/27 09:26:22 markus Exp $ .\" .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de> .\" All rights reserved. @@ -334,6 +334,7 @@ Set up a key for use by the RFC 2385 TCP MD5 option. Allowed modifiers are: .Fl dst , .Fl src , +.Fl spi , .Fl key , and .Fl keyfile . @@ -723,7 +724,7 @@ Set up a bypass flow: .Pp Set up a key for the TCP MD5 option: .Bd -literal -# ipsecadm tcpmd5 -src ::1 -dst ::1 -key deadbeef +# ipsecadm tcpmd5 -src ::1 -dst ::1 -spi 0100 -key deadbeef .Ed .Pp Delete all esp SAs and their flows and routing information: diff --git a/sbin/ipsecadm/ipsecadm.c b/sbin/ipsecadm/ipsecadm.c index 513c4768c6b..051d7ef9d69 100644 --- a/sbin/ipsecadm/ipsecadm.c +++ b/sbin/ipsecadm/ipsecadm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsecadm.c,v 1.72 2004/01/15 10:15:55 markus Exp $ */ +/* $OpenBSD: ipsecadm.c,v 1.73 2004/01/27 09:26:22 markus Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -495,7 +495,6 @@ main(int argc, char *argv[]) mode = TCPMD5; smsg.sadb_msg_type = SADB_ADD; smsg.sadb_msg_satype = SADB_X_SATYPE_TCPSIGNATURE; - sa.sadb_sa_spi = 0; /* fixed */ i++; } else if (!strcmp(argv[1], "ipcomp")) { mode = IPCOMP; @@ -1433,7 +1432,7 @@ argfail: exit(1); } if (spi == SPI_LOCAL_USE && !iscmd(mode, FLUSH) && !iscmd(mode, FLOW) - && !iscmd(mode, IPCOMP) && !iscmd(mode, TCPMD5)) { + && !iscmd(mode, IPCOMP)) { fprintf(stderr, "%s: no SPI specified\n", argv[0]); exit(1); } |