summaryrefslogtreecommitdiff
path: root/sys/dev/softraidvar.h
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2009-11-24 02:19:36 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2009-11-24 02:19:36 +0000
commitb8dcc6872637a4450b8760cbe6dbf7994a5b7959 (patch)
treee19613e7e1c26839d14183a14cc1f8a46a52c97c /sys/dev/softraidvar.h
parent1e3336cfd7e7b01e181841b629a4a762695afdc0 (diff)
Allow the passphrase to be changed on softraid crypto volumes. Ensure that
you backup your data and lock up your pets prior to using this. Tested by todd@ ok marco@
Diffstat (limited to 'sys/dev/softraidvar.h')
-rw-r--r--sys/dev/softraidvar.h15
1 files changed, 14 insertions, 1 deletions
diff --git a/sys/dev/softraidvar.h b/sys/dev/softraidvar.h
index 894ae0dbe5f..da5569b8085 100644
--- a/sys/dev/softraidvar.h
+++ b/sys/dev/softraidvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraidvar.h,v 1.83 2009/11/23 16:33:59 jsing Exp $ */
+/* $OpenBSD: softraidvar.h,v 1.84 2009/11/24 02:19:35 jsing Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -181,6 +181,16 @@ struct sr_crypto_kdfinfo {
#define pbkdf2 _kdfhint.pbkdf2
};
+#define SR_IOCTL_GET_KDFHINT 0x01 /* Get KDF hint. */
+#define SR_IOCTL_CHANGE_PASSPHRASE 0x02 /* Change passphase. */
+
+struct sr_crypto_kdfpair {
+ void *kdfinfo1;
+ u_int32_t kdfsize1;
+ void *kdfinfo2;
+ u_int32_t kdfsize2;
+};
+
#ifdef _KERNEL
#include <dev/biovar.h>
@@ -532,6 +542,9 @@ void sr_wu_put(struct sr_workunit *);
/* misc functions */
int32_t sr_validate_stripsize(u_int32_t);
void sr_meta_save_callback(void *, void *);
+int sr_meta_save(struct sr_discipline *, u_int32_t);
+void sr_checksum(struct sr_softc *, void *, void *,
+ u_int32_t);
int sr_validate_io(struct sr_workunit *, daddr64_t *,
char *);
int sr_check_io_collision(struct sr_workunit *);