security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

gpg: Use GCRY_KDF_ONESTEP_KDF with newer libgcrypt in future.

Browse Source 
* g10/ecdh.c (derive_kek): Use GCRY_KDF_ONESTEP_KDF.

--

This change is not yet enabled.  We will be able to use the code when
we update NEED_LIBGCRYPT_VERSION to 1.11.0.  Before the update, gpg
compiled with libgcrypt 1.11.0 can't work with older libgcrypt
runtime.

GnuPG-bug-id: 5964
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-10-14 14:49:37 +09:00
parent fe28e088a9
commit cf2d52cfc3
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
g10/ecdh.c
View File

@ -189,6 +189,28 @@ derive_kek (size_t kek_size,
const unsigned char *kdf_params, size_t kdf_params_size) const unsigned char *kdf_params, size_t kdf_params_size)
{ {
gpg_error_t err; gpg_error_t err;
#if 0 /* GCRYPT_VERSION_NUMBER >= 0x010b00 */
/*
* Experimental: We will remove this if/endif-conditional
* compilation when we update NEED_LIBGCRYPT_VERSION to 1.11.0.
*/
gcry_kdf_hd_t hd;
unsigned long param[1];
param[0] = kek_size;
err = gcry_kdf_open (&hd, GCRY_KDF_ONESTEP_KDF, kdf_hash_algo,
param, 1,
secret_x, secret_x_size, NULL, 0, NULL, 0,
kdf_params, kdf_params_size);
if (!err)
{
gcry_kdf_compute (hd, NULL);
gcry_kdf_final (hd, kek_size, secret_x);
gcry_kdf_close (hd);
/* Clean the tail before returning. */
memset (secret_x+kek_size, 0, secret_x_size - kek_size);
}
#else
gcry_md_hd_t h; gcry_md_hd_t h;
log_assert( gcry_md_get_algo_dlen (kdf_hash_algo) >= 32 ); log_assert( gcry_md_get_algo_dlen (kdf_hash_algo) >= 32 );
@ -208,6 +230,7 @@ derive_kek (size_t kek_size,
gcry_md_close (h); gcry_md_close (h);
/* Clean the tail before returning. */ /* Clean the tail before returning. */
memset (secret_x+kek_size, 0, secret_x_size - kek_size); memset (secret_x+kek_size, 0, secret_x_size - kek_size);
#endif
if (DBG_CRYPTO) if (DBG_CRYPTO)
log_printhex (secret_x, kek_size, "ecdh KEK is:"); log_printhex (secret_x, kek_size, "ecdh KEK is:");
return err; return err;