diff options
| author | NIIBE Yutaka <[email protected]> | 2025-10-08 04:37:38 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2025-10-08 04:37:38 +0000 |
| commit | 9c61a8cca6b426a26f59b730f0e8d5ce1ffc79d4 (patch) | |
| tree | 13af1ef6cfafea0e1576242b3b9b9e9477caab55 | |
| parent | gpgsm: Encrypt with ECC by KEM API. (diff) | |
| download | gnupg-9c61a8cca6b426a26f59b730f0e8d5ce1ffc79d4.tar.gz gnupg-9c61a8cca6b426a26f59b730f0e8d5ce1ffc79d4.zip | |
agent: Rename the internal function for ECC KEM.
* agent/pkdecrypt.c (ecc_kem_decap): Rename from ecc_pgp_kem_decap,
since it also handles the CMS case.
(composite_pgp_kem_decrypt, ecc_kem_decrypt): Follow the change.
--
GnuPG-bug-id: 7811
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | agent/pkdecrypt.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c index deb121c01..201712c1e 100644 --- a/agent/pkdecrypt.c +++ b/agent/pkdecrypt.c @@ -358,12 +358,12 @@ ecc_get_curve (ctrl_t ctrl, gcry_sexp_t s_skey, const char **r_curve) * if the private key is actually on smartcard. CTRL is used to * access smartcard, internally. */ static gpg_error_t -ecc_pgp_kem_decap (ctrl_t ctrl, gcry_sexp_t s_skey0, - const unsigned char *shadow_info0, - const unsigned char *ecc_ct, size_t ecc_point_len, - unsigned char ecc_ecdh[ECC_POINT_LEN_MAX], - unsigned char ecc_pk[ECC_POINT_LEN_MAX], - const struct gnupg_ecc_params **r_ecc) +ecc_kem_decap (ctrl_t ctrl, gcry_sexp_t s_skey0, + const unsigned char *shadow_info0, + const unsigned char *ecc_ct, size_t ecc_point_len, + unsigned char ecc_ecdh[ECC_POINT_LEN_MAX], + unsigned char ecc_pk[ECC_POINT_LEN_MAX], + const struct gnupg_ecc_params **r_ecc) { gpg_error_t err; const char *curve; @@ -557,8 +557,8 @@ composite_pgp_kem_decrypt (ctrl_t ctrl, const char *desc_text, /* Firstly, ECC part. */ ecc_point_len = ecc_ct_len; - err = ecc_pgp_kem_decap (ctrl, s_skey0, shadow_info0, ecc_ct, ecc_point_len, - ecc_ecdh, ecc_pk, &ecc); + err = ecc_kem_decap (ctrl, s_skey0, shadow_info0, ecc_ct, ecc_point_len, + ecc_ecdh, ecc_pk, &ecc); if (err) goto leave; ecc_hashalgo = ecc->hash_algo; @@ -798,9 +798,9 @@ ecc_kem_decrypt (int is_pgp, ctrl_t ctrl, const char *desc_text, } ecc_point_len = ecc_ct_len; - err = ecc_pgp_kem_decap (ctrl, s_skey, shadow_info, - ecc_ct, ecc_point_len, - ecc_ecdh, ecc_pk, &ecc); + err = ecc_kem_decap (ctrl, s_skey, shadow_info, + ecc_ct, ecc_point_len, + ecc_ecdh, ecc_pk, &ecc); if (err) goto leave; err = gnupg_ecc_kem_kdf (kek, kek_len, is_pgp, hashalgo, |