[src-draft/trunk]: src/sys/net80211 ccmp works!

[Nathanial Sloss <nat%netbsd.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/017dd29ee55b
branches:  trunk
changeset: 377680:017dd29ee55b
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Thu May 14 12:20:55 2020 +1000

description:
ccmp works!

diffstat:

 sys/net80211/ieee80211_crypto_ccmp.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 82b39839daa2 -r 017dd29ee55b sys/net80211/ieee80211_crypto_ccmp.c
--- a/sys/net80211/ieee80211_crypto_ccmp.c      Wed May 13 17:55:00 2020 +1000
+++ b/sys/net80211/ieee80211_crypto_ccmp.c      Thu May 14 12:20:55 2020 +1000
@@ -214,7 +214,7 @@ ccmp_encap(struct ieee80211_key *k, stru
        if (m == NULL)
                return 0;
        ivp = mtod(m, uint8_t *);
-       ovbcopy(ivp + ccmp.ic_header, ivp, hdrlen);
+       memmove(ivp, ivp + ccmp.ic_header, hdrlen);
        ivp += hdrlen;
 
        ccmp_setiv(k, ivp);
@@ -310,7 +310,7 @@ finish:
         * Copy up 802.11 header and strip crypto bits.
         */
        if (! ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_IV_STRIP))) {
-               ovbcopy(mtod(m, void *), mtod(m, uint8_t *) + ccmp.ic_header,
+               memmove(mtod(m, uint8_t *) + ccmp.ic_header, mtod(m, uint8_t *),
                    hdrlen);
                m_adj(m, ccmp.ic_header);
        }