diff options
| author | koverstreet <kent.overstreet@gmail.com> | 2024-05-30 19:56:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-30 19:56:27 -0400 |
| commit | d42a09728051e3b3611fde927adf37c84589921c (patch) | |
| tree | 763149408b7dd7481f7d5ad79a3c2b88d2e5b250 /c_src | |
| parent | de6e8ac23014b18795b08aad0e7a0b38323a49d3 (diff) | |
| parent | 22495e0d31e5a440fe58039941a2f916aee6c89f (diff) | |
Merge pull request #281 from tmuehlbacher/rewrite-rust-key-handling
Rewrite rust key handling
Diffstat (limited to 'c_src')
| -rw-r--r-- | c_src/cmd_key.c | 2 | ||||
| -rw-r--r-- | c_src/crypto.c | 2 | ||||
| -rw-r--r-- | c_src/crypto.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/c_src/cmd_key.c b/c_src/cmd_key.c index 552aa867..adb0ac8d 100644 --- a/c_src/cmd_key.c +++ b/c_src/cmd_key.c @@ -66,7 +66,7 @@ int cmd_unlock(int argc, char *argv[]) if (ret) die("Error opening %s: %s", dev, bch2_err_str(ret)); - if (!bch2_sb_is_encrypted_and_locked(sb.sb)) + if (!bch2_sb_is_encrypted(sb.sb)) die("%s is not encrypted", dev); if (check) diff --git a/c_src/crypto.c b/c_src/crypto.c index bc4a9aee..32671bd8 100644 --- a/c_src/crypto.c +++ b/c_src/crypto.c @@ -101,7 +101,7 @@ struct bch_key derive_passphrase(struct bch_sb_field_crypt *crypt, return key; } -bool bch2_sb_is_encrypted_and_locked(struct bch_sb *sb) +bool bch2_sb_is_encrypted(struct bch_sb *sb) { struct bch_sb_field_crypt *crypt; diff --git a/c_src/crypto.h b/c_src/crypto.h index b93b1b08..baea6d86 100644 --- a/c_src/crypto.h +++ b/c_src/crypto.h @@ -12,7 +12,7 @@ char *read_passphrase(const char *); char *read_passphrase_twice(const char *); struct bch_key derive_passphrase(struct bch_sb_field_crypt *, const char *); -bool bch2_sb_is_encrypted_and_locked(struct bch_sb *); +bool bch2_sb_is_encrypted(struct bch_sb *); void bch2_passphrase_check(struct bch_sb *, const char *, struct bch_key *, struct bch_encrypted_key *); void bch2_add_key(struct bch_sb *, const char *, const char *, const char *); |