fix list_journal for nochanges

[bcachefs-tools-debian] / crypto.c

diff --git a/crypto.c b/crypto.c
index 5ef1c874ef132104f624a11eebc2254d12c946f3..32671bd84c332e90deb0510743443faf41df6c45 100644 (file)
--- a/crypto.c
+++ b/crypto.c
@@ -12,10 +12,10 @@
 
 #include <keyutils.h>
 #include <linux/random.h>
-#include <libscrypt.h>
+#include <sodium/crypto_pwhash_scryptsalsa208sha256.h>
 #include <uuid/uuid.h>
 
-#include "checksum.h"
+#include "libbcachefs/checksum.h"
 #include "crypto.h"
 
 char *read_passphrase(const char *prompt)
@@ -54,62 +54,117 @@ char *read_passphrase(const char *prompt)
        return buf;
 }
 
-void derive_passphrase(struct bch_sb_field_crypt *crypt,
-                      struct bch_key *key,
-                      const char *passphrase)
+char *read_passphrase_twice(const char *prompt)
+{
+       char *pass = read_passphrase(prompt);
+
+       if (!isatty(STDIN_FILENO))
+               return pass;
+
+       char *pass2 = read_passphrase("Enter same passphrase again: ");
+
+       if (strcmp(pass, pass2)) {
+               memzero_explicit(pass, strlen(pass));
+               memzero_explicit(pass2, strlen(pass2));
+               die("Passphrases do not match");
+       }
+
+       memzero_explicit(pass2, strlen(pass2));
+       free(pass2);
+
+       return pass;
+}
+
+struct bch_key derive_passphrase(struct bch_sb_field_crypt *crypt,
+                                const char *passphrase)
 {
        const unsigned char salt[] = "bcache";
+       struct bch_key key;
        int ret;
 
        switch (BCH_CRYPT_KDF_TYPE(crypt)) {
        case BCH_KDF_SCRYPT:
-               ret = libscrypt_scrypt((void *) passphrase, strlen(passphrase),
-                                      salt, sizeof(salt),
-                                      1ULL << BCH_KDF_SCRYPT_N(crypt),
-                                      1ULL << BCH_KDF_SCRYPT_R(crypt),
-                                      1ULL << BCH_KDF_SCRYPT_P(crypt),
-                                      (void *) key, sizeof(*key));
+               ret = crypto_pwhash_scryptsalsa208sha256_ll(
+                       (void *) passphrase, strlen(passphrase),
+                       salt, sizeof(salt),
+                       1ULL << BCH_KDF_SCRYPT_N(crypt),
+                       1ULL << BCH_KDF_SCRYPT_R(crypt),
+                       1ULL << BCH_KDF_SCRYPT_P(crypt),
+                       (void *) &key, sizeof(key));
                if (ret)
                        die("scrypt error: %i", ret);
                break;
        default:
                die("unknown kdf type %llu", BCH_CRYPT_KDF_TYPE(crypt));
        }
+
+       return key;
 }
 
-void add_bcache_key(struct bch_sb *sb, const char *passphrase)
+bool bch2_sb_is_encrypted(struct bch_sb *sb)
 {
-       struct bch_sb_field_crypt *crypt = bch2_sb_get_crypt(sb);
+       struct bch_sb_field_crypt *crypt;
+
+       return (crypt = bch2_sb_field_get(sb, crypt)) &&
+               bch2_key_is_encrypted(&crypt->key);
+}
+
+void bch2_passphrase_check(struct bch_sb *sb, const char *passphrase,
+                          struct bch_key *passphrase_key,
+                          struct bch_encrypted_key *sb_key)
+{
+       struct bch_sb_field_crypt *crypt = bch2_sb_field_get(sb, crypt);
        if (!crypt)
                die("filesystem is not encrypted");
 
-       struct bch_encrypted_key sb_key = crypt->key;
-       if (!bch2_key_is_encrypted(&sb_key))
+       *sb_key = crypt->key;
+
+       if (!bch2_key_is_encrypted(sb_key))
                die("filesystem does not have encryption key");
 
-       struct bch_key passphrase_key;
-       derive_passphrase(crypt, &passphrase_key, passphrase);
+       *passphrase_key = derive_passphrase(crypt, passphrase);
 
        /* Check if the user supplied the correct passphrase: */
-       if (bch2_chacha_encrypt_key(&passphrase_key, __bch2_sb_key_nonce(sb),
-                                  &sb_key, sizeof(sb_key)))
+       if (bch2_chacha_encrypt_key(passphrase_key, __bch2_sb_key_nonce(sb),
+                                   sb_key, sizeof(*sb_key)))
                die("error encrypting key");
 
-       if (bch2_key_is_encrypted(&sb_key))
+       if (bch2_key_is_encrypted(sb_key))
                die("incorrect passphrase");
+}
+
+void bch2_add_key(struct bch_sb *sb,
+                 const char *type,
+                 const char *keyring_str,
+                 const char *passphrase)
+{
+       struct bch_key passphrase_key;
+       struct bch_encrypted_key sb_key;
+       int keyring;
+
+       if (!strcmp(keyring_str, "session"))
+               keyring = KEY_SPEC_SESSION_KEYRING;
+       else if (!strcmp(keyring_str, "user"))
+               keyring = KEY_SPEC_USER_KEYRING;
+       else if (!strcmp(keyring_str, "user_session"))
+               keyring = KEY_SPEC_USER_SESSION_KEYRING;
+       else
+               die("unknown keyring %s", keyring_str);
+
+       bch2_passphrase_check(sb, passphrase,
+                             &passphrase_key,
+                             &sb_key);
 
        char uuid[40];
        uuid_unparse_lower(sb->user_uuid.b, uuid);
 
        char *description = mprintf("bcachefs:%s", uuid);
 
-       if (add_key("logon", description,
-                   &passphrase_key, sizeof(passphrase_key),
-                   KEY_SPEC_USER_KEYRING) < 0 ||
-           add_key("user", description,
+       if (add_key(type,
+                   description,
                    &passphrase_key, sizeof(passphrase_key),
-                   KEY_SPEC_USER_KEYRING) < 0)
-               die("add_key error: %s", strerror(errno));
+                   keyring) < 0)
+               die("add_key error: %m");
 
        memzero_explicit(description, strlen(description));
        free(description);
@@ -125,14 +180,13 @@ void bch_sb_crypt_init(struct bch_sb *sb,
        get_random_bytes(&crypt->key.key, sizeof(crypt->key.key));
 
        if (passphrase) {
-               struct bch_key passphrase_key;
 
                SET_BCH_CRYPT_KDF_TYPE(crypt, BCH_KDF_SCRYPT);
-               SET_BCH_KDF_SCRYPT_N(crypt, ilog2(SCRYPT_N));
-               SET_BCH_KDF_SCRYPT_R(crypt, ilog2(SCRYPT_r));
-               SET_BCH_KDF_SCRYPT_P(crypt, ilog2(SCRYPT_p));
+               SET_BCH_KDF_SCRYPT_N(crypt, ilog2(16384));
+               SET_BCH_KDF_SCRYPT_R(crypt, ilog2(8));
+               SET_BCH_KDF_SCRYPT_P(crypt, ilog2(16));
 
-               derive_passphrase(crypt, &passphrase_key, passphrase);
+               struct bch_key passphrase_key = derive_passphrase(crypt, passphrase);
 
                assert(!bch2_key_is_encrypted(&crypt->key));