diff options
| author | bms <bms@FreeBSD.org> | 2003-12-15 21:49:41 +0000 |
|---|---|---|
| committer | bms <bms@FreeBSD.org> | 2003-12-15 21:49:41 +0000 |
| commit | 3eb53d90efa64e513846ead8455355cb3da6d7e4 (patch) | |
| tree | 4a56d35c92a140a3a9a8c550bd3f95c338a48449 /sys/opencrypto | |
| parent | a1979e4f7e164437f89f892976c3a660e1ffcfc4 (diff) | |
| download | FreeBSD-src-3eb53d90efa64e513846ead8455355cb3da6d7e4.zip FreeBSD-src-3eb53d90efa64e513846ead8455355cb3da6d7e4.tar.gz | |
Push m_apply() and m_getptr() up into the colleciton of standard mbuf
routines, and purge them from opencrypto.
Reviewed by: sam
Obtained from: NetBSD
Sponsored by: spc.org
Diffstat (limited to 'sys/opencrypto')
| -rw-r--r-- | sys/opencrypto/cryptodev.h | 3 | ||||
| -rw-r--r-- | sys/opencrypto/cryptosoft.c | 9 |
2 files changed, 1 insertions, 11 deletions
diff --git a/sys/opencrypto/cryptodev.h b/sys/opencrypto/cryptodev.h index d281dd5..ec166e8 100644 --- a/sys/opencrypto/cryptodev.h +++ b/sys/opencrypto/cryptodev.h @@ -379,9 +379,6 @@ extern int crypto_devallowsoft; /* only use hardware crypto */ * XXX these don't really belong here; but for now they're * kept apart from the rest of the system. */ -struct mbuf; -struct mbuf *m_getptr(struct mbuf *, int, int *); - struct uio; extern void cuio_copydata(struct uio* uio, int off, int len, caddr_t cp); extern void cuio_copyback(struct uio* uio, int off, int len, caddr_t cp); diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c index 6fa156e..3225620 100644 --- a/sys/opencrypto/cryptosoft.c +++ b/sys/opencrypto/cryptosoft.c @@ -88,13 +88,6 @@ static int swcr_newsession(void *, u_int32_t *, struct cryptoini *); 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. */ static int @@ -460,7 +453,7 @@ swcr_authcompute(struct cryptop *crp, struct cryptodesc *crd, break; case CRYPTO_BUF_MBUF: 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); if (err) return err; |
