diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2008-06-13 22:08:18 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2008-06-13 22:08:18 +0000 |
| commit | 2adb7e0071a80e874ffda0ecf9c3e4646467bc54 (patch) | |
| tree | 0c75aecb49149ddc5e2b5ff0e794c6018358961f /sys/dev/softraidvar.h | |
| parent | 6c2f9f34155093fb51818713a17487e44c571a3c (diff) | |
make the disk key masking algorithm a parameter and add some extra
reserved space in case we ever want to support a different scheme
ok hshoexer@ marco@
Diffstat (limited to 'sys/dev/softraidvar.h')
| -rw-r--r-- | sys/dev/softraidvar.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/softraidvar.h b/sys/dev/softraidvar.h index 7a2712fb79f..5d5dedff200 100644 --- a/sys/dev/softraidvar.h +++ b/sys/dev/softraidvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: softraidvar.h,v 1.55 2008/06/13 21:03:40 hshoexer Exp $ */ +/* $OpenBSD: softraidvar.h,v 1.56 2008/06/13 22:08:17 djm Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -116,7 +116,6 @@ struct sr_crypto_kdf_pbkdf2 { u_int8_t salt[128]; }; - struct sr_crypto_kdfinfo { u_int32_t len; u_int32_t flags; @@ -140,6 +139,9 @@ struct sr_crypto_metadata { #define SR_CRYPTOF_INVALID (0) #define SR_CRYPTOF_KEY (1<<0) #define SR_CRYPTOF_KDFHINT (1<<1) + u_int32_t scm_mask_alg; +#define SR_CRYPTOM_AES_ECB_256 1 + u_int8_t scm_reserved[64]; u_int8_t scm_key[SR_CRYPTO_MAXKEYS][SR_CRYPTO_KEYBYTES]; u_int8_t scm_kdfhint[SR_CRYPTO_KDFHINTBYTES]; |