projects
/
bluesky.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move encryption into S3 backend.
[bluesky.git]
/
bluesky
/
file.c
diff --git
a/bluesky/file.c
b/bluesky/file.c
index
fa4705a
..
607d611
100644
(file)
--- a/
bluesky/file.c
+++ b/
bluesky/file.c
@@
-157,9
+157,8
@@
void bluesky_block_fetch(BlueSkyFS *fs, BlueSkyBlock *block)
BlueSkyRCStr *string = bluesky_store_get(fs->store, block->ref);
bluesky_string_unref(block->data);
BlueSkyRCStr *string = bluesky_store_get(fs->store, block->ref);
bluesky_string_unref(block->data);
- block->data =
bluesky_crypt_decrypt(string, fs->encryption_key)
;
+ block->data =
string
;
block->type = BLUESKY_BLOCK_CACHED;
block->type = BLUESKY_BLOCK_CACHED;
- bluesky_string_unref(string);
}
/* Write the given block to cloud-backed storage and mark it clean. */
}
/* Write the given block to cloud-backed storage and mark it clean. */
@@
-169,7
+168,6
@@
void bluesky_block_flush(BlueSkyFS *fs, BlueSkyBlock *block)
return;
BlueSkyRCStr *data = block->data;
return;
BlueSkyRCStr *data = block->data;
- data = bluesky_crypt_encrypt(data, fs->encryption_key);
GChecksum *csum = g_checksum_new(G_CHECKSUM_SHA256);
g_checksum_update(csum, data->data, data->len);
GChecksum *csum = g_checksum_new(G_CHECKSUM_SHA256);
g_checksum_update(csum, data->data, data->len);
@@
-185,5
+183,5
@@
void bluesky_block_flush(BlueSkyFS *fs, BlueSkyBlock *block)
block->type = BLUESKY_BLOCK_REF;
g_checksum_free(csum);
block->type = BLUESKY_BLOCK_REF;
g_checksum_free(csum);
- bluesky_string_unref(data);
+
//
bluesky_string_unref(data);
}
}