From 932ece1567dfc4ea7d993c8f62ccc9adfcf736ef Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sun, 21 Aug 2016 22:16:27 -0800 Subject: master key nonce --- libbcache.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libbcache.c') diff --git a/libbcache.c b/libbcache.c index d57f26ae..81d70d1b 100644 --- a/libbcache.c +++ b/libbcache.c @@ -126,13 +126,15 @@ void bcache_format(struct dev_opts *devs, size_t nr_devs, SET_CACHE_SET_DATA_REPLICAS_HAVE(sb, data_replicas); SET_CACHE_SET_ERROR_ACTION(sb, on_error_action); + SET_CACHE_SET_STR_HASH_TYPE(sb, BCH_STR_HASH_SIPHASH); + if (passphrase) { struct bcache_key key; struct bcache_disk_key disk_key; derive_passphrase(&key, passphrase); disk_key_init(&disk_key); - disk_key_encrypt(&disk_key, &key); + disk_key_encrypt(sb, &disk_key, &key); memcpy(sb->encryption_key, &disk_key, sizeof(disk_key)); SET_CACHE_SET_ENCRYPTION_TYPE(sb, 1); -- cgit v1.2.3