Deleted Added
sdiff udiff text old ( 213062 ) new ( 213067 )
full compact
g_eli.h (213062) g_eli.h (213067)
1/*-
2 * Copyright (c) 2005-2006 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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
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 *
1/*-
2 * Copyright (c) 2005-2006 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

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
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 * $FreeBSD: head/sys/geom/eli/g_eli.h 213062 2010-09-23 11:19:48Z pjd $
26 * $FreeBSD: head/sys/geom/eli/g_eli.h 213067 2010-09-23 11:49:47Z pjd $
27 */
28
29#ifndef _G_ELI_H_
30#define _G_ELI_H_
31
32#include <sys/endian.h>
33#include <sys/errno.h>
34#include <sys/malloc.h>

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

55 * Version history:
56 * 0 - Initial version number.
57 * 1 - Added data authentication support (md_aalgo field and
58 * G_ELI_FLAG_AUTH flag).
59 * 2 - Added G_ELI_FLAG_READONLY.
60 * 3 - Added 'configure' subcommand.
61 * 4 - IV is generated from offset converted to little-endian
62 * (flag G_ELI_FLAG_NATIVE_BYTE_ORDER will be set for older versions).
27 */
28
29#ifndef _G_ELI_H_
30#define _G_ELI_H_
31
32#include <sys/endian.h>
33#include <sys/errno.h>
34#include <sys/malloc.h>

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

55 * Version history:
56 * 0 - Initial version number.
57 * 1 - Added data authentication support (md_aalgo field and
58 * G_ELI_FLAG_AUTH flag).
59 * 2 - Added G_ELI_FLAG_READONLY.
60 * 3 - Added 'configure' subcommand.
61 * 4 - IV is generated from offset converted to little-endian
62 * (flag G_ELI_FLAG_NATIVE_BYTE_ORDER will be set for older versions).
63 * 5 - Added multiple encrypton keys.
63 */
64 */
64#define G_ELI_VERSION 4
65#define G_ELI_VERSION 5
65
66/* ON DISK FLAGS. */
67/* Use random, onetime keys. */
68#define G_ELI_FLAG_ONETIME 0x00000001
69/* Ask for the passphrase from the kernel, before mounting root. */
70#define G_ELI_FLAG_BOOT 0x00000002
71/* Detach on last close, if we were open for writing. */
72#define G_ELI_FLAG_WO_DETACH 0x00000004

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

78#define G_ELI_FLAG_RO 0x00000020
79/* RUNTIME FLAGS. */
80/* Provider was open for writing. */
81#define G_ELI_FLAG_WOPEN 0x00010000
82/* Destroy device. */
83#define G_ELI_FLAG_DESTROY 0x00020000
84/* Provider uses native byte-order for IV generation. */
85#define G_ELI_FLAG_NATIVE_BYTE_ORDER 0x00040000
66
67/* ON DISK FLAGS. */
68/* Use random, onetime keys. */
69#define G_ELI_FLAG_ONETIME 0x00000001
70/* Ask for the passphrase from the kernel, before mounting root. */
71#define G_ELI_FLAG_BOOT 0x00000002
72/* Detach on last close, if we were open for writing. */
73#define G_ELI_FLAG_WO_DETACH 0x00000004

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

79#define G_ELI_FLAG_RO 0x00000020
80/* RUNTIME FLAGS. */
81/* Provider was open for writing. */
82#define G_ELI_FLAG_WOPEN 0x00010000
83/* Destroy device. */
84#define G_ELI_FLAG_DESTROY 0x00020000
85/* Provider uses native byte-order for IV generation. */
86#define G_ELI_FLAG_NATIVE_BYTE_ORDER 0x00040000
87/* Provider uses single encryption key. */
88#define G_ELI_FLAG_SINGLE_KEY 0x00080000
86
87#define SHA512_MDLEN 64
88#define G_ELI_AUTH_SECKEYLEN SHA256_DIGEST_LENGTH
89
90#define G_ELI_MAXMKEYS 2
91#define G_ELI_MAXKEYLEN 64
92#define G_ELI_USERKEYLEN G_ELI_MAXKEYLEN
93#define G_ELI_DATAKEYLEN G_ELI_MAXKEYLEN
94#define G_ELI_AUTHKEYLEN G_ELI_MAXKEYLEN
95#define G_ELI_IVKEYLEN G_ELI_MAXKEYLEN
96#define G_ELI_SALTLEN 64
97#define G_ELI_DATAIVKEYLEN (G_ELI_DATAKEYLEN + G_ELI_IVKEYLEN)
98/* Data-Key, IV-Key, HMAC_SHA512(Derived-Key, Data-Key+IV-Key) */
99#define G_ELI_MKEYLEN (G_ELI_DATAIVKEYLEN + SHA512_MDLEN)
100#define G_ELI_OVERWRITES 5
89
90#define SHA512_MDLEN 64
91#define G_ELI_AUTH_SECKEYLEN SHA256_DIGEST_LENGTH
92
93#define G_ELI_MAXMKEYS 2
94#define G_ELI_MAXKEYLEN 64
95#define G_ELI_USERKEYLEN G_ELI_MAXKEYLEN
96#define G_ELI_DATAKEYLEN G_ELI_MAXKEYLEN
97#define G_ELI_AUTHKEYLEN G_ELI_MAXKEYLEN
98#define G_ELI_IVKEYLEN G_ELI_MAXKEYLEN
99#define G_ELI_SALTLEN 64
100#define G_ELI_DATAIVKEYLEN (G_ELI_DATAKEYLEN + G_ELI_IVKEYLEN)
101/* Data-Key, IV-Key, HMAC_SHA512(Derived-Key, Data-Key+IV-Key) */
102#define G_ELI_MKEYLEN (G_ELI_DATAIVKEYLEN + SHA512_MDLEN)
103#define G_ELI_OVERWRITES 5
104/* Switch data encryption key every 2^20 blocks. */
105#define G_ELI_KEY_SHIFT 20
101
102#ifdef _KERNEL
103extern u_int g_eli_debug;
104extern u_int g_eli_overwrites;
105extern u_int g_eli_batch;
106
107#define G_ELI_CRYPTO_HW 1
108#define G_ELI_CRYPTO_SW 2

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

134 struct g_eli_softc *w_softc;
135 struct proc *w_proc;
136 u_int w_number;
137 uint64_t w_sid;
138 LIST_ENTRY(g_eli_worker) w_next;
139};
140
141struct g_eli_softc {
106
107#ifdef _KERNEL
108extern u_int g_eli_debug;
109extern u_int g_eli_overwrites;
110extern u_int g_eli_batch;
111
112#define G_ELI_CRYPTO_HW 1
113#define G_ELI_CRYPTO_SW 2

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

139 struct g_eli_softc *w_softc;
140 struct proc *w_proc;
141 u_int w_number;
142 uint64_t w_sid;
143 LIST_ENTRY(g_eli_worker) w_next;
144};
145
146struct g_eli_softc {
142 struct g_geom *sc_geom;
143 u_int sc_crypto;
144 uint8_t sc_mkey[G_ELI_DATAIVKEYLEN];
145 uint8_t sc_ekey[G_ELI_DATAKEYLEN];
146 u_int sc_ealgo;
147 u_int sc_ekeylen;
148 uint8_t sc_akey[G_ELI_AUTHKEYLEN];
149 u_int sc_aalgo;
150 u_int sc_akeylen;
151 u_int sc_alen;
152 SHA256_CTX sc_akeyctx;
153 uint8_t sc_ivkey[G_ELI_IVKEYLEN];
154 SHA256_CTX sc_ivctx;
155 int sc_nkey;
156 uint32_t sc_flags;
157 u_int sc_bytes_per_sector;
158 u_int sc_data_per_sector;
147 struct g_geom *sc_geom;
148 u_int sc_crypto;
149 uint8_t sc_mkey[G_ELI_DATAIVKEYLEN];
150 uint8_t **sc_ekeys;
151 u_int sc_nekeys;
152 u_int sc_ealgo;
153 u_int sc_ekeylen;
154 uint8_t sc_akey[G_ELI_AUTHKEYLEN];
155 u_int sc_aalgo;
156 u_int sc_akeylen;
157 u_int sc_alen;
158 SHA256_CTX sc_akeyctx;
159 uint8_t sc_ivkey[G_ELI_IVKEYLEN];
160 SHA256_CTX sc_ivctx;
161 int sc_nkey;
162 uint32_t sc_flags;
163 off_t sc_mediasize;
164 size_t sc_sectorsize;
165 u_int sc_bytes_per_sector;
166 u_int sc_data_per_sector;
159
160 /* Only for software cryptography. */
161 struct bio_queue_head sc_queue;
167
168 /* Only for software cryptography. */
169 struct bio_queue_head sc_queue;
162 struct mtx sc_queue_mtx;
170 struct mtx sc_queue_mtx;
163 LIST_HEAD(, g_eli_worker) sc_workers;
164};
165#define sc_name sc_geom->name
166#endif /* _KERNEL */
167
168struct g_eli_metadata {
169 char md_magic[16]; /* Magic value. */
170 uint32_t md_version; /* Version number. */

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

226 MD5Update(&ctx, data, p - data);
227 MD5Final(md->md_hash, &ctx);
228 if (bcmp(md->md_hash, p, 16) != 0)
229 return (EINVAL);
230 return (0);
231}
232
233static __inline int
171 LIST_HEAD(, g_eli_worker) sc_workers;
172};
173#define sc_name sc_geom->name
174#endif /* _KERNEL */
175
176struct g_eli_metadata {
177 char md_magic[16]; /* Magic value. */
178 uint32_t md_version; /* Version number. */

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

234 MD5Update(&ctx, data, p - data);
235 MD5Final(md->md_hash, &ctx);
236 if (bcmp(md->md_hash, p, 16) != 0)
237 return (EINVAL);
238 return (0);
239}
240
241static __inline int
234eli_metadata_decode_v1v2v3v4(const u_char *data, struct g_eli_metadata *md)
242eli_metadata_decode_v1v2v3v4v5(const u_char *data, struct g_eli_metadata *md)
235{
236 MD5_CTX ctx;
237 const u_char *p;
238
239 p = data + sizeof(md->md_magic) + sizeof(md->md_version);
240 md->md_flags = le32dec(p); p += sizeof(md->md_flags);
241 md->md_ealgo = le16dec(p); p += sizeof(md->md_ealgo);
242 md->md_keylen = le16dec(p); p += sizeof(md->md_keylen);

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

264 switch (md->md_version) {
265 case 0:
266 error = eli_metadata_decode_v0(data, md);
267 break;
268 case 1:
269 case 2:
270 case 3:
271 case 4:
243{
244 MD5_CTX ctx;
245 const u_char *p;
246
247 p = data + sizeof(md->md_magic) + sizeof(md->md_version);
248 md->md_flags = le32dec(p); p += sizeof(md->md_flags);
249 md->md_ealgo = le16dec(p); p += sizeof(md->md_ealgo);
250 md->md_keylen = le16dec(p); p += sizeof(md->md_keylen);

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

272 switch (md->md_version) {
273 case 0:
274 error = eli_metadata_decode_v0(data, md);
275 break;
276 case 1:
277 case 2:
278 case 3:
279 case 4:
272 error = eli_metadata_decode_v1v2v3v4(data, md);
280 case 5:
281 error = eli_metadata_decode_v1v2v3v4v5(data, md);
273 break;
274 default:
275 error = EINVAL;
276 break;
277 }
278 return (error);
279}
280#endif /* !_OpenSSL */

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

456int g_eli_destroy(struct g_eli_softc *sc, boolean_t force);
457
458int g_eli_access(struct g_provider *pp, int dr, int dw, int de);
459void g_eli_config(struct gctl_req *req, struct g_class *mp, const char *verb);
460
461void g_eli_read_done(struct bio *bp);
462void g_eli_write_done(struct bio *bp);
463int g_eli_crypto_rerun(struct cryptop *crp);
282 break;
283 default:
284 error = EINVAL;
285 break;
286 }
287 return (error);
288}
289#endif /* !_OpenSSL */

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

465int g_eli_destroy(struct g_eli_softc *sc, boolean_t force);
466
467int g_eli_access(struct g_provider *pp, int dr, int dw, int de);
468void g_eli_config(struct gctl_req *req, struct g_class *mp, const char *verb);
469
470void g_eli_read_done(struct bio *bp);
471void g_eli_write_done(struct bio *bp);
472int g_eli_crypto_rerun(struct cryptop *crp);
473uint8_t *g_eli_crypto_key(struct g_eli_softc *sc, off_t offset,
474 size_t blocksize);
464void g_eli_crypto_ivgen(struct g_eli_softc *sc, off_t offset, u_char *iv,
465 size_t size);
466
467void g_eli_crypto_run(struct g_eli_worker *wr, struct bio *bp);
468
469void g_eli_auth_read(struct g_eli_softc *sc, struct bio *bp);
470void g_eli_auth_run(struct g_eli_worker *wr, struct bio *bp);
471#endif

--- 28 unchanged lines hidden --- 		475void g_eli_crypto_ivgen(struct g_eli_softc *sc, off_t offset, u_char *iv,
476 size_t size);
477
478void g_eli_crypto_run(struct g_eli_worker *wr, struct bio *bp);
479
480void g_eli_auth_read(struct g_eli_softc *sc, struct bio *bp);
481void g_eli_auth_run(struct g_eli_worker *wr, struct bio *bp);
482#endif

--- 28 unchanged lines hidden ---