diff options
| author | David Shaw <[email protected]> | 2004-02-26 02:03:27 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-02-26 02:03:27 +0000 |
| commit | f2148f03c55bf5a814aeb61b7d853ba12b6132b3 (patch) | |
| tree | dc4e1c8fe2bf64930ca4ed53e7faa2908cf50bb9 /g10/delkey.c | |
| parent | * gpgkeys_ldap.c (send_key): List pgpCertID as one of the deleted (diff) | |
| download | gnupg-f2148f03c55bf5a814aeb61b7d853ba12b6132b3.tar.gz gnupg-f2148f03c55bf5a814aeb61b7d853ba12b6132b3.zip | |
* delkey.c (do_delete_key): Allow deleting a public key with a secret
present if --expert is set.
* plaintext.c (handle_plaintext): Make bytecount static so it works with
multiple literal packets inside a message.
* encode.c, helptext.c (keygen.algo, keygen.algo.elg_se), keygen.c
(ask_algo), sig-check.c (do_check_messages), skclist.c (build_sk_list):
Rename "ElGamal" to "Elgamal" as that is the proper spelling nowadays.
Suggested by Jon Callas.
Diffstat (limited to '')
| -rw-r--r-- | g10/delkey.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/g10/delkey.c b/g10/delkey.c index 54cbc7136..44e50f3b5 100644 --- a/g10/delkey.c +++ b/g10/delkey.c @@ -1,5 +1,6 @@ /* delkey.c - delete keys - * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, + * 2004 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -98,7 +99,7 @@ do_delete_key( const char *username, int secret, int *r_sec_avail ) pk = node->pkt->pkt.public_key; keyid_from_pk( pk, keyid ); rc = seckey_available( keyid ); - if( !rc ) { + if( !rc && !opt.expert ) { *r_sec_avail = 1; rc = -1; goto leave; |