summaryrefslogtreecommitdiff
path: root/sys/dev/softraidvar.h
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2012-10-09 13:55:37 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2012-10-09 13:55:37 +0000
commit02af0486e603b0f2ea7a465402af48202c633d1c (patch)
tree89ee83a3d95164560d71a2e663d04b2e937f322c /sys/dev/softraidvar.h
parent7af3cff30ec7c35fe7ca5fef4025135ef8a6e3a8 (diff)
Teach amd64 boot(8) how to access a softraid crypto volume. This allows for
full disk encryption since the kernel can now be loaded directly from the crypto volume, instead of needing to be on FFS. This is currently disabled by default, however can be enabled by compiling with boot(8) 'make -DBOOT_CRYPTO'.
Diffstat (limited to 'sys/dev/softraidvar.h')
-rw-r--r--sys/dev/softraidvar.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/dev/softraidvar.h b/sys/dev/softraidvar.h
index ab02802e899..f6e8aba59c0 100644
--- a/sys/dev/softraidvar.h
+++ b/sys/dev/softraidvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraidvar.h,v 1.118 2012/10/09 11:57:33 jsing Exp $ */
+/* $OpenBSD: softraidvar.h,v 1.119 2012/10/09 13:55:36 jsing Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -285,7 +285,11 @@ struct sr_boot_volume {
char sbv_part; /* Partition opened. */
void *sbv_diskinfo; /* MD disk information. */
+ u_int8_t *sbv_keys; /* Disk keys for volume. */
+ u_int8_t *sbv_maskkey; /* Mask key for disk keys. */
+
struct sr_boot_chunk_head sbv_chunks; /* List of chunks. */
+ struct sr_meta_opt_head sbv_meta_opt; /* List of optional metadata. */
SLIST_ENTRY(sr_boot_volume) sbv_link;
};