From 3738b0a99a45c09fa5f66e80110dbdff185bbf7c Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 7 Feb 2025 11:10:09 +0100 Subject: gpg: Store Link attributes for composite keys. * g10/call-agent.c (agent_crosslink_keys): New. * g10/keygen.c (common_gen): Store the Link attribute. -- The Link attribute may be useful to quickly find the other part of a composite private key. GnuPG-bug-id: 6638 --- g10/keygen.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'g10/keygen.c') diff --git a/g10/keygen.c b/g10/keygen.c index df6540273..33bdb64c0 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -1859,6 +1859,10 @@ common_gen (const char *keyparms, const char *keyparms2, if (keyparms2) { + unsigned char tmpgrip[KEYGRIP_LEN]; + char hexgrip1[2*KEYGRIP_LEN+1]; + char hexgrip2[2*KEYGRIP_LEN+1]; + err = agent_genkey (NULL, NULL, NULL, keyparms2, 1 /* No protection */, NULL, timestamp, @@ -1870,6 +1874,31 @@ common_gen (const char *keyparms, const char *keyparms2, gcry_sexp_release (s_key); return err; } + + if (!gcry_pk_get_keygrip (s_key, tmpgrip)) + { + log_error ("error computing keygrip for generated key\n"); + gcry_sexp_release (s_key); + gcry_sexp_release (s_key2); + return gpg_error (GPG_ERR_GENERAL); + } + bin2hex (tmpgrip, KEYGRIP_LEN, hexgrip1); + if (!gcry_pk_get_keygrip (s_key2, tmpgrip)) + { + log_error ("error computing keygrip for generated key\n"); + gcry_sexp_release (s_key); + gcry_sexp_release (s_key2); + return gpg_error (GPG_ERR_GENERAL); + } + bin2hex (tmpgrip, KEYGRIP_LEN, hexgrip2); + err = agent_crosslink_keys (NULL, hexgrip1, hexgrip2); + if (err) + { + log_error ("error setting link attributes for generated keys\n"); + gcry_sexp_release (s_key); + gcry_sexp_release (s_key2); + return gpg_error (GPG_ERR_GENERAL); + } } if (common_gen_cb && common_gen_cb_parm) -- cgit v1.2.3