Imported Upstream version 2.6.1

[platform/upstream/cryptsetup.git] / lib / luks2 / luks2_token_keyring.c

diff --git a/lib/luks2/luks2_token_keyring.c b/lib/luks2/luks2_token_keyring.c
index be4f4a6..ad18798 100644 (file)
--- a/lib/luks2/luks2_token_keyring.c
+++ b/lib/luks2/luks2_token_keyring.c
@@ -1,8 +1,8 @@
 /*
  * LUKS - Linux Unified Key Setup v2, kernel keyring token
  *
- * Copyright (C) 2016-2021 Red Hat, Inc. All rights reserved.
- * Copyright (C) 2016-2021 Ondrej Kozina
+ * Copyright (C) 2016-2023 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2016-2023 Ondrej Kozina
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -19,11 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <assert.h>
-
 #include "luks2_internal.h"
 
-static int keyring_open(struct crypt_device *cd,
+int keyring_open(struct crypt_device *cd,
                                int token,
                                char **buffer,
                                size_t *buffer_len,
@@ -45,16 +43,16 @@ static int keyring_open(struct crypt_device *cd,
        r = keyring_get_passphrase(json_object_get_string(jobj_key), buffer, buffer_len);
        if (r == -ENOTSUP) {
                log_dbg(cd, "Kernel keyring features disabled.");
-               return -EINVAL;
+               return -ENOENT;
        } else if (r < 0) {
                log_dbg(cd, "keyring_get_passphrase failed (error %d)", r);
-               return -EINVAL;
+               return -EPERM;
        }
 
        return 0;
 }
 
-static int keyring_validate(struct crypt_device *cd __attribute__((unused)),
+int keyring_validate(struct crypt_device *cd __attribute__((unused)),
                                    const char *json)
 {
        enum json_tokener_error jerr;
@@ -92,7 +90,7 @@ out:
        return r;
 }
 
-static void keyring_dump(struct crypt_device *cd, const char *json)
+void keyring_dump(struct crypt_device *cd, const char *json)
 {
        enum json_tokener_error jerr;
        json_object *jobj_token, *jobj_key;
@@ -111,47 +109,25 @@ static void keyring_dump(struct crypt_device *cd, const char *json)
        json_object_put(jobj_token);
 }
 
-int token_keyring_set(json_object **jobj_builtin_token,
-       const void *params)
+int LUKS2_token_keyring_json(char *buffer, size_t buffer_size,
+       const struct crypt_token_params_luks2_keyring *keyring_params)
 {
-       json_object *jobj_token, *jobj;
-       const struct crypt_token_params_luks2_keyring *keyring_params = (const struct crypt_token_params_luks2_keyring *) params;
-
-       jobj_token = json_object_new_object();
-       if (!jobj_token)
-               return -ENOMEM;
-
-       jobj = json_object_new_string(LUKS2_TOKEN_KEYRING);
-       if (!jobj) {
-               json_object_put(jobj_token);
-               return -ENOMEM;
-       }
-       json_object_object_add(jobj_token, "type", jobj);
-
-       jobj = json_object_new_array();
-       if (!jobj) {
-               json_object_put(jobj_token);
-               return -ENOMEM;
-       }
-       json_object_object_add(jobj_token, "keyslots", jobj);
+       int r;
 
-       jobj = json_object_new_string(keyring_params->key_description);
-       if (!jobj) {
-               json_object_put(jobj_token);
-               return -ENOMEM;
-       }
-       json_object_object_add(jobj_token, "key_description", jobj);
+       r = snprintf(buffer, buffer_size, "{ \"type\": \"%s\", \"keyslots\":[],\"key_description\":\"%s\"}",
+                LUKS2_TOKEN_KEYRING, keyring_params->key_description);
+       if (r < 0 || (size_t)r >= buffer_size)
+               return -EINVAL;
 
-       *jobj_builtin_token = jobj_token;
        return 0;
 }
 
-int token_keyring_get(json_object *jobj_token,
-       void *params)
+int LUKS2_token_keyring_get(struct luks2_hdr *hdr,
+       int token, struct crypt_token_params_luks2_keyring *keyring_params)
 {
-       json_object *jobj;
-       struct crypt_token_params_luks2_keyring *keyring_params = (struct crypt_token_params_luks2_keyring *) params;
+       json_object *jobj_token, *jobj;
 
+       jobj_token = LUKS2_get_token_jobj(hdr, token);
        json_object_object_get_ex(jobj_token, "type", &jobj);
        assert(!strcmp(json_object_get_string(jobj), LUKS2_TOKEN_KEYRING));
 
@@ -159,12 +135,10 @@ int token_keyring_get(json_object *jobj_token,
 
        keyring_params->key_description = json_object_get_string(jobj);
 
-       return 0;
+       return token;
 }
 
-const crypt_token_handler keyring_handler = {
-       .name = LUKS2_TOKEN_KEYRING,
-       .open = keyring_open,
-       .validate = keyring_validate,
-       .dump = keyring_dump
-};
+void keyring_buffer_free(void *buffer, size_t buffer_len __attribute__((unused)))
+{
+       crypt_safe_free(buffer);
+}