Deleted Added
full compact
g_eli.c (157783) g_eli.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.c 157783 2006-04-15 18:30:42Z pjd $");
28__FBSDID("$FreeBSD: head/sys/geom/eli/g_eli.c 157900 2006-04-20 06:33:46Z pjd $");
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/kernel.h>
33#include <sys/linker.h>
34#include <sys/module.h>
35#include <sys/lock.h>
36#include <sys/mutex.h>

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

527 crp->crp_callback = g_eli_crypto_write_done;
528 else /* if (bp->bio_cmd == BIO_READ) */
529 crp->crp_callback = g_eli_crypto_read_done;
530 crp->crp_flags = CRYPTO_F_IOV | CRYPTO_F_CBIFSYNC | CRYPTO_F_REL;
531 crp->crp_desc = crd;
532
533 crd->crd_skip = 0;
534 crd->crd_len = secsize;
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/kernel.h>
33#include <sys/linker.h>
34#include <sys/module.h>
35#include <sys/lock.h>
36#include <sys/mutex.h>

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

527 crp->crp_callback = g_eli_crypto_write_done;
528 else /* if (bp->bio_cmd == BIO_READ) */
529 crp->crp_callback = g_eli_crypto_read_done;
530 crp->crp_flags = CRYPTO_F_IOV | CRYPTO_F_CBIFSYNC | CRYPTO_F_REL;
531 crp->crp_desc = crd;
532
533 crd->crd_skip = 0;
534 crd->crd_len = secsize;
535 crd->crd_flags =
536 CRD_F_IV_EXPLICIT | CRD_F_IV_PRESENT | CRD_F_KEY_EXPLICIT;
535 crd->crd_flags = CRD_F_IV_EXPLICIT | CRD_F_IV_PRESENT;
537 if (bp->bio_cmd == BIO_WRITE)
538 crd->crd_flags |= CRD_F_ENCRYPT;
539 crd->crd_alg = sc->sc_algo;
540 crd->crd_key = sc->sc_datakey;
541 crd->crd_klen = sc->sc_keylen;
542 g_eli_crypto_ivgen(sc, bp->bio_offset + add, crd->crd_iv,
543 sizeof(crd->crd_iv));
544 crd->crd_next = NULL;

--- 618 unchanged lines hidden ---
536 if (bp->bio_cmd == BIO_WRITE)
537 crd->crd_flags |= CRD_F_ENCRYPT;
538 crd->crd_alg = sc->sc_algo;
539 crd->crd_key = sc->sc_datakey;
540 crd->crd_klen = sc->sc_keylen;
541 g_eli_crypto_ivgen(sc, bp->bio_offset + add, crd->crd_iv,
542 sizeof(crd->crd_iv));
543 crd->crd_next = NULL;

--- 618 unchanged lines hidden ---