| g_eli_crypto.c (157900) | g_eli_crypto.c (167755) |
|---|---|
| 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 157900 2006-04-20 06:33:46Z pjd $"); | 28__FBSDID("$FreeBSD: head/sys/geom/eli/g_eli_crypto.c 167755 2007-03-21 03:42:51Z sam $"); |
| 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 --- 31 unchanged lines hidden (view full) --- 68 uint64_t sid; 69 u_char *p; 70 int error; 71 72 bzero(&cri, sizeof(cri)); 73 cri.cri_alg = algo; 74 cri.cri_key = __DECONST(void *, key); 75 cri.cri_klen = keysize; | 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 --- 31 unchanged lines hidden (view full) --- 68 uint64_t sid; 69 u_char *p; 70 int error; 71 72 bzero(&cri, sizeof(cri)); 73 cri.cri_alg = algo; 74 cri.cri_key = __DECONST(void *, key); 75 cri.cri_klen = keysize; |
| 76 error = crypto_newsession(&sid, &cri, 0); | 76 error = crypto_newsession(&sid, &cri, CRYPTOCAP_F_SOFTWARE); |
| 77 if (error != 0) 78 return (error); 79 p = malloc(sizeof(*crp) + sizeof(*crd) + sizeof(*uio) + sizeof(*iov), 80 M_ELI, M_NOWAIT | M_ZERO); 81 if (p == NULL) { 82 crypto_freesession(sid); 83 return (ENOMEM); 84 } --- 192 unchanged lines hidden --- | 77 if (error != 0) 78 return (error); 79 p = malloc(sizeof(*crp) + sizeof(*crd) + sizeof(*uio) + sizeof(*iov), 80 M_ELI, M_NOWAIT | M_ZERO); 81 if (p == NULL) { 82 crypto_freesession(sid); 83 return (ENOMEM); 84 } --- 192 unchanged lines hidden --- |