X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Finode.c;fp=bluesky%2Finode.c;h=b4b363c71030dd13a34437051ca3b1fc2531ad35;hb=52a6a600573a0483ea1aa99ec018e649299ea151;hp=7ace60d5f476976b4dd87d4764f395bbe4c4ecdf;hpb=74f45d45ca481cdd9e9c502ee9de591970dbf1de;p=bluesky.git

diff --git a/bluesky/inode.c b/bluesky/inode.c
index 7ace60d..b4b363c 100644
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -104,9 +104,13 @@ BlueSkyFS *bluesky_new_fs(gchar *name)
     return fs;
 }
 
-BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store)
+BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store,
+                           const gchar *master_key)
 {
     BlueSkyFS *fs = bluesky_new_fs(name);
+    fs->master_key = g_strdup(master_key);
+    fs->keys = g_new(BlueSkyCryptKeys, 1);
+    bluesky_crypt_derive_keys(fs->keys, master_key);
     fs->store = store;
     fs->log = bluesky_log_new("journal");
     fs->log->fs = fs;