diff options
author | itojun <itojun@FreeBSD.org> | 2000-07-04 16:35:15 +0000 |
---|---|---|
committer | itojun <itojun@FreeBSD.org> | 2000-07-04 16:35:15 +0000 |
commit | 5f4e854de19331a53788d6100bbcd42845056bc1 (patch) | |
tree | 3ff8c876a5868b103fb8713055d83e29a3fa38d5 /sys/netinet6/esp.h | |
parent | bdc16885232d771a99d7dfc247cd27a44cd061f9 (diff) | |
download | FreeBSD-src-5f4e854de19331a53788d6100bbcd42845056bc1.zip FreeBSD-src-5f4e854de19331a53788d6100bbcd42845056bc1.tar.gz |
sync with kame tree as of july00. tons of bug fixes/improvements.
API changes:
- additional IPv6 ioctls
- IPsec PF_KEY API was changed, it is mandatory to upgrade setkey(8).
(also syntax change)
Diffstat (limited to 'sys/netinet6/esp.h')
-rw-r--r-- | sys/netinet6/esp.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/netinet6/esp.h b/sys/netinet6/esp.h index b2f62cf..95deec3 100644 --- a/sys/netinet6/esp.h +++ b/sys/netinet6/esp.h @@ -1,3 +1,6 @@ +/* $FreeBSD$ */ +/* $KAME: esp.h,v 1.8 2000/07/02 13:23:33 itojun Exp $ */ + /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. @@ -25,8 +28,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD$ */ /* @@ -34,7 +35,7 @@ */ #ifndef _NETINET6_ESP_H_ -#define _NETINET6_ESP_H_ +#define _NETINET6_ESP_H_ struct secasvar; @@ -77,6 +78,7 @@ struct esp_algorithm { int (*mature) __P((struct secasvar *)); int keymin; /* in bits */ int keymax; /* in bits */ + const char *name; int (*ivlen) __P((struct secasvar *)); int (*decrypt) __P((struct mbuf *, size_t, struct secasvar *, struct esp_algorithm *, int)); @@ -89,9 +91,9 @@ extern struct esp_algorithm esp_algorithms[]; /* crypt routines */ extern int esp4_output __P((struct mbuf *, struct ipsecrequest *)); -extern void esp4_input __P((struct mbuf *, int, int)); +extern void esp4_input __P((struct mbuf *, ...)); extern size_t esp_hdrsiz __P((struct ipsecrequest *)); -#endif +#endif /*_KERNEL*/ extern int esp_auth __P((struct mbuf *, size_t, size_t, struct secasvar *, u_char *)); |