security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

gpg: Re-indent a file.

Browse Source 
* g10/delkey.c: Re-indent.
(do_delete_key, delete_keys): Change return type top gpg_error_t.
This commit is contained in:
Werner Koch 2014-04-15 15:29:45 +02:00
parent c4d983239a
commit d25d00b89e
2 changed files with 145 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
g10/delkey.c
View File

@ -1,6 +1,7 @@
/* delkey.c - delete keys /* delkey.c - delete keys
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004,
* 2005, 2006 Free Software Foundation, Inc. * 2005, 2006 Free Software Foundation, Inc.
* Copyright (C) 2014 Werner Koch
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -46,13 +47,13 @@
* r_sec_avail will be set if a secret key is available and the public * r_sec_avail will be set if a secret key is available and the public
* key can't be deleted for that reason. * key can't be deleted for that reason.
*/ */
static int static gpg_error_t
do_delete_key( const char *username, int secret, int force, int *r_sec_avail ) do_delete_key( const char *username, int secret, int force, int *r_sec_avail )
{ {
int rc = 0; gpg_error_t err;
KBNODE keyblock = NULL; kbnode_t keyblock = NULL;
KBNODE node; kbnode_t node;
KEYDB_HANDLE hd = keydb_new (); KEYDB_HANDLE hd;
PKT_public_key *pk = NULL; PKT_public_key *pk = NULL;
u32 keyid[2]; u32 keyid[2];
int okay=0; int okay=0;
@ -62,34 +63,38 @@ do_delete_key( const char *username, int secret, int force, int *r_sec_avail )
*r_sec_avail = 0; *r_sec_avail = 0;
/* Search the userid */ hd = keydb_new ();
rc = classify_user_id (username, &desc, 1);
/* Search the userid. */
err = classify_user_id (username, &desc, 1);
exactmatch = (desc.mode == KEYDB_SEARCH_MODE_FPR exactmatch = (desc.mode == KEYDB_SEARCH_MODE_FPR
|| desc.mode == KEYDB_SEARCH_MODE_FPR16 || desc.mode == KEYDB_SEARCH_MODE_FPR16
|| desc.mode == KEYDB_SEARCH_MODE_FPR20); || desc.mode == KEYDB_SEARCH_MODE_FPR20);
if (!rc) if (!err)
rc = keydb_search (hd, &desc, 1, NULL); err = keydb_search (hd, &desc, 1, NULL);
if (rc) { if (err)
log_error (_("key \"%s\" not found: %s\n"), username, g10_errstr (rc)); {
log_error (_("key \"%s\" not found: %s\n"), username, gpg_strerror (err));
write_status_text (STATUS_DELETE_PROBLEM, "1"); write_status_text (STATUS_DELETE_PROBLEM, "1");
goto leave; goto leave;
} }
/* read the keyblock */ /* Read the keyblock. */
rc = keydb_get_keyblock (hd, &keyblock ); err = keydb_get_keyblock (hd, &keyblock);
if (rc) { if (err)
log_error (_("error reading keyblock: %s\n"), g10_errstr(rc) ); {
log_error (_("error reading keyblock: %s\n"), gpg_strerror (err) );
goto leave; goto leave;
} }
/* get the keyid from the keyblock */ /* Get the keyid from the keyblock. */
node = find_kbnode( keyblock, PKT_PUBLIC_KEY ); node = find_kbnode( keyblock, PKT_PUBLIC_KEY );
if( !node ) { if (!node)
{
log_error ("Oops; key not found anymore!\n"); log_error ("Oops; key not found anymore!\n");
rc = G10ERR_GENERAL; err = gpg_error (GPG_ERR_GENERAL);
goto leave; goto leave;
} }
pk = node->pkt->pkt.public_key; pk = node->pkt->pkt.public_key;
keyid_from_pk (pk, keyid); keyid_from_pk (pk, keyid);
@ -98,16 +103,14 @@ do_delete_key( const char *username, int secret, int force, int *r_sec_avail )
if (have_secret_key_with_kid (keyid)) if (have_secret_key_with_kid (keyid))
{ {
*r_sec_avail = 1; *r_sec_avail = 1;
rc = -1; err = gpg_error (GPG_ERR_EOF);
goto leave; goto leave;
} }
else else
rc = 0; err = 0;
} }
if( rc ) if (opt.batch && exactmatch)
rc = 0;
else if (opt.batch && exactmatch)
okay++; okay++;
else if (opt.batch && secret) else if (opt.batch && secret)
{ {
@ -121,42 +124,49 @@ do_delete_key( const char *username, int secret, int force, int *r_sec_avail )
log_error(_("can't do this in batch mode without \"--yes\"\n")); log_error(_("can't do this in batch mode without \"--yes\"\n"));
log_info (_("(unless you specify the key by fingerprint)\n")); log_info (_("(unless you specify the key by fingerprint)\n"));
} }
else { else
{
if (secret) if (secret)
print_seckey_info (pk); print_seckey_info (pk);
else else
print_pubkey_info (NULL, pk ); print_pubkey_info (NULL, pk );
tty_printf( "\n" ); tty_printf( "\n" );
yes = cpr_get_answer_is_yes( secret? "delete_key.secret.okay" yes = cpr_get_answer_is_yes
: "delete_key.okay", (secret? "delete_key.secret.okay": "delete_key.okay",
_("Delete this key from the keyring? (y/N) ")); _("Delete this key from the keyring? (y/N) "));
if( !cpr_enabled() && secret && yes ) {
/* I think it is not required to check a passphrase; if if (!cpr_enabled() && secret && yes)
* the user is so stupid as to let others access his secret keyring {
* (and has no backup) - it is up him to read some very /* I think it is not required to check a passphrase; if the
* basic texts about security. * user is so stupid as to let others access his secret
*/ * keyring (and has no backup) - it is up him to read some
yes = cpr_get_answer_is_yes("delete_key.secret.okay", * very basic texts about security. */
yes = cpr_get_answer_is_yes
("delete_key.secret.okay",
_("This is a secret key! - really delete? (y/N) ")); _("This is a secret key! - really delete? (y/N) "));
} }
if (yes) if (yes)
okay++; okay++;
} }
if( okay ) { if (okay)
{
if (secret) if (secret)
{ {
log_error (_("deleting secret key not implemented\n")); log_error (_("deleting secret key not implemented\n"));
rc = gpg_error (GPG_ERR_NOT_IMPLEMENTED); /* FIXME */ err = gpg_error (GPG_ERR_NOT_IMPLEMENTED); /* FIXME */
goto leave; goto leave;
} }
else else
{ {
rc = keydb_delete_keyblock (hd); err = keydb_delete_keyblock (hd);
if (rc) { if (err)
log_error (_("deleting keyblock failed: %s\n"), g10_errstr(rc) ); {
log_error (_("deleting keyblock failed: %s\n"),
gpg_strerror (err));
goto leave; goto leave;
} }
} }
@ -165,7 +175,8 @@ do_delete_key( const char *username, int secret, int force, int *r_sec_avail )
revalidation_mark(). This makes sense - only deleting keys revalidation_mark(). This makes sense - only deleting keys
that have ownertrust set should trigger this. */ that have ownertrust set should trigger this. */
if (!secret && pk && clear_ownertrusts (pk)) { if (!secret && pk && clear_ownertrusts (pk))
{
if (opt.verbose) if (opt.verbose)
log_info (_("ownertrust information cleared\n")); log_info (_("ownertrust information cleared\n"));
} }
@ -174,41 +185,49 @@ do_delete_key( const char *username, int secret, int force, int *r_sec_avail )
leave: leave:
keydb_release (hd); keydb_release (hd);
release_kbnode (keyblock); release_kbnode (keyblock);
return rc; return err;
} }
/**************** /****************
* Delete a public or secret key from a keyring. * Delete a public or secret key from a keyring.
*/ */
int gpg_error_t
delete_keys (strlist_t names, int secret, int allow_both) delete_keys (strlist_t names, int secret, int allow_both)
{ {
int rc, avail, force=(!allow_both && !secret && opt.expert); gpg_error_t err;
int avail;
int force = (!allow_both && !secret && opt.expert);
/* Force allows us to delete a public key even if a secret key /* Force allows us to delete a public key even if a secret key
exists. */ exists. */
for(;names;names=names->next) { for ( ;names ; names=names->next )
rc = do_delete_key (names->d, secret, force, &avail ); {
if ( rc && avail ) { err = do_delete_key (names->d, secret, force, &avail);
if ( allow_both ) { if (err && avail)
rc = do_delete_key (names->d, 1, 0, &avail ); {
if ( !rc ) if (allow_both)
rc = do_delete_key (names->d, 0, 0, &avail ); {
err = do_delete_key (names->d, 1, 0, &avail);
if (!err)
err = do_delete_key (names->d, 0, 0, &avail);
} }
else { else
log_error(_( {
"there is a secret key for public key \"%s\"!\n"),names->d); log_error (_("there is a secret key for public key \"%s\"!\n"),
log_info(_( names->d);
"use option \"--delete-secret-keys\" to delete it first.\n")); log_info(_("use option \"--delete-secret-keys\" to delete"
" it first.\n"));
write_status_text (STATUS_DELETE_PROBLEM, "2"); write_status_text (STATUS_DELETE_PROBLEM, "2");
return rc; return err;
} }
} }
if(rc) { if (err)
log_error("%s: delete key failed: %s\n", names->d, g10_errstr(rc) ); {
return rc; log_error ("%s: delete key failed: %s\n",
names->d, gpg_strerror (err));
return err;
} }
} }

2
g10/main.h
View File

@ -230,7 +230,7 @@ int check_key_signature2( KBNODE root, KBNODE node, PKT_public_key *check_pk,
u32 *r_expiredate, int *r_expired ); u32 *r_expiredate, int *r_expired );
/*-- delkey.c --*/ /*-- delkey.c --*/
int delete_keys( strlist_t names, int secret, int allow_both ); gpg_error_t delete_keys (strlist_t names, int secret, int allow_both);
/*-- keyedit.c --*/ /*-- keyedit.c --*/
void keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr, void keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,