X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fbluesky.h;h=dbb69bbc5152f4f167d2579dac22cde0470a9b9d;hb=0325ee9e9afb02b08bdec3497e8cc54cb942989d;hp=8eff4126a348ebf8621ccbb9ab18da3a2b99bb6b;hpb=98e3e399a5cce3d1dd1b2a15d5746d1988943e7f;p=bluesky.git

diff --git a/bluesky/bluesky.h b/bluesky/bluesky.h
index 8eff412..dbb69bb 100644
--- a/bluesky/bluesky.h
+++ b/bluesky/bluesky.h
@@ -33,12 +33,14 @@ BlueSkyRCStr *bluesky_string_new(gpointer data, gsize len);
 void bluesky_string_ref(BlueSkyRCStr *string);
 void bluesky_string_unref(BlueSkyRCStr *string);
 BlueSkyRCStr *bluesky_string_dup(BlueSkyRCStr *string);
+void bluesky_string_resize(BlueSkyRCStr *string, gsize len);
 
 /* Cryptographic operations. */
 #define CRYPTO_BLOCK_SIZE 16        /* 128-bit AES */
 #define CRYPTO_KEY_SIZE   16
 
 void bluesky_crypt_init();
+void bluesky_crypt_hash_key(const char *keystr, uint8_t *out);
 void bluesky_crypt_random_bytes(guchar *buf, gint len);
 BlueSkyRCStr *bluesky_crypt_encrypt(BlueSkyRCStr *in, const uint8_t *key);
 BlueSkyRCStr *bluesky_crypt_decrypt(BlueSkyRCStr *in, const uint8_t *key);
@@ -94,8 +96,6 @@ typedef struct {
     uint64_t next_inum;         /* Next available inode for allocation */
 
     BlueSkyStore *store;
-
-    uint8_t *encryption_key;
 } BlueSkyFS;
 
 /* Inode number of the root directory. */
@@ -188,7 +188,6 @@ typedef struct {
     BlueSkyRCStr *data;         /* Pointer to data in memory if cached */
 } BlueSkyBlock;
 
-BlueSkyFS *bluesky_new_fs(gchar *name);
 BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store);
 void bluesky_superblock_flush(BlueSkyFS *fs);
 
@@ -201,7 +200,6 @@ BlueSkyInode *bluesky_get_inode(BlueSkyFS *fs, uint64_t inum);
 void bluesky_insert_inode(BlueSkyFS *fs, BlueSkyInode *inode);
 
 void bluesky_dirent_destroy(gpointer dirent);
-uint64_t bluesky_directory_hash(gchar *name);
 uint64_t bluesky_directory_lookup(BlueSkyInode *inode, gchar *name);
 uint64_t bluesky_directory_ilookup(BlueSkyInode *inode, gchar *name);
 gboolean bluesky_directory_insert(BlueSkyInode *dir, const gchar *name,
@@ -220,11 +218,6 @@ void bluesky_file_read(BlueSkyInode *inode, uint64_t offset,
 void bluesky_inode_flush(BlueSkyFS *fs, BlueSkyInode *inode);
 void bluesky_inode_fetch(BlueSkyFS *fs, uint64_t inum);
 
-void bluesky_serialize_superblock(GString *out, BlueSkyFS *fs);
-BlueSkyFS *bluesky_deserialize_superblock(const gchar *buf);
-void bluesky_serialize_inode(GString *out, BlueSkyInode *inode);
-BlueSkyInode *bluesky_deserialize_inode(BlueSkyFS *fs, const gchar *buf);
-
 gint bluesky_dirent_compare(gconstpointer a, gconstpointer b,
                             gpointer unused);