diff options
| author | NIIBE Yutaka <[email protected]> | 2025-05-23 07:59:38 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2025-05-23 07:59:38 +0000 |
| commit | 681d754043003064ca6829019b1f6369360e8477 (patch) | |
| tree | db844041828dacadc74124a8ca45d767c8284c8a /common/util.h | |
| parent | common: Fix argument name of gnupg_ecc_kem_kdf. (diff) | |
| download | gnupg-681d754043003064ca6829019b1f6369360e8477.tar.gz gnupg-681d754043003064ca6829019b1f6369360e8477.zip | |
gpg,agent: Clean up around using ECC KEM.
* common/util.h (gnupg_ecc_kem_kdf): Change the last two args.
* common/kem.c (gnupg_ecc_kem_kdf): The last arguments are KDF_PARAMS
and its length.
* agent/pkdecrypt.c (composite_pgp_kem_decrypt): Follow the change.
* g10/pkglue.c (do_encrypt_kem): Follow the change.
* g10/ecdh.c (extract_secret_x, derive_kek): Remove.
(gnupg_ecc_6637_kdf): Remove.
(ecc_build_kdf_params): Rename from build_kdf_params, changing
arguments.
* g10/pkglue.c (do_encrypt_ecdh): Refactor by ecc_build_kdf_params and
gnupg_ecc_kem_kdf.
* g10/pkglue.h (pk_ecdh_decrypt, gnupg_ecc_6637_kdf): Remove.
(ecc_build_kdf_params): New.
* g10/pubkey-enc.c (ecdh_sexp_build): Use ecc_build_kdf_params.
--
GnuPG-bug-id: 7649
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'common/util.h')
| -rw-r--r-- | common/util.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/util.h b/common/util.h index 731b85ef7..20456349c 100644 --- a/common/util.h +++ b/common/util.h @@ -306,7 +306,8 @@ gpg_error_t gnupg_ecc_kem_kdf (void *kek, size_t kek_len, int hashalgo, const void *ecdh, size_t ecdh_len, const void *ecc_ct, size_t ecc_ct_len, const void *ecc_pk, size_t ecc_pk_len, - gcry_buffer_t *kdf_params); + unsigned char *kdf_params, + size_t kdf_params_len); gpg_error_t gnupg_kem_combiner (void *kek, size_t kek_len, const void *ecc_ss, size_t ecc_ss_len, |