diff options
| author | ambrisko <ambrisko@FreeBSD.org> | 2003-02-05 19:11:11 +0000 |
|---|---|---|
| committer | ambrisko <ambrisko@FreeBSD.org> | 2003-02-05 19:11:11 +0000 |
| commit | 666b5fcabd1290d5e6c63c2d53c82255ac521f25 (patch) | |
| tree | db11c275a825c08fcea43d91cdf5aff3692b59c8 /sys | |
| parent | b014f4134557052d358c454394a602f5b317513d (diff) | |
| download | FreeBSD-src-666b5fcabd1290d5e6c63c2d53c82255ac521f25.zip FreeBSD-src-666b5fcabd1290d5e6c63c2d53c82255ac521f25.tar.gz | |
Take the rc4 code out of ng_mppc module so we don't fail to load when
we have the rc4 code already in the kernel (via wlan stuff or awi).
Add a dependency on the rc4 module so if it doesn't exist then load it.
Reviewed by: archie
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/modules/netgraph/mppc/Makefile | 3 | ||||
| -rw-r--r-- | sys/netgraph/ng_mppc.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/modules/netgraph/mppc/Makefile b/sys/modules/netgraph/mppc/Makefile index 645781f..7e337f4 100644 --- a/sys/modules/netgraph/mppc/Makefile +++ b/sys/modules/netgraph/mppc/Makefile @@ -15,8 +15,7 @@ SRCS+= mppcc.c mppcd.c .if ${NETGRAPH_MPPC_ENCRYPTION} > 0 .PATH: ${.CURDIR}/../../../crypto -.PATH: ${.CURDIR}/../../../crypto/rc4 -SRCS+= rc4.c sha1.c +SRCS+= sha1.c .endif opt_netgraph.h: diff --git a/sys/netgraph/ng_mppc.c b/sys/netgraph/ng_mppc.c index 9637df8..6d20796 100644 --- a/sys/netgraph/ng_mppc.c +++ b/sys/netgraph/ng_mppc.c @@ -170,6 +170,11 @@ static struct ng_type ng_mppc_typestruct = { }; NETGRAPH_INIT(mppc, &ng_mppc_typestruct); +#ifdef NETGRAPH_MPPC_ENCRYPTION +/* Depend on separate rc4 module */ +MODULE_DEPEND(ng_mppc, rc4, 1, 1, 1); +#endif + /* Fixed bit pattern to weaken keysize down to 40 or 56 bits */ static const u_char ng_mppe_weakenkey[3] = { 0xd1, 0x26, 0x9e }; |
