diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/crypto/key_wrap.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/if_athn_usb.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/if_run.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/if_uath.c | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sys/crypto/key_wrap.c b/sys/crypto/key_wrap.c index 4605bd6b3e7..26c197eebbc 100644 --- a/sys/crypto/key_wrap.c +++ b/sys/crypto/key_wrap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: key_wrap.c,v 1.3 2011/01/11 15:42:05 deraadt Exp $ */ +/* $OpenBSD: key_wrap.c,v 1.4 2013/06/11 18:45:08 deraadt Exp $ */ /*- * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr> @@ -50,7 +50,7 @@ aes_key_wrap(aes_key_wrap_ctx *ctx, const u_int8_t *P, size_t n, u_int8_t *C) size_t i; int j; - ovbcopy(P, C + 8, n * 8); /* P and C may overlap */ + memmove(C + 8, P, n * 8); /* P and C may overlap */ A = C; /* A points to C[0] */ memcpy(A, IV, 8); /* A = IV, an initial value */ @@ -84,7 +84,7 @@ aes_key_unwrap(aes_key_wrap_ctx *ctx, const u_int8_t *C, u_int8_t *P, size_t n) int j; memcpy(A, C, 8); /* A = C[0] */ - ovbcopy(C + 8, P, n * 8); /* P and C may overlap */ + memmove(P, C + 8, n * 8); /* P and C may overlap */ for (j = 5, t = 6 * n; j >= 0; j--) { R = P + (n - 1) * 8; diff --git a/sys/dev/usb/if_athn_usb.c b/sys/dev/usb/if_athn_usb.c index 39e7add9a91..3558fe68124 100644 --- a/sys/dev/usb/if_athn_usb.c +++ b/sys/dev/usb/if_athn_usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_athn_usb.c,v 1.16 2013/04/15 09:23:01 mglocker Exp $ */ +/* $OpenBSD: if_athn_usb.c,v 1.17 2013/06/11 18:45:25 deraadt Exp $ */ /*- * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr> @@ -1708,7 +1708,7 @@ athn_usb_rx_frame(struct athn_usb_softc *usc, struct mbuf *m) if (!(wh->i_fc[0] & IEEE80211_FC0_TYPE_CTL)) { u_int hdrlen = ieee80211_get_hdrlen(wh); if (hdrlen & 3) { - ovbcopy(wh, (caddr_t)wh + 2, hdrlen); + memmove((caddr_t)wh + 2, wh, hdrlen); m_adj(m, 2); } } diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c index b03d75936f8..76d12983cde 100644 --- a/sys/dev/usb/if_run.c +++ b/sys/dev/usb/if_run.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_run.c,v 1.92 2013/04/15 09:23:01 mglocker Exp $ */ +/* $OpenBSD: if_run.c,v 1.93 2013/06/11 18:45:25 deraadt Exp $ */ /*- * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -1966,7 +1966,7 @@ run_rx_frame(struct run_softc *sc, uint8_t *buf, int dmalen) if (flags & RT2860_RX_L2PAD) { u_int hdrlen = ieee80211_get_hdrlen(wh); - ovbcopy(wh, (caddr_t)wh + 2, hdrlen); + memmove((caddr_t)wh + 2, wh, hdrlen); wh = (struct ieee80211_frame *)((caddr_t)wh + 2); } diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index e345ab63174..77ef42e0388 100644 --- a/sys/dev/usb/if_uath.c +++ b/sys/dev/usb/if_uath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uath.c,v 1.54 2013/04/15 09:23:01 mglocker Exp $ */ +/* $OpenBSD: if_uath.c,v 1.55 2013/06/11 18:45:25 deraadt Exp $ */ /*- * Copyright (c) 2006 @@ -1254,8 +1254,8 @@ uath_data_rxeof(struct usbd_xfer *xfer, void *priv, * fields. */ wh->i_fc[1] &= ~IEEE80211_FC1_WEP; - ovbcopy(wh, (caddr_t)wh + IEEE80211_WEP_IVLEN + - IEEE80211_WEP_KIDLEN, sizeof (struct ieee80211_frame)); + memmove((caddr_t)wh + IEEE80211_WEP_IVLEN + + IEEE80211_WEP_KIDLEN, wh, sizeof (struct ieee80211_frame)); m_adj(m, IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN); m_adj(m, -IEEE80211_WEP_CRCLEN); wh = mtod(m, struct ieee80211_frame *); |