diff options
| author |   deraadt <deraadt@openbsd.org> | 2011-07-07 02:57:24 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2011-07-07 02:57:24 +0000 |
| commit | 6141cf33003a8028b4211fd84fea107eabedd229 (patch) | |
| tree | 19a2626bd8fbec2f1a9e924a7c92c79d6995f586 /sys/netinet/ip_ipcomp.c | |
| parent | Missed in previous: ypldap.conf(5) is installed now, remove optional. (diff) | |
| download | wireguard-openbsd-6141cf33003a8028b4211fd84fea107eabedd229.tar.xz wireguard-openbsd-6141cf33003a8028b4211fd84fea107eabedd229.zip | |
Replace the cruddy old sys/net/zlib.[ch]. We now use the sys/lib/libz
code. Missing chunks of the API are imported from the libc version,
with a few #ifdef's to port it into the kernel environment.
The bootblocks already used the newer code, and should encounter no
surprises since there are so few changes to the existing files. In
the kernel, ipcomp and kernel ppp are changed to the new API.
ipcomp has been tested.
ok tedu the brave
Diffstat (limited to 'sys/netinet/ip_ipcomp.c')
| -rw-r--r-- | sys/netinet/ip_ipcomp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/netinet/ip_ipcomp.c b/sys/netinet/ip_ipcomp.c index fff0dbfe999..f552f0b8df7 100644 --- a/sys/netinet/ip_ipcomp.c +++ b/sys/netinet/ip_ipcomp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipcomp.c,v 1.27 2010/07/09 16:58:06 reyk Exp $ */ +/* $OpenBSD: ip_ipcomp.c,v 1.28 2011/07/07 02:57:25 deraadt Exp $ */ /* * Copyright (c) 2001 Jean-Jacques Bernard-Gundol (jj@wabbitt.org) @@ -58,9 +58,10 @@ #include <net/if_enc.h> #include <crypto/cryptodev.h> -#include <crypto/deflate.h> #include <crypto/xform.h> +#include <lib/libz/zlib.h> + #include "bpfilter.h" #ifdef ENCDEBUG |