Deleted Added
full compact
g_eli_hmac.c (155174) g_eli_hmac.c (157900)
1/*-
2 * Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2005 Pawel Jakub Dawidek <pjd@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/geom/eli/g_eli_crypto.c 155174 2006-02-01 12:06:01Z pjd $");
28__FBSDID("$FreeBSD: head/sys/geom/eli/g_eli_crypto.c 157900 2006-04-20 06:33:46Z pjd $");
29
30#include <sys/param.h>
31#ifdef _KERNEL
32#include <sys/systm.h>
33#include <sys/kernel.h>
34#include <sys/malloc.h>
35#include <sys/uio.h>
36#else

--- 55 unchanged lines hidden (view full) ---

92
93 uio->uio_iov = iov;
94 uio->uio_iovcnt = 1;
95 uio->uio_segflg = UIO_SYSSPACE;
96 uio->uio_resid = datasize;
97
98 crd->crd_skip = 0;
99 crd->crd_len = datasize;
29
30#include <sys/param.h>
31#ifdef _KERNEL
32#include <sys/systm.h>
33#include <sys/kernel.h>
34#include <sys/malloc.h>
35#include <sys/uio.h>
36#else

--- 55 unchanged lines hidden (view full) ---

92
93 uio->uio_iov = iov;
94 uio->uio_iovcnt = 1;
95 uio->uio_segflg = UIO_SYSSPACE;
96 uio->uio_resid = datasize;
97
98 crd->crd_skip = 0;
99 crd->crd_len = datasize;
100 crd->crd_flags = CRD_F_IV_EXPLICIT | CRD_F_IV_PRESENT | CRD_F_KEY_EXPLICIT;
100 crd->crd_flags = CRD_F_IV_EXPLICIT | CRD_F_IV_PRESENT;
101 if (enc)
102 crd->crd_flags |= CRD_F_ENCRYPT;
103 crd->crd_alg = algo;
104 crd->crd_key = __DECONST(void *, key);
105 crd->crd_klen = keysize;
106 bzero(crd->crd_iv, sizeof(crd->crd_iv));
107 crd->crd_next = NULL;
108

--- 168 unchanged lines hidden ---
101 if (enc)
102 crd->crd_flags |= CRD_F_ENCRYPT;
103 crd->crd_alg = algo;
104 crd->crd_key = __DECONST(void *, key);
105 crd->crd_klen = keysize;
106 bzero(crd->crd_iv, sizeof(crd->crd_iv));
107 crd->crd_next = NULL;
108

--- 168 unchanged lines hidden ---