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

Merge remote-tracking branch 'github/master'

Browse Source
This commit is contained in:
Kent Overstreet 2024-02-16 01:53:51 -05:00
commit 46590fa310
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
c_src/cmd_key.c
View File

@ -1,4 +1,5 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <uuid/uuid.h> #include <uuid/uuid.h>
@ -6,6 +7,7 @@
#include "libbcachefs/checksum.h" #include "libbcachefs/checksum.h"
#include "crypto.h" #include "crypto.h"
#include "libbcachefs.h" #include "libbcachefs.h"
#include "tools-util.h"
static void unlock_usage(void) static void unlock_usage(void)
{ {
@ -16,6 +18,7 @@ static void unlock_usage(void)
" -c Check if a device is encrypted\n" " -c Check if a device is encrypted\n"
" -k (session|user|user_session)\n" " -k (session|user|user_session)\n"
" Keyring to add to (default: user)\n" " Keyring to add to (default: user)\n"
" -f Keyfile to read from (disables password prompt)\n"
" -h Display this help and exit\n" " -h Display this help and exit\n"
"Report bugs to <linux-bcachefs@vger.kernel.org>"); "Report bugs to <linux-bcachefs@vger.kernel.org>");
} }
@ -24,9 +27,12 @@ int cmd_unlock(int argc, char *argv[])
{ {
const char *keyring = "user"; const char *keyring = "user";
bool check = false; bool check = false;
const char *key_file_path = NULL;
char *passphrase = NULL;
int opt; int opt;
while ((opt = getopt(argc, argv, "ck:h")) != -1) while ((opt = getopt(argc, argv, "cf:k:h")) != -1)
switch (opt) { switch (opt) {
case 'c': case 'c':
check = true; check = true;
@ -34,6 +40,9 @@ int cmd_unlock(int argc, char *argv[])
case 'k': case 'k':
keyring = strdup(optarg); keyring = strdup(optarg);
break; break;
case 'f':
key_file_path = strdup(optarg);
break;
case 'h': case 'h':
unlock_usage(); unlock_usage();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
@ -62,8 +71,11 @@ int cmd_unlock(int argc, char *argv[])
if (check) if (check)
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
if (key_file_path){
char *passphrase = read_passphrase("Enter passphrase: "); passphrase = read_file_str(AT_FDCWD, key_file_path);
} else {
passphrase = read_passphrase("Enter passphrase: ");
}
bch2_add_key(sb.sb, "user", keyring, passphrase); bch2_add_key(sb.sb, "user", keyring, passphrase);