diff options
| author |   florian <florian@openbsd.org> | 2017-08-09 14:34:05 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2017-08-09 14:34:05 +0000 |
| commit | d9cd09cf8cf56036e81ec2b150a128e6577b6c15 (patch) | |
| tree | cf3125cd5438ded4fde10898616e07f5f521ec7a | |
| parent | Move the socket lock "above" sosetopt(), sogetopt() and sosplice(). (diff) | |
| download | wireguard-openbsd-d9cd09cf8cf56036e81ec2b150a128e6577b6c15.tar.xz wireguard-openbsd-d9cd09cf8cf56036e81ec2b150a128e6577b6c15.zip | |
We are no longer generating privacy addresses in the
kernel.
OK mpi
| -rw-r--r-- | sys/netinet6/nd6.c | 5 | ||||
| -rw-r--r-- | sys/netinet6/nd6.h | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 1e2dfde283b..a1a63e31d60 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6.c,v 1.214 2017/08/08 18:15:58 florian Exp $ */ +/* $OpenBSD: nd6.c,v 1.215 2017/08/09 14:34:05 florian Exp $ */ /* $KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $ */ /* @@ -1000,9 +1000,6 @@ nd6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp) switch (cmd) { case SIOCGIFINFO_IN6: ndi->ndi = *ND_IFINFO(ifp); - memset(&ndi->ndi.randomseed0, 0, sizeof ndi->ndi.randomseed0); - memset(&ndi->ndi.randomseed1, 0, sizeof ndi->ndi.randomseed1); - memset(&ndi->ndi.randomid, 0, sizeof ndi->ndi.randomid); break; case SIOCSIFINFO_FLAGS: ND_IFINFO(ifp)->flags = ndi->ndi.flags; diff --git a/sys/netinet6/nd6.h b/sys/netinet6/nd6.h index 9196cb7fab7..cf00ec8f7aa 100644 --- a/sys/netinet6/nd6.h +++ b/sys/netinet6/nd6.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6.h,v 1.69 2017/08/08 18:15:58 florian Exp $ */ +/* $OpenBSD: nd6.h,v 1.70 2017/08/09 14:34:05 florian Exp $ */ /* $KAME: nd6.h,v 1.95 2002/06/08 11:31:06 itojun Exp $ */ /* @@ -50,10 +50,6 @@ struct nd_ifinfo { u_int32_t flags; /* Flags */ int recalctm; /* BaseReacable re-calculation timer */ u_int8_t initialized; /* Flag to see the entry is initialized */ - /* the following 3 members are for privacy extension for addrconf */ - u_int8_t randomseed0[8]; /* upper 64 bits of MD5 digest */ - u_int8_t randomseed1[8]; /* lower 64 bits (usually the EUI64 IFID) */ - u_int8_t randomid[8]; /* current random ID */ }; #define ND6_IFF_PERFORMNUD 0x1 |