From df5353b95eefc13135e7df50a7c197f270d6080d Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Thu, 22 Sep 2016 21:32:31 +0200 Subject: g10: When adding a user id, make sure the keyblock has been prepared. * g10/keyedit.c (keyedit_quick_adduid): Call merge_keys_and_selfsig on KEYBLOCK before adding the user id. * tests/openpgp/quick-key-manipulation.scm: Make sure that the key capabilities don't change when adding a user id. (key-data): New function. -- Signed-off-by: Neal H. Walfield GnuPG-bug-id: 2697 --- g10/keyedit.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'g10') diff --git a/g10/keyedit.c b/g10/keyedit.c index cd16ec971..65ac2eab3 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -2932,6 +2932,8 @@ keyedit_quick_adduid (ctrl_t ctrl, const char *username, const char *newuid) fix_keyblock (&keyblock); + merge_keys_and_selfsig (keyblock); + if (menu_adduid (ctrl, keyblock, 0, NULL, uidstring)) { err = keydb_update_keyblock (kdbhd, keyblock); -- cgit v1.2.3