eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drop unused temporary volume key helpers.

Browse Source
This commit is contained in:
Ondrej Kozina
2025-02-14 15:53:01 +01:00
committed by Milan Broz
parent 0a6ee8633a
commit 2dc886053f
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/internal.h
View File

@@ -75,11 +75,6 @@ struct volume_key *crypt_volume_key_next(struct volume_key *vk);
struct volume_key *crypt_volume_key_by_id(struct volume_key *vk, int id); struct volume_key *crypt_volume_key_by_id(struct volume_key *vk, int id);
void crypt_volume_key_pass_safe_alloc(struct volume_key *vk, void **safe_alloc); void crypt_volume_key_pass_safe_alloc(struct volume_key *vk, void **safe_alloc);
bool crypt_volume_key_is_set(const struct volume_key *vk); bool crypt_volume_key_is_set(const struct volume_key *vk);
/* FIXME: temporary helpers to be removed later */
bool crypt_volume_key_is_uploaded(const struct volume_key *vk);
void crypt_volume_key_set_uploaded(struct volume_key *vk);
bool crypt_volume_key_upload_kernel_key(struct volume_key *vk); bool crypt_volume_key_upload_kernel_key(struct volume_key *vk);
void crypt_volume_key_drop_uploaded_kernel_key(struct crypt_device *cd, struct volume_key *vk); void crypt_volume_key_drop_uploaded_kernel_key(struct crypt_device *cd, struct volume_key *vk);
void crypt_volume_key_drop_kernel_key(struct crypt_device *cd, struct volume_key *vk); void crypt_volume_key_drop_kernel_key(struct crypt_device *cd, struct volume_key *vk);

15
lib/volumekey.c
View File

@@ -19,7 +19,6 @@ struct volume_key {
const char *key_description; /* keyring key name/description */ const char *key_description; /* keyring key name/description */
key_type_t keyring_key_type; /* kernel keyring key type */ key_type_t keyring_key_type; /* kernel keyring key type */
key_serial_t key_id; /* kernel key id of volume key representation linked in thread keyring */ key_serial_t key_id; /* kernel key id of volume key representation linked in thread keyring */
bool uploaded; /* uploaded to keyring, can drop it */
struct volume_key *next; struct volume_key *next;
char *key; char *key;
}; };
@@ -244,18 +243,6 @@ bool crypt_volume_key_is_set(const struct volume_key *vk)
return vk && vk->key; return vk && vk->key;
} }
bool crypt_volume_key_is_uploaded(const struct volume_key *vk)
{
return vk && vk->uploaded;
}
void crypt_volume_key_set_uploaded(struct volume_key *vk)
{
assert(vk);
vk->uploaded = true;
}
bool crypt_volume_key_upload_kernel_key(struct volume_key *vk) bool crypt_volume_key_upload_kernel_key(struct volume_key *vk)
{ {
key_serial_t kid; key_serial_t kid;
@@ -266,7 +253,6 @@ bool crypt_volume_key_upload_kernel_key(struct volume_key *vk)
vk->key, vk->keylength); vk->key, vk->keylength);
if (kid >= 0) { if (kid >= 0) {
vk->key_id = kid; vk->key_id = kid;
vk->uploaded = true;
return true; return true;
} }
@@ -293,5 +279,4 @@ void crypt_volume_key_drop_uploaded_kernel_key(struct crypt_device *cd, struct v
crypt_unlink_key_from_thread_keyring(cd, vk->key_id); crypt_unlink_key_from_thread_keyring(cd, vk->key_id);
vk->key_id = -1; vk->key_id = -1;
vk->uploaded = false;
} }