diff options
| author | David Shaw <[email protected]> | 2004-02-27 19:56:15 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-02-27 19:56:15 +0000 |
| commit | 009af801064fce66c50b7c01918f515cbcd244de (patch) | |
| tree | 8130c1f273ce31fde73dedf08774bb140eff11ad | |
| parent | * gpg.sgml: Document --ask-cert-level, --max-output, and (diff) | |
| download | gnupg-009af801064fce66c50b7c01918f515cbcd244de.tar.gz gnupg-009af801064fce66c50b7c01918f515cbcd244de.zip | |
* keyedit.c (menu_addrevoker): Do not allow appointing a subkey as a
designated revoker.
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/keyedit.c | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 1ccd8f4aa..f42954c4c 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2004-02-27 David Shaw <[email protected]> + + * keyedit.c (menu_addrevoker): Do not allow appointing a subkey as + a designated revoker. + 2004-02-25 David Shaw <[email protected]> * delkey.c (do_delete_key): Allow deleting a public key with a diff --git a/g10/keyedit.c b/g10/keyedit.c index 1a180e358..0ef891a8e 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -2485,6 +2485,13 @@ menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock, int sensitive ) continue; } + if(!revoker_pk->is_primary) + { + log_error(_("cannot appoint a subkey as a designated revoker\n")); + m_free(answer); + continue; + } + m_free(answer); fingerprint_from_pk(revoker_pk,revkey.fpr,&fprlen); |