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

Add internal shortcut for flawed whirlpool hash in gcrypt.

Browse Source
This commit is contained in:
Milan Broz
2014-01-19 20:31:48 +01:00
parent e364041b40
commit 680eb76e45
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/crypto_backend/crypto_gcrypt.c
View File

@@ -132,6 +132,23 @@ uint32_t crypt_backend_flags(void)
return 0; return 0;
} }
static const char *crypt_hash_compat_name(const char *name, unsigned int *flags)
{
const char *hash_name = name;
/* "whirlpool_gcryptbug" is out shortcut to flawed whirlpool
* in libgcrypt < 1.6.0 */
if (!strcasecmp(name, "whirlpool_gcryptbug")) {
#if GCRYPT_VERSION_NUMBER >= 0x010601
if (flags)
*flags |= GCRY_MD_FLAG_BUGEMU1;
#endif
hash_name = "whirlpool";
}
return hash_name;
}
/* HASH */ /* HASH */
int crypt_hash_size(const char *name) int crypt_hash_size(const char *name)
{ {
@@ -139,7 +156,7 @@ int crypt_hash_size(const char *name)
assert(crypto_backend_initialised); assert(crypto_backend_initialised);
hash_id = gcry_md_map_name(name); hash_id = gcry_md_map_name(crypt_hash_compat_name(name, NULL));
if (!hash_id) if (!hash_id)
return -EINVAL; return -EINVAL;
@@ -149,6 +166,7 @@ int crypt_hash_size(const char *name)
int crypt_hash_init(struct crypt_hash **ctx, const char *name) int crypt_hash_init(struct crypt_hash **ctx, const char *name)
{ {
struct crypt_hash *h; struct crypt_hash *h;
unsigned int flags = 0;
assert(crypto_backend_initialised); assert(crypto_backend_initialised);
@@ -156,13 +174,13 @@ int crypt_hash_init(struct crypt_hash **ctx, const char *name)
if (!h) if (!h)
return -ENOMEM; return -ENOMEM;
h->hash_id = gcry_md_map_name(name); h->hash_id = gcry_md_map_name(crypt_hash_compat_name(name, &flags));
if (!h->hash_id) { if (!h->hash_id) {
free(h); free(h);
return -EINVAL; return -EINVAL;
} }
if (gcry_md_open(&h->hd, h->hash_id, 0)) { if (gcry_md_open(&h->hd, h->hash_id, flags)) {
free(h); free(h);
return -EINVAL; return -EINVAL;
} }
@@ -218,6 +236,7 @@ int crypt_hmac_init(struct crypt_hmac **ctx, const char *name,
const void *buffer, size_t length) const void *buffer, size_t length)
{ {
struct crypt_hmac *h; struct crypt_hmac *h;
unsigned int flags = GCRY_MD_FLAG_HMAC;
assert(crypto_backend_initialised); assert(crypto_backend_initialised);
@@ -225,13 +244,13 @@ int crypt_hmac_init(struct crypt_hmac **ctx, const char *name,
if (!h) if (!h)
return -ENOMEM; return -ENOMEM;
h->hash_id = gcry_md_map_name(name); h->hash_id = gcry_md_map_name(crypt_hash_compat_name(name, &flags));
if (!h->hash_id) { if (!h->hash_id) {
free(h); free(h);
return -EINVAL; return -EINVAL;
} }
if (gcry_md_open(&h->hd, h->hash_id, GCRY_MD_FLAG_HMAC)) { if (gcry_md_open(&h->hd, h->hash_id, flags)) {
free(h); free(h);
return -EINVAL; return -EINVAL;
} }
@@ -306,15 +325,17 @@ int crypt_pbkdf(const char *kdf, const char *hash,
char *key, size_t key_length, char *key, size_t key_length,
unsigned int iterations) unsigned int iterations)
{ {
const char *hash_name = crypt_hash_compat_name(hash, NULL);
#if USE_INTERNAL_PBKDF2 #if USE_INTERNAL_PBKDF2
if (!kdf || strncmp(kdf, "pbkdf2", 6)) if (!kdf || strncmp(kdf, "pbkdf2", 6))
return -EINVAL; return -EINVAL;
return pkcs5_pbkdf2(hash, password, password_length, salt, salt_length, return pkcs5_pbkdf2(hash_name, password, password_length, salt, salt_length,
iterations, key_length, key); iterations, key_length, key);
#else /* USE_INTERNAL_PBKDF2 */ #else /* USE_INTERNAL_PBKDF2 */
int hash_id = gcry_md_map_name(hash); int hash_id = gcry_md_map_name(hash_name);
int kdf_id; int kdf_id;
if (!hash_id) if (!hash_id)