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

Rename verion function to avoid conflict with crypto backend.

Browse Source
This commit is contained in:
Milan Broz
2021-02-05 12:34:24 +01:00
parent da2f6e9d93
commit 12ff94c02f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/internal.h
View File

@@ -248,7 +248,7 @@ int crypt_use_keyring_for_vk(struct crypt_device *cd);
void crypt_drop_keyring_key_by_description(struct crypt_device *cd, const char *key_description, key_type_t ktype);
void crypt_drop_keyring_key(struct crypt_device *cd, struct volume_key *vks);
static inline uint64_t version(uint16_t major, uint16_t minor, uint16_t patch, uint16_t release)
static inline uint64_t compact_version(uint16_t major, uint16_t minor, uint16_t patch, uint16_t release)
{
return (uint64_t)release | ((uint64_t)patch << 16) | ((uint64_t)minor << 32) | ((uint64_t)major << 48);
}

2
lib/setup.c
View File

@@ -3819,7 +3819,7 @@ static int dmcrypt_keyring_bug(void)
if (kernel_version(&kversion))
return 1;
return kversion < version(4,15,0,0);
return kversion < compact_version(4,15,0,0);
}
int create_or_reload_device(struct crypt_device *cd, const char *name,

2
lib/utils.c
View File

@@ -318,7 +318,7 @@ int kernel_version(uint64_t *kversion)
}
if (!r)
*kversion = version(maj, min, patch, rel);
*kversion = compact_version(maj, min, patch, rel);
return r;
}