alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-03 00:00:07 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

master key nonce

Browse Source
This commit is contained in:
Kent Overstreet 2016-08-21 22:16:27 -08:00
parent b0f08fc1e3
commit 932ece1567
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto.c
View File

@ -56,14 +56,18 @@ void derive_passphrase(struct bcache_key *key, const char *passphrase)
die("scrypt error: %i", ret); die("scrypt error: %i", ret);
} }
void disk_key_encrypt(struct bcache_disk_key *disk_key, void disk_key_encrypt(struct cache_sb *sb,
struct bcache_disk_key *disk_key,
struct bcache_key *key) struct bcache_key *key)
{ {
__le32 nonce[2];
int ret; int ret;
memcpy(nonce, &sb->set_magic, sizeof(sb->set_magic));
ret = crypto_stream_chacha20_xor((void *) disk_key, ret = crypto_stream_chacha20_xor((void *) disk_key,
(void *) disk_key, sizeof(*disk_key), (void *) disk_key, sizeof(*disk_key),
(void *) &bch_master_key_nonce, (void *) nonce,
(void *) key); (void *) key);
if (ret) if (ret)
die("chacha20 error: %i", ret); die("chacha20 error: %i", ret);

3
crypto.h
View File

@ -17,7 +17,8 @@ static const struct nonce bch_master_key_nonce = BCACHE_MASTER_KEY_NONCE;
char *read_passphrase(const char *); char *read_passphrase(const char *);
void derive_passphrase(struct bcache_key *, const char *); void derive_passphrase(struct bcache_key *, const char *);
void disk_key_encrypt(struct bcache_disk_key *, struct bcache_key *); void disk_key_encrypt(struct cache_sb *sb, struct bcache_disk_key *,
struct bcache_key *);
void disk_key_init(struct bcache_disk_key *); void disk_key_init(struct bcache_disk_key *);
#endif /* _CRYPTO_H */ #endif /* _CRYPTO_H */

4
libbcache.c
View File

@ -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_DATA_REPLICAS_HAVE(sb, data_replicas);
SET_CACHE_SET_ERROR_ACTION(sb, on_error_action); SET_CACHE_SET_ERROR_ACTION(sb, on_error_action);
SET_CACHE_SET_STR_HASH_TYPE(sb, BCH_STR_HASH_SIPHASH);
if (passphrase) { if (passphrase) {
struct bcache_key key; struct bcache_key key;
struct bcache_disk_key disk_key; struct bcache_disk_key disk_key;
derive_passphrase(&key, passphrase); derive_passphrase(&key, passphrase);
disk_key_init(&disk_key); 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)); memcpy(sb->encryption_key, &disk_key, sizeof(disk_key));
SET_CACHE_SET_ENCRYPTION_TYPE(sb, 1); SET_CACHE_SET_ENCRYPTION_TYPE(sb, 1);