Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct two more bungled bcopy() -> memcpy() conversions.

Browse Source
This commit is contained in:
he 2009-03-19 08:22:29 +00:00
parent 4a378cffe7
commit 59e8c39718
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netinet6/esp_aesctr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: esp_aesctr.c,v 1.10 2009/03/18 17:06:52 cegger Exp $ */
/* $NetBSD: esp_aesctr.c,v 1.11 2009/03/19 08:22:29 he Exp $ */
/* $KAME: esp_aesctr.c,v 1.2 2003/07/20 00:29:37 itojun Exp $ */
/*
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: esp_aesctr.c,v 1.10 2009/03/18 17:06:52 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: esp_aesctr.c,v 1.11 2009/03/19 08:22:29 he Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -246,7 +246,7 @@ esp_aesctr_decrypt(struct mbuf *m, size_t off, struct secasvar *sav,
ctx = (aesctr_ctx *)sav->sched;
rijndaelEncrypt(ctx->r_ek, ctx->r_nr, cblock.cblock, keystream);
memcpy( u_int8_t *) + dn, sp, mtod(d, blocklen);
memcpy(mtod(d, u_int8_t *) + dn, sp, blocklen);
dst = mtod(d, u_int8_t *) + dn;
for (i = 0; i < blocklen; i++)
dst[i] ^= keystream[i];
@ -423,7 +423,7 @@ esp_aesctr_encrypt(
ctx = (aesctr_ctx *)sav->sched;
rijndaelEncrypt(ctx->r_ek, ctx->r_nr, cblock.cblock, keystream);
memcpy( u_int8_t *) + dn, sp, mtod(d, blocklen);
memcpy(mtod(d, u_int8_t *) + dn, sp, blocklen);
dst = mtod(d, u_int8_t *) + dn;
for (i = 0; i < blocklen; i++)
dst[i] ^= keystream[i];

8
sys/netinet6/ipsec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ipsec.c,v 1.138 2009/03/18 17:06:52 cegger Exp $ */
/* $NetBSD: ipsec.c,v 1.139 2009/03/19 08:31:03 he Exp $ */
/* $KAME: ipsec.c,v 1.136 2002/05/19 00:36:39 itojun Exp $ */
/*
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.138 2009/03/18 17:06:52 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.139 2009/03/19 08:31:03 he Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@ -3198,7 +3198,7 @@ ipsec4_splithdr(struct mbuf *m)
mh->m_next = m;
m = mh;
m->m_len = hlen;
memcpy( void *), (void *)ip, mtod(m, hlen);
memcpy(mtod(m, void *), (void *)ip, hlen);
} else if (m->m_len < hlen) {
m = m_pullup(m, hlen);
if (!m)
@ -3233,7 +3233,7 @@ ipsec6_splithdr(struct mbuf *m)
mh->m_next = m;
m = mh;
m->m_len = hlen;
memcpy( void *), (void *)ip6, mtod(m, hlen);
memcpy(mtod(m, void *), (void *)ip6, hlen);
} else if (m->m_len < hlen) {
m = m_pullup(m, hlen);
if (!m)