security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

common: Fix argument name of gnupg_ecc_kem_kdf.

Browse Source 
* common/kem.c (gnupg_ecc_kem_kdf): Rename to kdf_params.

--

It's KDF parameters composed by OpenPGP layer.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2025-05-23 10:42:44 +09:00
parent 07e8ca2a9b
commit 37bec0df7b
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/kem.c
View File

@ -145,15 +145,20 @@ compute_kmac256 (void *digest, size_t digestlen,
/* Compute KEK for ECC with HASHALGO, ECDH result, ciphertext in /* Compute KEK for ECC with HASHALGO, ECDH result, ciphertext in
ECC_CT (which is an ephemeral key), and public key in ECC_PK. */ * ECC_CT (which is an ephemeral key), and public key in ECC_PK.
*
* For traditional ECC (of v4), KDF_PARAMS is specified by upper layer
* and an ephemeral key and public key are not used for the
* computation.
*/
gpg_error_t gpg_error_t
gnupg_ecc_kem_kdf (void *kek, size_t kek_len, gnupg_ecc_kem_kdf (void *kek, size_t kek_len,
int hashalgo, const void *ecdh, size_t ecdh_len, int hashalgo, const void *ecdh, size_t ecdh_len,
const void *ecc_ct, size_t ecc_ct_len, const void *ecc_ct, size_t ecc_ct_len,
const void *ecc_pk, size_t ecc_pk_len, const void *ecc_pk, size_t ecc_pk_len,
gcry_buffer_t *fixed_info) gcry_buffer_t *kdf_params)
{ {
if (fixed_info) if (kdf_params)
{ {
/* Traditional ECC */ /* Traditional ECC */
gpg_error_t err; gpg_error_t err;
@ -163,8 +168,8 @@ gnupg_ecc_kem_kdf (void *kek, size_t kek_len,
param[0] = kek_len; param[0] = kek_len;
err = gcry_kdf_open (&hd, GCRY_KDF_ONESTEP_KDF, hashalgo, param, 1, err = gcry_kdf_open (&hd, GCRY_KDF_ONESTEP_KDF, hashalgo, param, 1,
ecdh, ecdh_len, NULL, 0, NULL, 0, ecdh, ecdh_len, NULL, 0, NULL, 0,
(char *)fixed_info->data+fixed_info->off, (char *)kdf_params->data+kdf_params->off,
fixed_info->len); kdf_params->len);
if (!err) if (!err)
{ {
gcry_kdf_compute (hd, NULL); gcry_kdf_compute (hd, NULL);

2
common/util.h
View File

@ -306,7 +306,7 @@ gpg_error_t gnupg_ecc_kem_kdf (void *kek, size_t kek_len,
int hashalgo, const void *ecdh, size_t ecdh_len, int hashalgo, const void *ecdh, size_t ecdh_len,
const void *ecc_ct, size_t ecc_ct_len, const void *ecc_ct, size_t ecc_ct_len,
const void *ecc_pk, size_t ecc_pk_len, const void *ecc_pk, size_t ecc_pk_len,
gcry_buffer_t *fixed_info); gcry_buffer_t *kdf_params);
gpg_error_t gnupg_kem_combiner (void *kek, size_t kek_len, gpg_error_t gnupg_kem_combiner (void *kek, size_t kek_len,
const void *ecc_ss, size_t ecc_ss_len, const void *ecc_ss, size_t ecc_ss_len,