diff options
| author | markm <markm@FreeBSD.org> | 2013-08-26 18:35:21 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2013-08-26 18:35:21 +0000 |
| commit | 8a3bb03c25c6aad10dd8cae21a2f8c11ee926cd4 (patch) | |
| tree | 4f43934f0272371327414cc35fe9fe3ccab8ca33 /sys/net | |
| parent | e007bbae78703d83fd29b3ba2507dfcac7e45b44 (diff) | |
| download | FreeBSD-src-8a3bb03c25c6aad10dd8cae21a2f8c11ee926cd4.zip FreeBSD-src-8a3bb03c25c6aad10dd8cae21a2f8c11ee926cd4.tar.gz | |
Snapshot; Do some running repairs on entropy harvesting. More needs to follow.
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_ethersubr.c | 3 | ||||
| -rw-r--r-- | sys/net/if_tun.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index e8d395a..638b364 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -638,9 +638,8 @@ ether_input_internal(struct ifnet *ifp, struct mbuf *m) m->m_flags |= M_PROMISC; } - /* First chunk of an mbuf contains good entropy */ if (harvest.ethernet) - random_harvest(m, 16, 3, 0, RANDOM_NET); + random_harvest(&(m->m_data), 12, 3, 0, RANDOM_NET_ETHER); ether_demux(ifp, m); CURVNET_RESTORE(); diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index e917793..56b3103 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -922,9 +922,8 @@ tunwrite(struct cdev *dev, struct uio *uio, int flag) m_freem(m); return (EAFNOSUPPORT); } - /* First chunk of an mbuf contains good junk */ if (harvest.point_to_point) - random_harvest(m, 16, 3, 0, RANDOM_NET); + random_harvest(&(m->m_data), 12, 3, 0, RANDOM_NET_TUN); ifp->if_ibytes += m->m_pkthdr.len; ifp->if_ipackets++; CURVNET_SET(ifp->if_vnet); |
