diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2012-09-18 09:24:46 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2012-09-18 09:24:46 +0000 |
| commit | d969a0350bb560c21fa288513e0acdb96c341448 (patch) | |
| tree | dc5167bf22d07ffb5deb1ae4b984954d87266fef /sys/netinet/ip_ipsp.c | |
| parent | 61bab7bd2e23df36bb061a4c0daf8b829b1ae8be (diff) | |
remove the SADB_X_SAFLAGS_{HALFIV,RANDOMPADDING,NOREPLAY} pfkey-API (not set
anywhere) as well as the matching TDBF_{HALFIV,RANDOMPADDING,NOREPLAY} code.
ok mikeb@
Diffstat (limited to 'sys/netinet/ip_ipsp.c')
| -rw-r--r-- | sys/netinet/ip_ipsp.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c index e93c5b0c571..c4e8be54237 100644 --- a/sys/netinet/ip_ipsp.c +++ b/sys/netinet/ip_ipsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.c,v 1.183 2011/05/11 07:37:04 blambert Exp $ */ +/* $OpenBSD: ip_ipsp.c,v 1.184 2012/09/18 09:24:45 markus Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr), @@ -1240,22 +1240,7 @@ ipsp_parse_headers(struct mbuf *m, int off, u_int8_t proto) } /* How large is the ESP header ? We use this later. */ - if (tdb->tdb_flags & TDBF_NOREPLAY) - esphlen = sizeof(u_int32_t) + tdb->tdb_ivlen; - else - esphlen = 2 * sizeof(u_int32_t) + - tdb->tdb_ivlen; - - /* - * Verify decryption. If the SA is using - * random padding (as the "old" ESP SAs were - * bound to do, there's nothing we can do to - * see if the payload has been decrypted. - */ - if (tdb->tdb_flags & TDBF_RANDOMPADDING) { - splx(s); - return SLIST_FIRST(&tags); - } + esphlen = 2 * sizeof(u_int32_t) + tdb->tdb_ivlen; /* Update the length of trailing ESP authenticators. */ if (tdb->tdb_authalgxform) |