diff options
| author | NIIBE Yutaka <[email protected]> | 2025-10-07 01:59:48 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2025-10-07 01:59:48 +0000 |
| commit | 06f993dc0eceee0f6ec99b9417d4368eee203e6d (patch) | |
| tree | 829c77502dfc0566a0f2189d312639cf8e95c663 /agent/agent.h | |
| parent | dirmngr: Fix wrong diagnostic "failed to create alarm thread". (diff) | |
| download | gnupg-06f993dc0eceee0f6ec99b9417d4368eee203e6d.tar.gz gnupg-06f993dc0eceee0f6ec99b9417d4368eee203e6d.zip | |
agent,common,gpg: Clean up for S/MIME decryption with KEM API.
* agent/agent.h (agent_kem_decrypt): Remove OPTION argument.
* agent/command.c (cmd_pkdecrypt): No option is needed.
* agent/pkdecrypt.c (composite_pgp_kem_decrypt): Use
gnupg_ecc_kem_simple_kdf.
(ecc_kem_decrypt): Support the S/MIME case too. Follow the change of
gnupg_ecc_kem_kdf.
(agent_kem_decrypt): Remove OPTION argument. Also support the S/MIME
case.
* common/kem.c (gnupg_ecc_kem_kdf): Support the S/MIME case too.
Don't support simple ECC part for combined KEM.
(gnupg_ecc_kem_simple_kdf): New.
* common/util.h (gnupg_ecc_kem_kdf): Support the S/MIME case too.
(gnupg_ecc_kem_simple_kdf): New.
* g10/pkglue.c (do_encrypt_kem): Use gnupg_ecc_kem_simple_kdf.
Use gnupg_ecc_kem_kdf with IS_GPG=1.
--
GnuPG-bug-id: 7811
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'agent/agent.h')
| -rw-r--r-- | agent/agent.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/agent/agent.h b/agent/agent.h index d1192f505..626bf48c9 100644 --- a/agent/agent.h +++ b/agent/agent.h @@ -569,7 +569,6 @@ enum kemids gpg_error_t agent_kem_decrypt (ctrl_t ctrl, const char *desc_text, int kemid, const unsigned char *ct, size_t ctlen, - const unsigned char *option, size_t optionlen, membuf_t *outbuf); /*-- genkey.c --*/ |