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

Cleanup traces of previous standalone m_apply()/m_getptr().

Browse Source
This commit is contained in:
jonathan 2003-07-27 03:34:39 +00:00
parent f07336a03e
commit cfb7c62413
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/opencrypto/cryptodev.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cryptodev.h,v 1.1 2003/07/25 21:12:44 jonathan Exp $ */ /* $NetBSD: cryptodev.h,v 1.2 2003/07/27 03:34:39 jonathan Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.4 2003/02/26 00:14:05 sam Exp $ */ /* $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.4 2003/02/26 00:14:05 sam Exp $ */
/* $OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $ */ /* $OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $ */
@ -383,10 +383,11 @@ extern struct iovec *cuio_getptr(struct uio *uio, int loc, int *off);
extern int cuio_getptr(struct uio *, int loc, int *off); extern int cuio_getptr(struct uio *, int loc, int *off);
#endif #endif
#ifdef __FreeBSD__ /* Standalone m_apply()/m_getptr() */
extern int m_apply(struct mbuf *m, int off, int len, extern int m_apply(struct mbuf *m, int off, int len,
int (*f)(caddr_t, caddr_t, unsigned int), caddr_t fstate); int (*f)(caddr_t, caddr_t, unsigned int), caddr_t fstate);
extern struct mbuf * m_getptr(struct mbuf *m, int loc, int *off); extern struct mbuf * m_getptr(struct mbuf *m, int loc, int *off);
#endif /* Standalone m_apply()/m_getptr() */
#endif /* _KERNEL */ #endif /* _KERNEL */
#endif /* _CRYPTO_CRYPTO_H_ */ #endif /* _CRYPTO_CRYPTO_H_ */

13
sys/opencrypto/cryptosoft.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cryptosoft.c,v 1.2 2003/07/26 22:53:44 jonathan Exp $ */ /* $NetBSD: cryptosoft.c,v 1.3 2003/07/27 03:34:40 jonathan Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptosoft.c,v 1.2.2.1 2002/11/21 23:34:23 sam Exp $ */ /* $FreeBSD: src/sys/opencrypto/cryptosoft.c,v 1.2.2.1 2002/11/21 23:34:23 sam Exp $ */
/* $OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $ */ /* $OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $ */
@ -24,7 +24,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cryptosoft.c,v 1.2 2003/07/26 22:53:44 jonathan Exp $"); __KERNEL_RCSID(0, "$NetBSD: cryptosoft.c,v 1.3 2003/07/27 03:34:40 jonathan Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -85,13 +85,6 @@ static int swcr_process(void *, struct cryptop *, int);
static int swcr_newsession(void *, u_int32_t *, struct cryptoini *); static int swcr_newsession(void *, u_int32_t *, struct cryptoini *);
static int swcr_freesession(void *, u_int64_t); static int swcr_freesession(void *, u_int64_t);
/*
* NB: These came over from openbsd and are kept private
* to the crypto code for now.
*/
extern int m_apply(struct mbuf *m, int off, int len,
int (*f)(caddr_t, caddr_t, unsigned int), caddr_t fstate);
/* /*
* Apply a symmetric encryption/decryption algorithm. * Apply a symmetric encryption/decryption algorithm.
*/ */
@ -577,7 +570,7 @@ swcr_authcompute(struct cryptop *crp, struct cryptodesc *crd,
break; break;
case CRYPTO_BUF_MBUF: case CRYPTO_BUF_MBUF:
err = m_apply((struct mbuf *) buf, crd->crd_skip, crd->crd_len, err = m_apply((struct mbuf *) buf, crd->crd_skip, crd->crd_len,
(int (*)(caddr_t, caddr_t, unsigned int)) axf->Update, (int (*)(void*, caddr_t, unsigned int)) axf->Update,
(caddr_t) &ctx); (caddr_t) &ctx);
if (err) if (err)
return err; return err;

6
sys/opencrypto/files.opencrypto
View File

@ -1,4 +1,4 @@
# $NetBSD: files.opencrypto,v 1.2 2003/07/26 13:49:53 he Exp $ # $NetBSD: files.opencrypto,v 1.3 2003/07/27 03:34:40 jonathan Exp $
# #
# #
defpseudo opencrypto defpseudo opencrypto
@ -8,7 +8,9 @@ file opencrypto/cryptodev.c opencrypto
file opencrypto/cryptosoft.c opencrypto file opencrypto/cryptosoft.c opencrypto
file opencrypto/xform.c opencrypto file opencrypto/xform.c opencrypto
file opencrypto/crypto.c opencrypto file opencrypto/crypto.c opencrypto
file opencrypto/crypto_mbuf.c opencrypto
#Standalone m_apply()/m_getptr()
#file opencrypto/crypto_mbuf.c opencrypto
# crypto algorithms # crypto algorithms
file opencrypto/blf.c opencrypto file opencrypto/blf.c opencrypto