g10: When adding a user id, make sure the keyblock has been prepared.
authorNeal H. Walfield <neal@g10code.com>
Thu, 22 Sep 2016 19:32:31 +0000 (21:32 +0200)
committerNeal H. Walfield <neal@g10code.com>
Thu, 22 Sep 2016 19:32:31 +0000 (21:32 +0200)
commitdf5353b95eefc13135e7df50a7c197f270d6080d
treef09c862cb9ceae80c995fe09822da61e7e79e193
parent7e0379a75475abfd15e0623913795779ff0f40d7
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 <neal@g10code.com>
GnuPG-bug-id: 2697
g10/keyedit.c
tests/openpgp/quick-key-manipulation.scm