security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-23 15:07:03 +01:00
Code Activity

Fix cmd_sigkey and agent_hybrid_kem_decap.

Browse Source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2024-03-19 16:52:26 +09:00
parent 68891bfc8b
commit c53abc8ffe
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
agent/command.c
View File

@ -776,6 +776,7 @@ cmd_sigkey (assuan_context_t ctx, char *line)
int opt_another; int opt_another;
opt_another = has_option (line, "--another"); opt_another = has_option (line, "--another");
line = skip_options (line);
rc = parse_keygrip (ctx, line, opt_another? ctrl->keygrip1 : ctrl->keygrip); rc = parse_keygrip (ctx, line, opt_another? ctrl->keygrip1 : ctrl->keygrip);
if (rc) if (rc)

5
agent/pkdecrypt.c
View File

@ -241,7 +241,7 @@ agent_hybrid_kem_decap (ctrl_t ctrl, const char *desc_text, int kemid,
} }
err = agent_key_from_file (ctrl, NULL, desc_text, err = agent_key_from_file (ctrl, NULL, desc_text,
NULL, &shadow_info, ctrl->keygrip1, &shadow_info,
CACHE_MODE_NORMAL, NULL, &s_skey1, NULL, NULL); CACHE_MODE_NORMAL, NULL, &s_skey1, NULL, NULL);
if (gpg_err_code (err) == GPG_ERR_NO_SECKEY) if (gpg_err_code (err) == GPG_ERR_NO_SECKEY)
no_shadow_info = 1; no_shadow_info = 1;
@ -291,9 +291,6 @@ agent_hybrid_kem_decap (ctrl_t ctrl, const char *desc_text, int kemid,
ecc_ct = gcry_mpi_get_opaque (ecc_ct_mpi, &nbits); ecc_ct = gcry_mpi_get_opaque (ecc_ct_mpi, &nbits);
ecc_ct_len = (nbits+7)/8; ecc_ct_len = (nbits+7)/8;
/* Remove the 0x40 prefix*/
ecc_ct++;
ecc_ct_len--;
/*FIXME make sure the lengths are all correct. */ /*FIXME make sure the lengths are all correct. */
/*FIXME: check the internal of optional to determine the KEK-algo and KEKKEYLEN. */ /*FIXME: check the internal of optional to determine the KEK-algo and KEKKEYLEN. */
err = gcry_kem_decap (GCRY_KEM_RAW_X25519, err = gcry_kem_decap (GCRY_KEM_RAW_X25519,