1998-04-20 17:52:20 +02:00
|
|
|
/* keyedit.c - keyedit stuff
|
2002-04-29 16:42:34 +02:00
|
|
|
* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
1998-04-20 17:52:20 +02:00
|
|
|
*
|
1998-12-23 13:41:40 +01:00
|
|
|
* This file is part of GnuPG.
|
1998-04-20 17:52:20 +02:00
|
|
|
*
|
1998-12-23 13:41:40 +01:00
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
1998-04-20 17:52:20 +02:00
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
1998-12-23 13:41:40 +01:00
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
1998-04-20 17:52:20 +02:00
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <assert.h>
|
1998-07-29 21:35:05 +02:00
|
|
|
#include <ctype.h>
|
1998-04-20 17:52:20 +02:00
|
|
|
|
|
|
|
#include "options.h"
|
|
|
|
#include "packet.h"
|
|
|
|
#include "errors.h"
|
|
|
|
#include "iobuf.h"
|
|
|
|
#include "keydb.h"
|
|
|
|
#include "memory.h"
|
2001-12-22 00:06:02 +01:00
|
|
|
#include "photoid.h"
|
1998-04-20 17:52:20 +02:00
|
|
|
#include "util.h"
|
|
|
|
#include "main.h"
|
1998-07-30 19:37:03 +02:00
|
|
|
#include "trustdb.h"
|
1998-04-20 17:52:20 +02:00
|
|
|
#include "filter.h"
|
|
|
|
#include "ttyio.h"
|
1998-07-31 18:45:58 +02:00
|
|
|
#include "status.h"
|
1998-04-20 17:52:20 +02:00
|
|
|
#include "i18n.h"
|
|
|
|
|
2001-08-10 16:04:32 +02:00
|
|
|
static void show_prefs( PKT_user_id *uid, int verbose );
|
2002-02-28 22:01:25 +01:00
|
|
|
static void show_key_with_all_names( KBNODE keyblock, int only_marked,
|
|
|
|
int with_revoker, int with_fpr, int with_subkeys, int with_prefs );
|
1998-07-29 21:35:05 +02:00
|
|
|
static void show_key_and_fingerprint( KBNODE keyblock );
|
2001-12-22 00:06:02 +01:00
|
|
|
static int menu_adduid( KBNODE keyblock, KBNODE sec_keyblock, int photo );
|
1998-07-29 21:35:05 +02:00
|
|
|
static void menu_deluid( KBNODE pub_keyblock, KBNODE sec_keyblock );
|
1999-05-27 09:45:46 +02:00
|
|
|
static int menu_delsig( KBNODE pub_keyblock );
|
1998-07-29 21:35:05 +02:00
|
|
|
static void menu_delkey( KBNODE pub_keyblock, KBNODE sec_keyblock );
|
2002-05-19 17:04:04 +02:00
|
|
|
static int menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock );
|
1998-10-18 17:21:22 +02:00
|
|
|
static int menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock );
|
2001-07-26 11:37:47 +02:00
|
|
|
static int menu_set_primary_uid( KBNODE pub_keyblock, KBNODE sec_keyblock );
|
2001-08-09 15:11:51 +02:00
|
|
|
static int menu_set_preferences( KBNODE pub_keyblock, KBNODE sec_keyblock );
|
1999-02-16 14:16:33 +01:00
|
|
|
static int menu_select_uid( KBNODE keyblock, int idx );
|
|
|
|
static int menu_select_key( KBNODE keyblock, int idx );
|
1998-07-29 21:35:05 +02:00
|
|
|
static int count_uids( KBNODE keyblock );
|
|
|
|
static int count_uids_with_flag( KBNODE keyblock, unsigned flag );
|
|
|
|
static int count_keys_with_flag( KBNODE keyblock, unsigned flag );
|
|
|
|
static int count_selected_uids( KBNODE keyblock );
|
2002-04-13 06:32:03 +02:00
|
|
|
static int real_uids_left( KBNODE keyblock );
|
1998-07-29 21:35:05 +02:00
|
|
|
static int count_selected_keys( KBNODE keyblock );
|
1999-04-26 17:53:01 +02:00
|
|
|
static int menu_revsig( KBNODE keyblock );
|
1999-04-28 13:06:52 +02:00
|
|
|
static int menu_revkey( KBNODE pub_keyblock, KBNODE sec_keyblock );
|
1999-06-29 21:50:54 +02:00
|
|
|
static int enable_disable_key( KBNODE keyblock, int disable );
|
2001-12-22 00:06:02 +01:00
|
|
|
static void menu_showphoto( KBNODE keyblock );
|
1998-04-20 17:52:20 +02:00
|
|
|
|
2002-04-19 13:31:53 +02:00
|
|
|
static int update_trust=0;
|
|
|
|
|
1998-09-11 07:47:32 +02:00
|
|
|
#define CONTROL_D ('D' - 'A' + 1)
|
1998-04-20 17:52:20 +02:00
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
#define NODFLG_BADSIG (1<<0) /* bad signature */
|
|
|
|
#define NODFLG_NOKEY (1<<1) /* no public key */
|
|
|
|
#define NODFLG_SIGERR (1<<2) /* other sig error */
|
|
|
|
|
|
|
|
#define NODFLG_MARK_A (1<<4) /* temporary mark */
|
2001-12-07 02:04:02 +01:00
|
|
|
#define NODFLG_DELSIG (1<<5) /* to be deleted */
|
1998-07-29 21:35:05 +02:00
|
|
|
|
|
|
|
#define NODFLG_SELUID (1<<8) /* indicate the selected userid */
|
|
|
|
#define NODFLG_SELKEY (1<<9) /* indicate the selected key */
|
1999-04-26 17:53:01 +02:00
|
|
|
#define NODFLG_SELSIG (1<<10) /* indicate a selected signature */
|
1998-04-20 17:52:20 +02:00
|
|
|
|
2000-02-17 13:41:58 +01:00
|
|
|
struct sign_attrib {
|
2001-12-21 22:02:05 +01:00
|
|
|
int non_exportable,non_revocable;
|
2000-02-17 13:41:58 +01:00
|
|
|
struct revocation_reason_info *reason;
|
1999-03-11 16:42:06 +01:00
|
|
|
};
|
|
|
|
|
1999-05-27 09:45:46 +02:00
|
|
|
/****************
|
2001-07-26 11:37:47 +02:00
|
|
|
* Print information about a signature, check it and return true
|
1999-05-27 09:45:46 +02:00
|
|
|
* if the signature is okay. NODE must be a signature packet.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
print_and_check_one_sig( KBNODE keyblock, KBNODE node,
|
|
|
|
int *inv_sigs, int *no_key, int *oth_err,
|
1999-06-16 20:25:37 +02:00
|
|
|
int *is_selfsig, int print_without_key )
|
1999-05-27 09:45:46 +02:00
|
|
|
{
|
|
|
|
PKT_signature *sig = node->pkt->pkt.signature;
|
|
|
|
int rc, sigrc;
|
|
|
|
int is_rev = sig->sig_class == 0x30;
|
|
|
|
|
|
|
|
switch( (rc = check_key_signature( keyblock, node, is_selfsig)) ) {
|
|
|
|
case 0:
|
|
|
|
node->flag &= ~(NODFLG_BADSIG|NODFLG_NOKEY|NODFLG_SIGERR);
|
|
|
|
sigrc = '!';
|
|
|
|
break;
|
|
|
|
case G10ERR_BAD_SIGN:
|
|
|
|
node->flag = NODFLG_BADSIG;
|
|
|
|
sigrc = '-';
|
|
|
|
if( inv_sigs )
|
|
|
|
++*inv_sigs;
|
|
|
|
break;
|
|
|
|
case G10ERR_NO_PUBKEY:
|
2001-03-03 17:17:55 +01:00
|
|
|
case G10ERR_UNU_PUBKEY:
|
1999-05-27 09:45:46 +02:00
|
|
|
node->flag = NODFLG_NOKEY;
|
|
|
|
sigrc = '?';
|
|
|
|
if( no_key )
|
|
|
|
++*no_key;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
node->flag = NODFLG_SIGERR;
|
|
|
|
sigrc = '%';
|
|
|
|
if( oth_err )
|
|
|
|
++*oth_err;
|
|
|
|
break;
|
|
|
|
}
|
1999-06-10 14:24:42 +02:00
|
|
|
if( sigrc != '?' || print_without_key ) {
|
2001-12-06 23:04:08 +01:00
|
|
|
tty_printf("%s%c%c %c%c%c%c%c %08lX %s ",
|
|
|
|
is_rev? "rev":"sig",sigrc,
|
|
|
|
(sig->sig_class-0x10>0 &&
|
|
|
|
sig->sig_class-0x10<4)?'0'+sig->sig_class-0x10:' ',
|
|
|
|
sig->flags.exportable?' ':'L',
|
|
|
|
sig->flags.revocable?' ':'R',
|
|
|
|
sig->flags.policy_url?'P':' ',
|
|
|
|
sig->flags.notation?'N':' ',
|
|
|
|
sig->flags.expired?'X':' ',
|
|
|
|
(ulong)sig->keyid[1], datestr_from_sig(sig));
|
1999-05-27 09:45:46 +02:00
|
|
|
if( sigrc == '%' )
|
|
|
|
tty_printf("[%s] ", g10_errstr(rc) );
|
|
|
|
else if( sigrc == '?' )
|
|
|
|
;
|
|
|
|
else if( *is_selfsig ) {
|
|
|
|
tty_printf( is_rev? _("[revocation]")
|
|
|
|
: _("[self-signature]") );
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
size_t n;
|
|
|
|
char *p = get_user_id( sig->keyid, &n );
|
2000-03-02 15:36:39 +01:00
|
|
|
tty_print_utf8_string2( p, n, 40 );
|
1999-05-27 09:45:46 +02:00
|
|
|
m_free(p);
|
|
|
|
}
|
|
|
|
tty_printf("\n");
|
2001-12-06 23:04:08 +01:00
|
|
|
|
|
|
|
if(sig->flags.policy_url && opt.show_policy_url)
|
2002-02-05 01:04:24 +01:00
|
|
|
show_policy_url(sig,3);
|
2001-12-06 23:04:08 +01:00
|
|
|
|
|
|
|
if(sig->flags.notation && opt.show_notation)
|
2002-02-05 01:04:24 +01:00
|
|
|
show_notation(sig,3);
|
1999-05-27 09:45:46 +02:00
|
|
|
}
|
2001-12-06 23:04:08 +01:00
|
|
|
|
1999-05-27 09:45:46 +02:00
|
|
|
return (sigrc == '!');
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1998-04-20 17:52:20 +02:00
|
|
|
/****************
|
|
|
|
* Check the keysigs and set the flags to indicate errors.
|
|
|
|
* Returns true if error found.
|
|
|
|
*/
|
|
|
|
static int
|
1998-07-29 21:35:05 +02:00
|
|
|
check_all_keysigs( KBNODE keyblock, int only_selected )
|
1998-04-20 17:52:20 +02:00
|
|
|
{
|
|
|
|
KBNODE kbctx;
|
|
|
|
KBNODE node;
|
|
|
|
int inv_sigs = 0;
|
|
|
|
int no_key = 0;
|
|
|
|
int oth_err = 0;
|
1998-07-29 21:35:05 +02:00
|
|
|
int has_selfsig = 0;
|
|
|
|
int mis_selfsig = 0;
|
|
|
|
int selected = !only_selected;
|
|
|
|
int anyuid = 0;
|
1998-04-20 17:52:20 +02:00
|
|
|
|
|
|
|
for( kbctx=NULL; (node=walk_kbnode( keyblock, &kbctx, 0)) ; ) {
|
1998-07-29 21:35:05 +02:00
|
|
|
if( node->pkt->pkttype == PKT_USER_ID ) {
|
|
|
|
PKT_user_id *uid = node->pkt->pkt.user_id;
|
|
|
|
|
|
|
|
if( only_selected )
|
|
|
|
selected = (node->flag & NODFLG_SELUID);
|
|
|
|
if( selected ) {
|
|
|
|
tty_printf("uid ");
|
1999-08-31 17:30:12 +02:00
|
|
|
tty_print_utf8_string( uid->name, uid->len );
|
1998-07-29 21:35:05 +02:00
|
|
|
tty_printf("\n");
|
|
|
|
if( anyuid && !has_selfsig )
|
|
|
|
mis_selfsig++;
|
|
|
|
has_selfsig = 0;
|
|
|
|
anyuid = 1;
|
1998-04-20 17:52:20 +02:00
|
|
|
}
|
|
|
|
}
|
1998-07-29 21:35:05 +02:00
|
|
|
else if( selected && node->pkt->pkttype == PKT_SIGNATURE
|
1999-05-06 14:26:10 +02:00
|
|
|
&& ( (node->pkt->pkt.signature->sig_class&~3) == 0x10
|
|
|
|
|| node->pkt->pkt.signature->sig_class == 0x30 ) ) {
|
1999-05-27 09:45:46 +02:00
|
|
|
int selfsig;
|
1998-04-20 17:52:20 +02:00
|
|
|
|
1999-05-27 09:45:46 +02:00
|
|
|
if( print_and_check_one_sig( keyblock, node, &inv_sigs,
|
1999-06-16 20:25:37 +02:00
|
|
|
&no_key, &oth_err, &selfsig, 0 ) ) {
|
1999-05-27 09:45:46 +02:00
|
|
|
if( selfsig )
|
|
|
|
has_selfsig = 1;
|
1998-04-20 17:52:20 +02:00
|
|
|
}
|
1999-05-27 09:45:46 +02:00
|
|
|
/* Hmmm: should we update the trustdb here? */
|
1998-04-20 17:52:20 +02:00
|
|
|
}
|
|
|
|
}
|
1998-07-29 21:35:05 +02:00
|
|
|
if( !has_selfsig )
|
|
|
|
mis_selfsig++;
|
|
|
|
if( inv_sigs == 1 )
|
2001-05-25 09:22:34 +02:00
|
|
|
tty_printf(_("1 bad signature\n") );
|
1998-07-29 21:35:05 +02:00
|
|
|
else if( inv_sigs )
|
|
|
|
tty_printf(_("%d bad signatures\n"), inv_sigs );
|
|
|
|
if( no_key == 1 )
|
|
|
|
tty_printf(_("1 signature not checked due to a missing key\n") );
|
|
|
|
else if( no_key )
|
|
|
|
tty_printf(_("%d signatures not checked due to missing keys\n"), no_key );
|
|
|
|
if( oth_err == 1 )
|
|
|
|
tty_printf(_("1 signature not checked due to an error\n") );
|
|
|
|
else if( oth_err )
|
|
|
|
tty_printf(_("%d signatures not checked due to errors\n"), oth_err );
|
|
|
|
if( mis_selfsig == 1 )
|
1999-09-01 15:40:07 +02:00
|
|
|
tty_printf(_("1 user ID without valid self-signature detected\n"));
|
1998-07-29 21:35:05 +02:00
|
|
|
else if( mis_selfsig )
|
1999-09-01 15:40:07 +02:00
|
|
|
tty_printf(_("%d user IDs without valid self-signatures detected\n"),
|
1998-07-29 21:35:05 +02:00
|
|
|
mis_selfsig);
|
1998-04-20 17:52:20 +02:00
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
return inv_sigs || no_key || oth_err || mis_selfsig;
|
1998-04-20 17:52:20 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-03-11 16:42:06 +01:00
|
|
|
|
|
|
|
|
2000-02-17 13:41:58 +01:00
|
|
|
static int
|
|
|
|
sign_mk_attrib( PKT_signature *sig, void *opaque )
|
1999-03-11 16:42:06 +01:00
|
|
|
{
|
2000-02-17 13:41:58 +01:00
|
|
|
struct sign_attrib *attrib = opaque;
|
1999-03-11 16:42:06 +01:00
|
|
|
byte buf[8];
|
|
|
|
|
|
|
|
if( attrib->non_exportable ) {
|
|
|
|
buf[0] = 0; /* not exportable */
|
|
|
|
build_sig_subpkt( sig, SIGSUBPKT_EXPORTABLE, buf, 1 );
|
|
|
|
}
|
2001-12-07 02:14:15 +01:00
|
|
|
|
2001-12-21 22:02:05 +01:00
|
|
|
if( attrib->non_revocable ) {
|
|
|
|
buf[0] = 0; /* not revocable */
|
|
|
|
build_sig_subpkt( sig, SIGSUBPKT_REVOCABLE, buf, 1 );
|
2001-12-07 02:14:15 +01:00
|
|
|
}
|
|
|
|
|
2000-02-17 13:41:58 +01:00
|
|
|
if( attrib->reason )
|
|
|
|
revocation_reason_build_cb( sig, attrib->reason );
|
1999-03-11 16:42:06 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1998-04-20 17:52:20 +02:00
|
|
|
/****************
|
1998-07-29 21:35:05 +02:00
|
|
|
* Loop over all locusr and and sign the uids after asking.
|
|
|
|
* If no user id is marked, all user ids will be signed;
|
|
|
|
* if some user_ids are marked those will be signed.
|
1998-04-20 17:52:20 +02:00
|
|
|
*/
|
1998-07-29 21:35:05 +02:00
|
|
|
static int
|
2001-12-21 22:02:05 +01:00
|
|
|
sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
|
|
|
|
int local , int nonrevocable )
|
1998-04-20 17:52:20 +02:00
|
|
|
{
|
|
|
|
int rc = 0;
|
1998-06-29 14:30:57 +02:00
|
|
|
SK_LIST sk_list = NULL;
|
|
|
|
SK_LIST sk_rover = NULL;
|
1998-10-07 15:30:43 +02:00
|
|
|
PKT_secret_key *sk = NULL;
|
1998-07-29 21:35:05 +02:00
|
|
|
KBNODE node, uidnode;
|
1998-11-08 18:23:14 +01:00
|
|
|
PKT_public_key *primary_pk=NULL;
|
1998-07-29 21:35:05 +02:00
|
|
|
int select_all = !count_selected_uids(keyblock);
|
2002-05-07 00:38:53 +02:00
|
|
|
int all_v3=1;
|
2002-04-12 06:07:26 +02:00
|
|
|
|
|
|
|
/* Are there any non-v3 sigs on this key already? */
|
|
|
|
if(opt.pgp2)
|
|
|
|
for(node=keyblock;node;node=node->next)
|
|
|
|
if(node->pkt->pkttype==PKT_SIGNATURE &&
|
|
|
|
node->pkt->pkt.signature->version>3)
|
2002-05-04 00:31:30 +02:00
|
|
|
{
|
|
|
|
all_v3=0;
|
|
|
|
break;
|
|
|
|
}
|
2001-12-06 23:04:08 +01:00
|
|
|
|
2001-09-28 19:00:00 +02:00
|
|
|
/* build a list of all signators.
|
|
|
|
*
|
|
|
|
* We use the CERT flag to request the primary which must always
|
|
|
|
* be one which is capable of signing keys. I can't see a reason
|
2001-12-07 02:00:21 +01:00
|
|
|
* why to sign keys using a subkey. Implementation of USAGE_CERT
|
2001-09-28 19:00:00 +02:00
|
|
|
* is just a hack in getkey.c and does not mean that a subkey
|
|
|
|
* marked as certification capable will be used */
|
|
|
|
rc=build_sk_list( locusr, &sk_list, 0, PUBKEY_USAGE_SIG|PUBKEY_USAGE_CERT);
|
1998-04-20 17:52:20 +02:00
|
|
|
if( rc )
|
|
|
|
goto leave;
|
|
|
|
|
2001-12-07 02:00:21 +01:00
|
|
|
/* loop over all signators */
|
1998-07-29 21:35:05 +02:00
|
|
|
for( sk_rover = sk_list; sk_rover; sk_rover = sk_rover->next ) {
|
2002-05-07 06:27:40 +02:00
|
|
|
u32 sk_keyid[2],pk_keyid[2];
|
1998-04-20 17:52:20 +02:00
|
|
|
size_t n;
|
1998-07-29 21:35:05 +02:00
|
|
|
char *p;
|
2002-05-07 00:38:53 +02:00
|
|
|
int force_v4=0,class=0,selfsig=0;
|
2001-12-07 02:14:15 +01:00
|
|
|
u32 duration=0,timestamp=0;
|
1998-04-20 17:52:20 +02:00
|
|
|
|
2002-05-07 00:38:53 +02:00
|
|
|
if(local || nonrevocable ||
|
|
|
|
opt.cert_policy_url || opt.cert_notation_data)
|
|
|
|
force_v4=1;
|
|
|
|
|
1998-10-07 15:30:43 +02:00
|
|
|
/* we have to use a copy of the sk, because make_keysig_packet
|
|
|
|
* may remove the protection from sk and if we did other
|
|
|
|
* changes to the secret key, we would save the unprotected
|
|
|
|
* version */
|
|
|
|
if( sk )
|
|
|
|
free_secret_key(sk);
|
|
|
|
sk = copy_secret_key( NULL, sk_rover->sk );
|
|
|
|
keyid_from_sk( sk, sk_keyid );
|
1998-07-29 21:35:05 +02:00
|
|
|
/* set mark A for all selected user ids */
|
|
|
|
for( node=keyblock; node; node = node->next ) {
|
|
|
|
if( select_all || (node->flag & NODFLG_SELUID) )
|
|
|
|
node->flag |= NODFLG_MARK_A;
|
|
|
|
else
|
|
|
|
node->flag &= ~NODFLG_MARK_A;
|
1998-04-20 17:52:20 +02:00
|
|
|
}
|
1998-07-29 21:35:05 +02:00
|
|
|
/* reset mark for uids which are already signed */
|
|
|
|
uidnode = NULL;
|
|
|
|
for( node=keyblock; node; node = node->next ) {
|
2001-12-07 02:14:15 +01:00
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_KEY ) {
|
|
|
|
primary_pk=node->pkt->pkt.public_key;
|
2002-05-07 00:38:53 +02:00
|
|
|
keyid_from_pk( primary_pk, pk_keyid );
|
|
|
|
|
|
|
|
/* Is this a self-sig? */
|
|
|
|
if(pk_keyid[0]==sk_keyid[0] && pk_keyid[1]==sk_keyid[1])
|
|
|
|
selfsig=1;
|
2001-12-07 02:14:15 +01:00
|
|
|
}
|
|
|
|
else if( node->pkt->pkttype == PKT_USER_ID ) {
|
1998-07-29 21:35:05 +02:00
|
|
|
uidnode = (node->flag & NODFLG_MARK_A)? node : NULL;
|
2002-05-17 20:49:30 +02:00
|
|
|
if(uidnode)
|
2001-12-07 02:00:21 +01:00
|
|
|
{
|
2002-05-06 18:40:33 +02:00
|
|
|
char *user=utf8_to_native(uidnode->pkt->pkt.user_id->name,
|
|
|
|
uidnode->pkt->pkt.user_id->len,
|
|
|
|
0);
|
|
|
|
|
2002-05-17 20:49:30 +02:00
|
|
|
if(uidnode->pkt->pkt.user_id->is_revoked)
|
2001-12-07 02:00:21 +01:00
|
|
|
{
|
2002-05-17 20:49:30 +02:00
|
|
|
tty_printf(_("User ID \"%s\" is revoked."),user);
|
|
|
|
|
|
|
|
if(opt.expert)
|
|
|
|
{
|
|
|
|
tty_printf("\n");
|
|
|
|
/* No, so remove the mark and continue */
|
|
|
|
if(!cpr_get_answer_is_yes("sign_uid.revoke_okay",
|
|
|
|
_("Are you sure you "
|
|
|
|
"still want to sign "
|
|
|
|
"it? (y/N) ")))
|
|
|
|
uidnode->flag &= ~NODFLG_MARK_A;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
uidnode->flag &= ~NODFLG_MARK_A;
|
|
|
|
tty_printf(_(" Unable to sign.\n"));
|
|
|
|
}
|
2001-12-07 02:00:21 +01:00
|
|
|
}
|
2002-05-17 20:49:30 +02:00
|
|
|
else if(!uidnode->pkt->pkt.user_id->created)
|
2002-04-12 06:07:26 +02:00
|
|
|
{
|
2002-05-17 20:49:30 +02:00
|
|
|
tty_printf(_("Warning: user ID \"%s\" is not "
|
|
|
|
"self-signed.\n"),user);
|
2002-04-12 06:07:26 +02:00
|
|
|
}
|
2002-05-17 20:49:30 +02:00
|
|
|
|
|
|
|
m_free(user);
|
2001-12-07 02:00:21 +01:00
|
|
|
}
|
1998-07-29 21:35:05 +02:00
|
|
|
}
|
|
|
|
else if( uidnode && node->pkt->pkttype == PKT_SIGNATURE
|
1998-04-20 17:52:20 +02:00
|
|
|
&& (node->pkt->pkt.signature->sig_class&~3) == 0x10 ) {
|
1998-07-29 21:35:05 +02:00
|
|
|
if( sk_keyid[0] == node->pkt->pkt.signature->keyid[0]
|
|
|
|
&& sk_keyid[1] == node->pkt->pkt.signature->keyid[1] ) {
|
2001-09-07 13:40:19 +02:00
|
|
|
char buf[50];
|
2002-05-06 18:40:33 +02:00
|
|
|
char *user=utf8_to_native(uidnode->pkt->pkt.user_id->name,
|
|
|
|
uidnode->pkt->pkt.user_id->len,
|
|
|
|
0);
|
2001-09-07 13:40:19 +02:00
|
|
|
|
2002-05-07 06:27:40 +02:00
|
|
|
/* It's a v3 self-sig. Make it into a v4 self-sig? */
|
|
|
|
if(node->pkt->pkt.signature->version<4 && selfsig)
|
|
|
|
{
|
|
|
|
tty_printf(_("The self-signature on \"%s\"\n"
|
|
|
|
"is a PGP 2.x-style signature.\n"),user);
|
|
|
|
|
|
|
|
/* Note that the regular PGP2 warning below
|
|
|
|
still applies if there are no v4 sigs on
|
|
|
|
this key at all. */
|
|
|
|
|
|
|
|
if(opt.expert)
|
|
|
|
if(cpr_get_answer_is_yes("sign_uid.v4_promote_okay",
|
|
|
|
_("Do you want to promote "
|
|
|
|
"it to an OpenPGP self-"
|
|
|
|
"signature? (y/N) ")))
|
|
|
|
{
|
|
|
|
force_v4=1;
|
|
|
|
node->flag|=NODFLG_DELSIG;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-12-07 02:04:02 +01:00
|
|
|
if(!node->pkt->pkt.signature->flags.exportable && !local)
|
|
|
|
{
|
|
|
|
/* It's a local sig, and we want to make a
|
|
|
|
exportable sig. */
|
|
|
|
tty_printf(_("Your current signature on \"%s\"\n"
|
2002-05-06 18:40:33 +02:00
|
|
|
"is a local signature.\n"),user);
|
|
|
|
|
2002-05-07 06:27:40 +02:00
|
|
|
if(cpr_get_answer_is_yes("sign_uid.local_promote_okay",
|
2002-04-12 06:07:26 +02:00
|
|
|
_("Do you want to promote "
|
|
|
|
"it to a full exportable "
|
|
|
|
"signature? (y/N) ")))
|
2001-12-07 02:04:02 +01:00
|
|
|
{
|
|
|
|
/* Mark these for later deletion. We
|
|
|
|
don't want to delete them here, just in
|
|
|
|
case the replacement signature doesn't
|
|
|
|
happen for some reason. We only delete
|
|
|
|
these after the replacement is already
|
|
|
|
in place. */
|
|
|
|
|
|
|
|
node->flag|=NODFLG_DELSIG;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-04-26 17:53:01 +02:00
|
|
|
/* Fixme: see whether there is a revocation in which
|
|
|
|
* case we should allow to sign it again. */
|
2002-04-08 17:10:51 +02:00
|
|
|
if (!node->pkt->pkt.signature->flags.exportable && local)
|
|
|
|
tty_printf(_(
|
|
|
|
"\"%s\" was already locally signed by key %08lX\n"),
|
2002-05-06 18:40:33 +02:00
|
|
|
user,(ulong)sk_keyid[1] );
|
2002-04-08 17:10:51 +02:00
|
|
|
else
|
|
|
|
tty_printf(_(
|
2002-04-11 06:04:41 +02:00
|
|
|
"\"%s\" was already signed by key %08lX\n"),
|
2002-05-06 18:40:33 +02:00
|
|
|
user,(ulong)sk_keyid[1] );
|
2001-09-07 13:40:19 +02:00
|
|
|
sprintf (buf, "%08lX%08lX",
|
|
|
|
(ulong)sk->keyid[0], (ulong)sk->keyid[1] );
|
|
|
|
write_status_text (STATUS_ALREADY_SIGNED, buf);
|
1998-07-29 21:35:05 +02:00
|
|
|
uidnode->flag &= ~NODFLG_MARK_A; /* remove mark */
|
2002-05-06 18:40:33 +02:00
|
|
|
|
|
|
|
m_free(user);
|
1998-04-20 17:52:20 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1998-07-29 21:35:05 +02:00
|
|
|
/* check whether any uids are left for signing */
|
|
|
|
if( !count_uids_with_flag(keyblock, NODFLG_MARK_A) ) {
|
|
|
|
tty_printf(_("Nothing to sign with key %08lX\n"),
|
|
|
|
(ulong)sk_keyid[1] );
|
1998-04-20 17:52:20 +02:00
|
|
|
continue;
|
1998-07-29 21:35:05 +02:00
|
|
|
}
|
1998-09-28 21:25:31 +02:00
|
|
|
/* Ask whether we really should sign these user id(s) */
|
1998-07-29 21:35:05 +02:00
|
|
|
tty_printf("\n");
|
2002-02-28 22:01:25 +01:00
|
|
|
show_key_with_all_names( keyblock, 1, 0, 1, 0, 0 );
|
1998-10-07 15:30:43 +02:00
|
|
|
tty_printf("\n");
|
2001-12-06 23:04:08 +01:00
|
|
|
|
2002-05-07 00:38:53 +02:00
|
|
|
if(primary_pk->expiredate && !selfsig)
|
2001-12-07 02:14:15 +01:00
|
|
|
{
|
|
|
|
u32 now=make_timestamp();
|
|
|
|
|
|
|
|
if(primary_pk->expiredate<=now)
|
|
|
|
{
|
|
|
|
tty_printf(_("This key has expired!"));
|
|
|
|
|
|
|
|
if(opt.expert)
|
|
|
|
{
|
2002-04-12 06:07:26 +02:00
|
|
|
tty_printf(" ");
|
|
|
|
if(!cpr_get_answer_is_yes("sign_uid.expired_okay",
|
|
|
|
_("Are you sure you still "
|
|
|
|
"want to sign it? (y/N) ")))
|
2001-12-07 02:14:15 +01:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2002-04-12 06:07:26 +02:00
|
|
|
tty_printf(_(" Unable to sign.\n"));
|
2001-12-07 02:14:15 +01:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2002-04-23 19:54:38 +02:00
|
|
|
char *answer;
|
|
|
|
|
2001-12-07 02:14:15 +01:00
|
|
|
tty_printf(_("This key is due to expire on %s.\n"),
|
|
|
|
expirestr_from_pk(primary_pk));
|
2002-04-23 19:54:38 +02:00
|
|
|
|
|
|
|
answer=cpr_get("sign_uid.expire",
|
|
|
|
_("Do you want your signature to "
|
|
|
|
"expire at the same time? (Y/n) "));
|
|
|
|
if(answer_is_yes_no_default(answer,1))
|
2001-12-07 02:14:15 +01:00
|
|
|
{
|
|
|
|
/* This fixes the signature timestamp we're going
|
|
|
|
to make as now. This is so the expiration date
|
|
|
|
is exactly correct, and not a few seconds off
|
|
|
|
(due to the time it takes to answer the
|
|
|
|
questions, enter the passphrase, etc). */
|
|
|
|
timestamp=now;
|
|
|
|
duration=primary_pk->expiredate-now;
|
|
|
|
force_v4=1;
|
|
|
|
}
|
2002-04-23 19:54:38 +02:00
|
|
|
|
|
|
|
cpr_kill_prompt();
|
|
|
|
m_free(answer);
|
2001-12-07 02:14:15 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Only ask for duration if we haven't already set it to match
|
|
|
|
the expiration of the pk */
|
2002-05-07 00:38:53 +02:00
|
|
|
if(opt.ask_cert_expire && !duration && !selfsig)
|
2001-12-07 02:14:15 +01:00
|
|
|
duration=ask_expire_interval(1);
|
|
|
|
|
|
|
|
if(duration)
|
|
|
|
force_v4=1;
|
|
|
|
|
2002-04-12 06:07:26 +02:00
|
|
|
/* Is --pgp2 on, it's a v3 key, all the sigs on the key are
|
|
|
|
currently v3 and we're about to sign it with a v4 sig? If
|
|
|
|
so, danger! */
|
|
|
|
if(opt.pgp2 && all_v3 &&
|
|
|
|
(sk->version>3 || force_v4) && primary_pk->version<=3)
|
|
|
|
{
|
|
|
|
tty_printf(_("You may not make an OpenPGP signature on a "
|
|
|
|
"PGP 2.x key while in --pgp2 mode.\n"));
|
|
|
|
tty_printf(_("This would make the key unusable in PGP 2.x.\n"));
|
|
|
|
|
|
|
|
if(opt.expert)
|
|
|
|
{
|
|
|
|
if(!cpr_get_answer_is_yes("sign_uid.v4_on_v3_okay",
|
|
|
|
_("Are you sure you still "
|
|
|
|
"want to sign it? (y/N) ")))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
all_v3=0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2002-05-07 00:38:53 +02:00
|
|
|
if(selfsig)
|
|
|
|
;
|
|
|
|
else if(opt.batch)
|
2002-04-20 00:38:20 +02:00
|
|
|
class=0x10+opt.def_cert_check_level;
|
2001-12-06 23:04:08 +01:00
|
|
|
else
|
|
|
|
{
|
|
|
|
char *answer;
|
|
|
|
|
|
|
|
tty_printf(_("How carefully have you verified the key you are "
|
|
|
|
"about to sign actually belongs\nto the person named "
|
|
|
|
"above? If you don't know what to answer, enter \"0\".\n"));
|
|
|
|
tty_printf("\n");
|
|
|
|
tty_printf(_(" (0) I will not answer.%s\n"),
|
2002-04-20 00:38:20 +02:00
|
|
|
opt.def_cert_check_level==0?" (default)":"");
|
2001-12-06 23:04:08 +01:00
|
|
|
tty_printf(_(" (1) I have not checked at all.%s\n"),
|
2002-04-20 00:38:20 +02:00
|
|
|
opt.def_cert_check_level==1?" (default)":"");
|
2001-12-06 23:04:08 +01:00
|
|
|
tty_printf(_(" (2) I have done casual checking.%s\n"),
|
2002-04-20 00:38:20 +02:00
|
|
|
opt.def_cert_check_level==2?" (default)":"");
|
2001-12-06 23:04:08 +01:00
|
|
|
tty_printf(_(" (3) I have done very careful checking.%s\n"),
|
2002-04-20 00:38:20 +02:00
|
|
|
opt.def_cert_check_level==3?" (default)":"");
|
2001-12-06 23:04:08 +01:00
|
|
|
tty_printf("\n");
|
|
|
|
|
|
|
|
while(class==0)
|
|
|
|
{
|
|
|
|
answer = cpr_get("sign_uid.class",_("Your selection? "));
|
|
|
|
|
|
|
|
if(answer[0]=='\0')
|
2002-04-20 00:38:20 +02:00
|
|
|
class=0x10+opt.def_cert_check_level; /* Default */
|
2002-05-10 19:28:32 +02:00
|
|
|
else if(ascii_strcasecmp(answer,"0")==0)
|
2001-12-06 23:04:08 +01:00
|
|
|
class=0x10; /* Generic */
|
2002-05-10 19:28:32 +02:00
|
|
|
else if(ascii_strcasecmp(answer,"1")==0)
|
2001-12-06 23:04:08 +01:00
|
|
|
class=0x11; /* Persona */
|
2002-05-10 19:28:32 +02:00
|
|
|
else if(ascii_strcasecmp(answer,"2")==0)
|
2001-12-06 23:04:08 +01:00
|
|
|
class=0x12; /* Casual */
|
2002-05-10 19:28:32 +02:00
|
|
|
else if(ascii_strcasecmp(answer,"3")==0)
|
2001-12-06 23:04:08 +01:00
|
|
|
class=0x13; /* Positive */
|
|
|
|
else
|
|
|
|
tty_printf(_("Invalid selection.\n"));
|
|
|
|
|
|
|
|
m_free(answer);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
tty_printf(_("Are you really sure that you want to sign this key\n"
|
|
|
|
"with your key: \""));
|
1998-07-29 21:35:05 +02:00
|
|
|
p = get_user_id( sk_keyid, &n );
|
1999-08-31 17:30:12 +02:00
|
|
|
tty_print_utf8_string( p, n );
|
1998-08-11 19:29:34 +02:00
|
|
|
m_free(p); p = NULL;
|
2001-12-06 23:04:08 +01:00
|
|
|
tty_printf("\"\n");
|
1998-08-11 19:29:34 +02:00
|
|
|
|
2002-05-07 06:27:40 +02:00
|
|
|
if(selfsig)
|
|
|
|
{
|
|
|
|
tty_printf(_("\nThis will be a self-signature.\n"));
|
2001-12-06 23:04:08 +01:00
|
|
|
|
2002-05-07 06:27:40 +02:00
|
|
|
if( local )
|
|
|
|
tty_printf(
|
|
|
|
_("\nWarning: the signature will not be marked "
|
|
|
|
"as non-exportable.\n"));
|
2001-12-21 22:02:05 +01:00
|
|
|
|
2002-05-07 06:27:40 +02:00
|
|
|
if( nonrevocable )
|
|
|
|
tty_printf(
|
|
|
|
_("\nWarning: the signature will not be marked "
|
|
|
|
"as non-revocable.\n"));
|
|
|
|
}
|
|
|
|
else
|
2001-12-06 23:04:08 +01:00
|
|
|
{
|
2002-05-07 06:27:40 +02:00
|
|
|
if( local )
|
|
|
|
tty_printf(
|
|
|
|
_("\nThe signature will be marked as non-exportable.\n"));
|
1999-03-11 16:42:06 +01:00
|
|
|
|
2002-05-07 06:27:40 +02:00
|
|
|
if( nonrevocable )
|
|
|
|
tty_printf(
|
|
|
|
_("\nThe signature will be marked as non-revocable.\n"));
|
2001-12-06 23:04:08 +01:00
|
|
|
|
2002-05-07 06:27:40 +02:00
|
|
|
switch(class)
|
|
|
|
{
|
|
|
|
case 0x11:
|
|
|
|
tty_printf(_("\nI have not checked this key at all.\n"));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x12:
|
|
|
|
tty_printf(_("\nI have checked this key casually.\n"));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 0x13:
|
|
|
|
tty_printf(_("\nI have checked this key very carefully.\n"));
|
|
|
|
break;
|
|
|
|
}
|
2001-12-06 23:04:08 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
tty_printf("\n");
|
1999-04-18 10:18:52 +02:00
|
|
|
|
|
|
|
if( opt.batch && opt.answer_yes )
|
2001-12-06 23:04:08 +01:00
|
|
|
;
|
1999-04-18 10:18:52 +02:00
|
|
|
else if( !cpr_get_answer_is_yes("sign_uid.okay", _("Really sign? ")) )
|
|
|
|
continue;
|
2001-12-06 23:04:08 +01:00
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
/* now we can sign the user ids */
|
|
|
|
reloop: /* (must use this, because we are modifing the list) */
|
|
|
|
primary_pk = NULL;
|
|
|
|
for( node=keyblock; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_KEY )
|
|
|
|
primary_pk = node->pkt->pkt.public_key;
|
|
|
|
else if( node->pkt->pkttype == PKT_USER_ID
|
|
|
|
&& (node->flag & NODFLG_MARK_A) ) {
|
|
|
|
PACKET *pkt;
|
|
|
|
PKT_signature *sig;
|
2000-02-17 13:41:58 +01:00
|
|
|
struct sign_attrib attrib;
|
1998-07-29 21:35:05 +02:00
|
|
|
|
|
|
|
assert( primary_pk );
|
1999-03-11 16:42:06 +01:00
|
|
|
memset( &attrib, 0, sizeof attrib );
|
|
|
|
attrib.non_exportable = local;
|
2001-12-21 22:02:05 +01:00
|
|
|
attrib.non_revocable = nonrevocable;
|
1998-07-29 21:35:05 +02:00
|
|
|
node->flag &= ~NODFLG_MARK_A;
|
2001-08-01 12:30:24 +02:00
|
|
|
|
2001-12-21 22:02:05 +01:00
|
|
|
/* we force creation of a v4 signature for local
|
2001-08-01 12:30:24 +02:00
|
|
|
* signatures, otherwise we would not generate the
|
|
|
|
* subpacket with v3 keys and the signature becomes
|
|
|
|
* exportable */
|
2002-05-07 00:38:53 +02:00
|
|
|
|
|
|
|
if(selfsig)
|
|
|
|
rc = make_keysig_packet( &sig, primary_pk,
|
|
|
|
node->pkt->pkt.user_id,
|
|
|
|
NULL,
|
|
|
|
sk,
|
|
|
|
0x13, 0, force_v4?4:0, 0, 0,
|
|
|
|
keygen_add_std_prefs, primary_pk);
|
|
|
|
else
|
|
|
|
rc = make_keysig_packet( &sig, primary_pk,
|
|
|
|
node->pkt->pkt.user_id,
|
|
|
|
NULL,
|
|
|
|
sk,
|
|
|
|
class, 0, force_v4?4:0,
|
|
|
|
timestamp, duration,
|
|
|
|
sign_mk_attrib, &attrib );
|
1998-07-29 21:35:05 +02:00
|
|
|
if( rc ) {
|
|
|
|
log_error(_("signing failed: %s\n"), g10_errstr(rc));
|
|
|
|
goto leave;
|
1998-04-20 17:52:20 +02:00
|
|
|
}
|
2001-12-07 02:04:02 +01:00
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
*ret_modified = 1; /* we changed the keyblock */
|
2002-04-19 13:31:53 +02:00
|
|
|
update_trust = 1;
|
1998-07-29 21:35:05 +02:00
|
|
|
|
|
|
|
pkt = m_alloc_clear( sizeof *pkt );
|
|
|
|
pkt->pkttype = PKT_SIGNATURE;
|
|
|
|
pkt->pkt.signature = sig;
|
|
|
|
insert_kbnode( node, new_kbnode(pkt), PKT_SIGNATURE );
|
|
|
|
goto reloop;
|
1998-04-20 17:52:20 +02:00
|
|
|
}
|
|
|
|
}
|
2001-12-07 02:04:02 +01:00
|
|
|
|
2002-05-07 06:27:40 +02:00
|
|
|
/* Delete any sigs that got promoted */
|
2001-12-07 02:04:02 +01:00
|
|
|
for( node=keyblock; node; node = node->next )
|
|
|
|
if( node->flag & NODFLG_DELSIG)
|
|
|
|
delete_kbnode(node);
|
1998-07-29 21:35:05 +02:00
|
|
|
} /* end loop over signators */
|
1998-04-20 17:52:20 +02:00
|
|
|
|
|
|
|
leave:
|
1998-06-29 14:30:57 +02:00
|
|
|
release_sk_list( sk_list );
|
1998-10-07 15:30:43 +02:00
|
|
|
if( sk )
|
|
|
|
free_secret_key(sk);
|
1998-04-20 17:52:20 +02:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
/****************
|
|
|
|
* Change the passphrase of the primary and all secondary keys.
|
|
|
|
* We use only one passphrase for all keys.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
change_passphrase( KBNODE keyblock )
|
1998-04-20 17:52:20 +02:00
|
|
|
{
|
|
|
|
int rc = 0;
|
1998-07-29 21:35:05 +02:00
|
|
|
int changed=0;
|
1998-04-20 17:52:20 +02:00
|
|
|
KBNODE node;
|
1998-06-29 14:30:57 +02:00
|
|
|
PKT_secret_key *sk;
|
1998-05-26 15:38:00 +02:00
|
|
|
char *passphrase = NULL;
|
2000-01-14 18:26:00 +01:00
|
|
|
int no_primary_secrets = 0;
|
1998-04-20 17:52:20 +02:00
|
|
|
|
1998-06-29 14:30:57 +02:00
|
|
|
node = find_kbnode( keyblock, PKT_SECRET_KEY );
|
1998-04-20 17:52:20 +02:00
|
|
|
if( !node ) {
|
|
|
|
log_error("Oops; secret key not found anymore!\n");
|
|
|
|
goto leave;
|
|
|
|
}
|
1998-06-29 14:30:57 +02:00
|
|
|
sk = node->pkt->pkt.secret_key;
|
1998-04-20 17:52:20 +02:00
|
|
|
|
1998-06-29 14:30:57 +02:00
|
|
|
switch( is_secret_key_protected( sk ) ) {
|
1998-04-20 17:52:20 +02:00
|
|
|
case -1:
|
|
|
|
rc = G10ERR_PUBKEY_ALGO;
|
|
|
|
break;
|
|
|
|
case 0:
|
1998-07-06 12:23:57 +02:00
|
|
|
tty_printf(_("This key is not protected.\n"));
|
1998-04-20 17:52:20 +02:00
|
|
|
break;
|
|
|
|
default:
|
2000-01-14 18:26:00 +01:00
|
|
|
if( sk->protect.s2k.mode == 1001 ) {
|
|
|
|
tty_printf(_("Secret parts of primary key are not available.\n"));
|
|
|
|
no_primary_secrets = 1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
tty_printf(_("Key is protected.\n"));
|
|
|
|
rc = check_secret_key( sk, 0 );
|
|
|
|
if( !rc )
|
|
|
|
passphrase = get_last_passphrase();
|
|
|
|
}
|
1998-04-20 17:52:20 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1998-05-26 15:38:00 +02:00
|
|
|
/* unprotect all subkeys (use the supplied passphrase or ask)*/
|
1998-07-29 21:35:05 +02:00
|
|
|
for(node=keyblock; !rc && node; node = node->next ) {
|
1998-06-29 14:30:57 +02:00
|
|
|
if( node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
|
|
|
|
PKT_secret_key *subsk = node->pkt->pkt.secret_key;
|
1998-05-26 15:38:00 +02:00
|
|
|
set_next_passphrase( passphrase );
|
1998-09-11 07:47:32 +02:00
|
|
|
rc = check_secret_key( subsk, 0 );
|
2000-01-14 18:26:00 +01:00
|
|
|
if( !rc && !passphrase )
|
|
|
|
passphrase = get_last_passphrase();
|
1998-05-26 15:38:00 +02:00
|
|
|
}
|
|
|
|
}
|
1998-05-05 22:34:20 +02:00
|
|
|
|
1998-04-20 17:52:20 +02:00
|
|
|
if( rc )
|
1998-07-06 12:23:57 +02:00
|
|
|
tty_printf(_("Can't edit this key: %s\n"), g10_errstr(rc));
|
1998-04-20 17:52:20 +02:00
|
|
|
else {
|
1998-05-04 20:49:26 +02:00
|
|
|
DEK *dek = NULL;
|
1998-05-03 17:42:08 +02:00
|
|
|
STRING2KEY *s2k = m_alloc_secure( sizeof *s2k );
|
2002-01-20 19:33:04 +01:00
|
|
|
const char *errtext = NULL;
|
1998-04-20 17:52:20 +02:00
|
|
|
|
1998-05-04 20:49:26 +02:00
|
|
|
tty_printf(_("Enter the new passphrase for this secret key.\n\n") );
|
1998-04-20 17:52:20 +02:00
|
|
|
|
1998-05-26 15:38:00 +02:00
|
|
|
set_next_passphrase( NULL );
|
1998-04-20 17:52:20 +02:00
|
|
|
for(;;) {
|
1998-09-28 21:25:31 +02:00
|
|
|
s2k->mode = opt.s2k_mode;
|
|
|
|
s2k->hash_algo = opt.s2k_digest_algo;
|
2002-01-20 19:33:04 +01:00
|
|
|
dek = passphrase_to_dek( NULL, 0, opt.s2k_cipher_algo,
|
|
|
|
s2k, 2, errtext);
|
1998-05-04 20:49:26 +02:00
|
|
|
if( !dek ) {
|
2002-01-20 19:33:04 +01:00
|
|
|
errtext = _("passphrase not correctly repeated; try again");
|
|
|
|
tty_printf ("%s.\n", errtext);
|
1998-05-04 20:49:26 +02:00
|
|
|
}
|
|
|
|
else if( !dek->keylen ) {
|
1998-04-20 17:52:20 +02:00
|
|
|
rc = 0;
|
1998-05-04 20:49:26 +02:00
|
|
|
tty_printf(_( "You don't want a passphrase -"
|
|
|
|
" this is probably a *bad* idea!\n\n"));
|
1998-11-27 12:42:49 +01:00
|
|
|
if( cpr_get_answer_is_yes("change_passwd.empty.okay",
|
1998-07-31 18:45:58 +02:00
|
|
|
_("Do you really want to do this? ")))
|
1998-04-20 17:52:20 +02:00
|
|
|
changed++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else { /* okay */
|
2000-01-14 18:26:00 +01:00
|
|
|
rc = 0;
|
|
|
|
if( !no_primary_secrets ) {
|
|
|
|
sk->protect.algo = dek->algo;
|
|
|
|
sk->protect.s2k = *s2k;
|
|
|
|
rc = protect_secret_key( sk, dek );
|
|
|
|
}
|
1998-05-26 15:38:00 +02:00
|
|
|
for(node=keyblock; !rc && node; node = node->next ) {
|
1998-06-29 14:30:57 +02:00
|
|
|
if( node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
|
|
|
|
PKT_secret_key *subsk = node->pkt->pkt.secret_key;
|
|
|
|
subsk->protect.algo = dek->algo;
|
|
|
|
subsk->protect.s2k = *s2k;
|
|
|
|
rc = protect_secret_key( subsk, dek );
|
1998-05-26 15:38:00 +02:00
|
|
|
}
|
|
|
|
}
|
1998-04-20 17:52:20 +02:00
|
|
|
if( rc )
|
|
|
|
log_error("protect_secret_key failed: %s\n", g10_errstr(rc) );
|
|
|
|
else
|
|
|
|
changed++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
1998-05-03 17:42:08 +02:00
|
|
|
m_free(s2k);
|
1998-04-20 17:52:20 +02:00
|
|
|
m_free(dek);
|
|
|
|
}
|
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
leave:
|
|
|
|
m_free( passphrase );
|
|
|
|
set_next_passphrase( NULL );
|
|
|
|
return changed && !rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
/****************
|
|
|
|
* There are some keys out (due to a bug in gnupg), where the sequence
|
|
|
|
* of the packets is wrong. This function fixes that.
|
1999-05-19 16:12:26 +02:00
|
|
|
* Returns: true if the keyblock has been fixed.
|
1999-05-22 22:54:54 +02:00
|
|
|
*
|
|
|
|
* Note: This function does not work if there is more than one user ID.
|
1998-10-17 16:47:14 +02:00
|
|
|
*/
|
|
|
|
static int
|
|
|
|
fix_keyblock( KBNODE keyblock )
|
|
|
|
{
|
|
|
|
KBNODE node, last, subkey;
|
|
|
|
int fixed=0;
|
|
|
|
|
|
|
|
/* locate key signatures of class 0x10..0x13 behind sub key packets */
|
|
|
|
for( subkey=last=NULL, node = keyblock; node;
|
|
|
|
last=node, node = node->next ) {
|
|
|
|
switch( node->pkt->pkttype ) {
|
|
|
|
case PKT_PUBLIC_SUBKEY:
|
|
|
|
case PKT_SECRET_SUBKEY:
|
|
|
|
if( !subkey )
|
|
|
|
subkey = last; /* actually it is the one before the subkey */
|
|
|
|
break;
|
|
|
|
case PKT_SIGNATURE:
|
|
|
|
if( subkey ) {
|
|
|
|
PKT_signature *sig = node->pkt->pkt.signature;
|
|
|
|
if( sig->sig_class >= 0x10 && sig->sig_class <= 0x13 ) {
|
1998-11-10 13:59:59 +01:00
|
|
|
log_info(_(
|
|
|
|
"moving a key signature to the correct place\n"));
|
1998-10-17 16:47:14 +02:00
|
|
|
last->next = node->next;
|
|
|
|
node->next = subkey->next;
|
|
|
|
subkey->next = node;
|
|
|
|
node = last;
|
|
|
|
fixed=1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default: break;
|
|
|
|
}
|
|
|
|
}
|
1998-07-29 21:35:05 +02:00
|
|
|
|
1998-10-17 16:47:14 +02:00
|
|
|
return fixed;
|
|
|
|
}
|
1998-07-29 21:35:05 +02:00
|
|
|
|
|
|
|
/****************
|
1999-07-12 18:49:22 +02:00
|
|
|
* Menu driven key editor. If sign_mode is true semi-automatical signing
|
|
|
|
* will be performed. commands are ignore in this case
|
1998-07-29 21:35:05 +02:00
|
|
|
*
|
|
|
|
* Note: to keep track of some selection we use node->mark MARKBIT_xxxx.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
1999-07-12 18:49:22 +02:00
|
|
|
keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
|
|
|
|
int sign_mode )
|
1998-07-29 21:35:05 +02:00
|
|
|
{
|
|
|
|
enum cmdids { cmdNONE = 0,
|
|
|
|
cmdQUIT, cmdHELP, cmdFPR, cmdLIST, cmdSELUID, cmdCHECK, cmdSIGN,
|
2002-02-10 01:18:54 +01:00
|
|
|
cmdLSIGN, cmdNRSIGN, cmdNRLSIGN, cmdREVSIG, cmdREVKEY, cmdDELSIG,
|
|
|
|
cmdPRIMARY, cmdDEBUG, cmdSAVE, cmdADDUID, cmdADDPHOTO, cmdDELUID,
|
2002-05-19 17:04:04 +02:00
|
|
|
cmdADDKEY, cmdDELKEY, cmdADDREVOKER, cmdTOGGLE, cmdSELKEY,
|
|
|
|
cmdPASSWD, cmdTRUST, cmdPREF, cmdEXPIRE, cmdENABLEKEY,
|
|
|
|
cmdDISABLEKEY, cmdSHOWPREF, cmdSETPREF, cmdUPDPREF, cmdINVCMD,
|
|
|
|
cmdSHOWPHOTO, cmdUPDTRUST, cmdCHKTRUST, cmdNOP };
|
1998-07-29 21:35:05 +02:00
|
|
|
static struct { const char *name;
|
|
|
|
enum cmdids id;
|
|
|
|
int need_sk;
|
2000-03-14 18:50:27 +01:00
|
|
|
int not_with_sk;
|
1999-07-12 18:49:22 +02:00
|
|
|
int signmode;
|
1998-07-29 21:35:05 +02:00
|
|
|
const char *desc;
|
|
|
|
} cmds[] = {
|
2000-03-14 18:50:27 +01:00
|
|
|
{ N_("quit") , cmdQUIT , 0,0,1, N_("quit this menu") },
|
|
|
|
{ N_("q") , cmdQUIT , 0,0,1, NULL },
|
|
|
|
{ N_("save") , cmdSAVE , 0,0,1, N_("save and quit") },
|
|
|
|
{ N_("help") , cmdHELP , 0,0,1, N_("show this help") },
|
|
|
|
{ "?" , cmdHELP , 0,0,1, NULL },
|
|
|
|
{ N_("fpr") , cmdFPR , 0,0,1, N_("show fingerprint") },
|
|
|
|
{ N_("list") , cmdLIST , 0,0,1, N_("list key and user IDs") },
|
|
|
|
{ N_("l") , cmdLIST , 0,0,1, NULL },
|
|
|
|
{ N_("uid") , cmdSELUID , 0,0,1, N_("select user ID N") },
|
|
|
|
{ N_("key") , cmdSELKEY , 0,0,0, N_("select secondary key N") },
|
|
|
|
{ N_("check") , cmdCHECK , 0,0,1, N_("list signatures") },
|
|
|
|
{ N_("c") , cmdCHECK , 0,0,1, NULL },
|
|
|
|
{ N_("sign") , cmdSIGN , 0,1,1, N_("sign the key") },
|
|
|
|
{ N_("s") , cmdSIGN , 0,1,1, NULL },
|
|
|
|
{ N_("lsign") , cmdLSIGN , 0,1,1, N_("sign the key locally") },
|
2001-12-21 22:02:05 +01:00
|
|
|
{ N_("nrsign") , cmdNRSIGN , 0,1,1, N_("sign the key non-revocably") },
|
2002-02-10 01:18:54 +01:00
|
|
|
{ N_("nrlsign") , cmdNRLSIGN , 0,1,1, N_("sign the key locally and non-revocably") },
|
2000-09-13 18:11:24 +02:00
|
|
|
{ N_("debug") , cmdDEBUG , 0,0,0, NULL },
|
2000-03-14 18:50:27 +01:00
|
|
|
{ N_("adduid") , cmdADDUID , 1,1,0, N_("add a user ID") },
|
2001-12-22 00:06:02 +01:00
|
|
|
{ N_("addphoto"), cmdADDPHOTO , 1,1,0, N_("add a photo ID") },
|
2000-03-14 18:50:27 +01:00
|
|
|
{ N_("deluid") , cmdDELUID , 0,1,0, N_("delete user ID") },
|
2001-12-22 00:06:02 +01:00
|
|
|
/* delphoto is really deluid in disguise */
|
|
|
|
{ N_("delphoto"), cmdDELUID , 0,1,0, NULL },
|
2000-03-14 18:50:27 +01:00
|
|
|
{ N_("addkey") , cmdADDKEY , 1,1,0, N_("add a secondary key") },
|
|
|
|
{ N_("delkey") , cmdDELKEY , 0,1,0, N_("delete a secondary key") },
|
2002-05-19 17:04:04 +02:00
|
|
|
{ N_("addrevoker"),cmdADDREVOKER,1,1,0, N_("add a revocation key") },
|
2000-03-14 18:50:27 +01:00
|
|
|
{ N_("delsig") , cmdDELSIG , 0,1,0, N_("delete signatures") },
|
|
|
|
{ N_("expire") , cmdEXPIRE , 1,1,0, N_("change the expire date") },
|
2001-07-26 11:37:47 +02:00
|
|
|
{ N_("primary") , cmdPRIMARY , 1,1,0, N_("flag user ID as primary")},
|
2000-03-14 18:50:27 +01:00
|
|
|
{ N_("toggle") , cmdTOGGLE , 1,0,0, N_("toggle between secret "
|
|
|
|
"and public key listing") },
|
|
|
|
{ N_("t" ) , cmdTOGGLE , 1,0,0, NULL },
|
2001-10-23 10:04:00 +02:00
|
|
|
{ N_("pref") , cmdPREF , 0,1,0, N_("list preferences (expert)") },
|
|
|
|
{ N_("showpref"), cmdSHOWPREF , 0,1,0, N_("list preferences (verbose)") },
|
2001-08-09 15:11:51 +02:00
|
|
|
{ N_("setpref") , cmdSETPREF , 1,1,0, N_("set preference list") },
|
|
|
|
{ N_("updpref") , cmdUPDPREF , 1,1,0, N_("updated preferences") },
|
2000-03-14 18:50:27 +01:00
|
|
|
{ N_("passwd") , cmdPASSWD , 1,1,0, N_("change the passphrase") },
|
|
|
|
{ N_("trust") , cmdTRUST , 0,1,0, N_("change the ownertrust") },
|
|
|
|
{ N_("revsig") , cmdREVSIG , 0,1,0, N_("revoke signatures") },
|
|
|
|
{ N_("revkey") , cmdREVKEY , 1,1,0, N_("revoke a secondary key") },
|
|
|
|
{ N_("disable") , cmdDISABLEKEY, 0,1,0, N_("disable a key") },
|
|
|
|
{ N_("enable") , cmdENABLEKEY , 0,1,0, N_("enable a key") },
|
2001-12-22 00:06:02 +01:00
|
|
|
{ N_("showphoto"),cmdSHOWPHOTO , 0,0,0, N_("show photo ID") },
|
1998-07-29 21:35:05 +02:00
|
|
|
|
|
|
|
{ NULL, cmdNONE } };
|
1999-07-07 13:28:26 +02:00
|
|
|
enum cmdids cmd = 0;
|
1998-07-29 21:35:05 +02:00
|
|
|
int rc = 0;
|
|
|
|
KBNODE keyblock = NULL;
|
2001-09-06 19:10:00 +02:00
|
|
|
KEYDB_HANDLE kdbhd = NULL;
|
1998-07-29 21:35:05 +02:00
|
|
|
KBNODE sec_keyblock = NULL;
|
2001-09-06 19:10:00 +02:00
|
|
|
KEYDB_HANDLE sec_kdbhd = NULL;
|
1998-07-29 21:35:05 +02:00
|
|
|
KBNODE cur_keyblock;
|
|
|
|
char *answer = NULL;
|
|
|
|
int redisplay = 1;
|
|
|
|
int modified = 0;
|
|
|
|
int sec_modified = 0;
|
|
|
|
int toggle;
|
1998-11-20 18:42:18 +01:00
|
|
|
int have_commands = !!commands;
|
1998-07-29 21:35:05 +02:00
|
|
|
|
2000-10-13 12:31:16 +02:00
|
|
|
if ( opt.command_fd != -1 )
|
|
|
|
;
|
|
|
|
else if( opt.batch && !have_commands ) {
|
1998-08-11 19:29:34 +02:00
|
|
|
log_error(_("can't do that in batchmode\n"));
|
1998-07-29 21:35:05 +02:00
|
|
|
goto leave;
|
|
|
|
}
|
1998-04-20 17:52:20 +02:00
|
|
|
|
1999-07-12 18:49:22 +02:00
|
|
|
if( sign_mode ) {
|
|
|
|
commands = NULL;
|
2001-12-21 22:02:05 +01:00
|
|
|
append_to_strlist( &commands, sign_mode == 1? "sign":
|
2002-02-10 01:18:54 +01:00
|
|
|
sign_mode == 2?"lsign":
|
|
|
|
sign_mode == 3?"nrsign":"nrlsign");
|
1999-07-12 18:49:22 +02:00
|
|
|
have_commands = 1;
|
|
|
|
}
|
|
|
|
|
2001-08-30 18:39:23 +02:00
|
|
|
/* get the public key */
|
2001-09-06 19:10:00 +02:00
|
|
|
rc = get_pubkey_byname (NULL, username, &keyblock, &kdbhd);
|
2001-08-30 18:39:23 +02:00
|
|
|
if( rc )
|
|
|
|
goto leave;
|
|
|
|
if( fix_keyblock( keyblock ) )
|
|
|
|
modified++;
|
|
|
|
if( collapse_uids( &keyblock ) )
|
|
|
|
modified++;
|
|
|
|
|
|
|
|
if( !sign_mode ) {/* see whether we have a matching secret key */
|
|
|
|
PKT_public_key *pk = keyblock->pkt->pkt.public_key;
|
1999-07-12 18:49:22 +02:00
|
|
|
|
2001-09-06 19:10:00 +02:00
|
|
|
sec_kdbhd = keydb_new (1);
|
|
|
|
{
|
|
|
|
byte afp[MAX_FINGERPRINT_LEN];
|
|
|
|
size_t an;
|
|
|
|
|
|
|
|
fingerprint_from_pk (pk, afp, &an);
|
|
|
|
while (an < MAX_FINGERPRINT_LEN)
|
|
|
|
afp[an++] = 0;
|
|
|
|
rc = keydb_search_fpr (sec_kdbhd, afp);
|
|
|
|
}
|
|
|
|
if (!rc) {
|
|
|
|
rc = keydb_get_keyblock (sec_kdbhd, &sec_keyblock);
|
|
|
|
if (rc) {
|
|
|
|
log_error (_("error reading secret keyblock `%s': %s\n"),
|
1999-07-12 18:49:22 +02:00
|
|
|
username, g10_errstr(rc));
|
|
|
|
}
|
2001-09-06 19:10:00 +02:00
|
|
|
else {
|
|
|
|
merge_keys_and_selfsig( sec_keyblock );
|
|
|
|
if( fix_keyblock( sec_keyblock ) )
|
|
|
|
sec_modified++;
|
|
|
|
}
|
1998-04-20 17:52:20 +02:00
|
|
|
}
|
2001-09-06 19:10:00 +02:00
|
|
|
|
|
|
|
if (rc) {
|
|
|
|
sec_keyblock = NULL;
|
|
|
|
keydb_release (sec_kdbhd); sec_kdbhd = NULL;
|
|
|
|
rc = 0;
|
|
|
|
}
|
1998-04-20 17:52:20 +02:00
|
|
|
}
|
|
|
|
|
2001-08-30 18:39:23 +02:00
|
|
|
if( sec_keyblock ) {
|
1998-07-29 21:35:05 +02:00
|
|
|
tty_printf(_("Secret key is available.\n"));
|
|
|
|
}
|
|
|
|
|
|
|
|
toggle = 0;
|
|
|
|
cur_keyblock = keyblock;
|
|
|
|
for(;;) { /* main loop */
|
2001-12-22 00:06:02 +01:00
|
|
|
int i, arg_number, photo;
|
2001-08-09 15:11:51 +02:00
|
|
|
const char *arg_string = "";
|
1998-07-29 21:35:05 +02:00
|
|
|
char *p;
|
2001-12-07 02:00:21 +01:00
|
|
|
PKT_public_key *pk=keyblock->pkt->pkt.public_key;
|
1998-07-29 21:35:05 +02:00
|
|
|
|
|
|
|
tty_printf("\n");
|
|
|
|
if( redisplay ) {
|
2002-02-28 22:01:25 +01:00
|
|
|
show_key_with_all_names( cur_keyblock, 0, 1, 0, 1, 0 );
|
1998-07-29 21:35:05 +02:00
|
|
|
tty_printf("\n");
|
|
|
|
redisplay = 0;
|
|
|
|
}
|
1998-10-25 20:00:01 +01:00
|
|
|
do {
|
|
|
|
m_free(answer);
|
1998-11-20 18:42:18 +01:00
|
|
|
if( have_commands ) {
|
|
|
|
if( commands ) {
|
|
|
|
answer = m_strdup( commands->d );
|
|
|
|
commands = commands->next;
|
|
|
|
}
|
|
|
|
else if( opt.batch ) {
|
|
|
|
answer = m_strdup("quit");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
have_commands = 0;
|
|
|
|
}
|
|
|
|
if( !have_commands ) {
|
2000-12-19 13:38:53 +01:00
|
|
|
answer = cpr_get_no_help("keyedit.prompt", _("Command> "));
|
1998-11-20 18:42:18 +01:00
|
|
|
cpr_kill_prompt();
|
|
|
|
}
|
1998-10-25 20:00:01 +01:00
|
|
|
trim_spaces(answer);
|
|
|
|
} while( *answer == '#' );
|
1998-07-29 21:35:05 +02:00
|
|
|
|
2001-12-22 00:06:02 +01:00
|
|
|
arg_number = 0; /* Yes, here is the init which egcc complains about */
|
|
|
|
photo = 0; /* This too */
|
1998-07-29 21:35:05 +02:00
|
|
|
if( !*answer )
|
|
|
|
cmd = cmdLIST;
|
1998-09-11 07:47:32 +02:00
|
|
|
else if( *answer == CONTROL_D )
|
|
|
|
cmd = cmdQUIT;
|
1998-07-29 21:35:05 +02:00
|
|
|
else if( isdigit( *answer ) ) {
|
|
|
|
cmd = cmdSELUID;
|
|
|
|
arg_number = atoi(answer);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if( (p=strchr(answer,' ')) ) {
|
|
|
|
*p++ = 0;
|
|
|
|
trim_spaces(answer);
|
|
|
|
trim_spaces(p);
|
|
|
|
arg_number = atoi(p);
|
2001-08-09 15:11:51 +02:00
|
|
|
arg_string = p;
|
1998-07-29 21:35:05 +02:00
|
|
|
}
|
|
|
|
|
1999-07-12 18:49:22 +02:00
|
|
|
for(i=0; cmds[i].name; i++ ) {
|
2001-06-12 20:42:40 +02:00
|
|
|
if( !ascii_strcasecmp( answer, cmds[i].name ) )
|
1998-07-29 21:35:05 +02:00
|
|
|
break;
|
1999-07-12 18:49:22 +02:00
|
|
|
}
|
|
|
|
if( sign_mode && !cmds[i].signmode )
|
|
|
|
cmd = cmdINVCMD;
|
|
|
|
else if( cmds[i].need_sk && !sec_keyblock ) {
|
1998-12-08 13:20:53 +01:00
|
|
|
tty_printf(_("Need the secret key to do this.\n"));
|
1998-07-29 21:35:05 +02:00
|
|
|
cmd = cmdNOP;
|
|
|
|
}
|
2000-03-14 18:50:27 +01:00
|
|
|
else if( cmds[i].not_with_sk && sec_keyblock && toggle ) {
|
|
|
|
tty_printf(_("Please use the command \"toggle\" first.\n"));
|
|
|
|
cmd = cmdNOP;
|
|
|
|
}
|
1998-07-29 21:35:05 +02:00
|
|
|
else
|
|
|
|
cmd = cmds[i].id;
|
|
|
|
}
|
|
|
|
switch( cmd ) {
|
|
|
|
case cmdHELP:
|
|
|
|
for(i=0; cmds[i].name; i++ ) {
|
1999-07-12 18:49:22 +02:00
|
|
|
if( sign_mode && !cmds[i].signmode )
|
|
|
|
;
|
|
|
|
else if( cmds[i].need_sk && !sec_keyblock )
|
1998-07-29 21:35:05 +02:00
|
|
|
; /* skip if we do not have the secret key */
|
|
|
|
else if( cmds[i].desc )
|
1998-09-28 21:25:31 +02:00
|
|
|
tty_printf("%-10s %s\n", cmds[i].name, _(cmds[i].desc) );
|
1998-07-29 21:35:05 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cmdLIST:
|
|
|
|
redisplay = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cmdFPR:
|
|
|
|
show_key_and_fingerprint( keyblock );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cmdSELUID:
|
|
|
|
if( menu_select_uid( cur_keyblock, arg_number ) )
|
|
|
|
redisplay = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cmdSELKEY:
|
|
|
|
if( menu_select_key( cur_keyblock, arg_number ) )
|
|
|
|
redisplay = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cmdCHECK:
|
|
|
|
/* we can only do this with the public key becuase the
|
|
|
|
* check functions can't cope with secret keys and it
|
|
|
|
* is questionable whether this would make sense at all */
|
|
|
|
check_all_keysigs( keyblock, count_selected_uids(keyblock) );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cmdSIGN: /* sign (only the public key) */
|
1999-03-11 16:42:06 +01:00
|
|
|
case cmdLSIGN: /* sign (only the public key) */
|
2001-12-21 22:02:05 +01:00
|
|
|
case cmdNRSIGN: /* sign (only the public key) */
|
2002-02-10 01:18:54 +01:00
|
|
|
case cmdNRLSIGN: /* sign (only the public key) */
|
2001-12-07 02:00:21 +01:00
|
|
|
if( pk->is_revoked )
|
|
|
|
{
|
2002-04-12 06:07:26 +02:00
|
|
|
tty_printf(_("Key is revoked."));
|
2001-12-07 02:00:21 +01:00
|
|
|
|
|
|
|
if(opt.expert)
|
|
|
|
{
|
2002-04-12 06:07:26 +02:00
|
|
|
tty_printf(" ");
|
2001-12-07 02:00:21 +01:00
|
|
|
if(!cpr_get_answer_is_yes("keyedit.sign_revoked.okay",
|
2002-04-12 06:07:26 +02:00
|
|
|
_("Are you sure you still want "
|
|
|
|
"to sign it? (y/N) ")))
|
2001-12-07 02:00:21 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
2002-04-12 06:07:26 +02:00
|
|
|
{
|
2002-04-14 03:27:11 +02:00
|
|
|
tty_printf(_(" Unable to sign.\n"));
|
2002-04-12 06:07:26 +02:00
|
|
|
break;
|
|
|
|
}
|
2001-12-07 02:00:21 +01:00
|
|
|
}
|
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
if( count_uids(keyblock) > 1 && !count_selected_uids(keyblock) ) {
|
1998-11-27 12:42:49 +01:00
|
|
|
if( !cpr_get_answer_is_yes("keyedit.sign_all.okay",
|
1999-09-01 15:40:07 +02:00
|
|
|
_("Really sign all user IDs? ")) ) {
|
|
|
|
tty_printf(_("Hint: Select the user IDs to sign\n"));
|
1998-07-29 21:35:05 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2001-12-21 22:02:05 +01:00
|
|
|
if( !sign_uids( keyblock, locusr, &modified,
|
2002-02-10 01:18:54 +01:00
|
|
|
(cmd == cmdLSIGN) || (cmd == cmdNRLSIGN),
|
|
|
|
(cmd == cmdNRSIGN) || (cmd==cmdNRLSIGN))
|
1999-07-12 18:49:22 +02:00
|
|
|
&& sign_mode )
|
2002-02-10 01:18:54 +01:00
|
|
|
goto do_cmd_save;
|
1998-07-29 21:35:05 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case cmdDEBUG:
|
|
|
|
dump_kbnode( cur_keyblock );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cmdTOGGLE:
|
|
|
|
toggle = !toggle;
|
|
|
|
cur_keyblock = toggle? sec_keyblock : keyblock;
|
|
|
|
redisplay = 1;
|
|
|
|
break;
|
|
|
|
|
2001-12-22 00:06:02 +01:00
|
|
|
case cmdADDPHOTO:
|
2002-01-06 04:52:14 +01:00
|
|
|
if (opt.rfc2440 || opt.rfc1991 || opt.pgp2)
|
2001-12-22 14:04:24 +01:00
|
|
|
{
|
|
|
|
tty_printf(
|
2002-01-06 04:52:14 +01:00
|
|
|
_("This command is not allowed while in %s mode.\n"),
|
|
|
|
opt.rfc2440?"OpenPGP":opt.pgp2?"PGP2":"RFC-1991");
|
2001-12-22 14:04:24 +01:00
|
|
|
break;
|
|
|
|
}
|
2001-12-22 00:06:02 +01:00
|
|
|
photo=1;
|
|
|
|
/* fall through */
|
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
case cmdADDUID:
|
2001-12-22 00:06:02 +01:00
|
|
|
if( menu_adduid( keyblock, sec_keyblock, photo ) ) {
|
1998-07-29 21:35:05 +02:00
|
|
|
redisplay = 1;
|
|
|
|
sec_modified = modified = 1;
|
2001-08-14 13:33:49 +02:00
|
|
|
merge_keys_and_selfsig( sec_keyblock );
|
|
|
|
merge_keys_and_selfsig( keyblock );
|
1998-07-29 21:35:05 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case cmdDELUID: {
|
|
|
|
int n1;
|
|
|
|
|
|
|
|
if( !(n1=count_selected_uids(keyblock)) )
|
1999-09-01 15:40:07 +02:00
|
|
|
tty_printf(_("You must select at least one user ID.\n"));
|
2002-04-13 06:32:03 +02:00
|
|
|
else if( real_uids_left(keyblock) < 1 )
|
1999-09-01 15:40:07 +02:00
|
|
|
tty_printf(_("You can't delete the last user ID!\n"));
|
1998-08-08 21:27:00 +02:00
|
|
|
else if( cpr_get_answer_is_yes(
|
1998-11-27 12:42:49 +01:00
|
|
|
"keyedit.remove.uid.okay",
|
1999-09-01 15:40:07 +02:00
|
|
|
n1 > 1? _("Really remove all selected user IDs? ")
|
|
|
|
: _("Really remove this user ID? ")
|
1998-07-29 21:35:05 +02:00
|
|
|
) ) {
|
|
|
|
menu_deluid( keyblock, sec_keyblock );
|
|
|
|
redisplay = 1;
|
|
|
|
modified = 1;
|
|
|
|
if( sec_keyblock )
|
|
|
|
sec_modified = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1999-05-27 09:45:46 +02:00
|
|
|
case cmdDELSIG: {
|
|
|
|
int n1;
|
|
|
|
|
|
|
|
if( !(n1=count_selected_uids(keyblock)) )
|
1999-09-01 15:40:07 +02:00
|
|
|
tty_printf(_("You must select at least one user ID.\n"));
|
1999-05-27 09:45:46 +02:00
|
|
|
else if( menu_delsig( keyblock ) ) {
|
|
|
|
/* no redisplay here, because it may scroll away some
|
|
|
|
* status output of delsig */
|
|
|
|
modified = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
case cmdADDKEY:
|
|
|
|
if( generate_subkeypair( keyblock, sec_keyblock ) ) {
|
|
|
|
redisplay = 1;
|
|
|
|
sec_modified = modified = 1;
|
2001-08-14 13:33:49 +02:00
|
|
|
merge_keys_and_selfsig( sec_keyblock );
|
|
|
|
merge_keys_and_selfsig( keyblock );
|
1998-07-29 21:35:05 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case cmdDELKEY: {
|
|
|
|
int n1;
|
|
|
|
|
|
|
|
if( !(n1=count_selected_keys( keyblock )) )
|
|
|
|
tty_printf(_("You must select at least one key.\n"));
|
1998-08-08 21:27:00 +02:00
|
|
|
else if( sec_keyblock && !cpr_get_answer_is_yes(
|
1998-11-27 12:42:49 +01:00
|
|
|
"keyedit.remove.subkey.okay",
|
1998-07-29 21:35:05 +02:00
|
|
|
n1 > 1?
|
|
|
|
_("Do you really want to delete the selected keys? "):
|
|
|
|
_("Do you really want to delete this key? ")
|
|
|
|
))
|
|
|
|
;
|
|
|
|
else {
|
|
|
|
menu_delkey( keyblock, sec_keyblock );
|
|
|
|
redisplay = 1;
|
|
|
|
modified = 1;
|
|
|
|
if( sec_keyblock )
|
|
|
|
sec_modified = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2002-05-19 17:04:04 +02:00
|
|
|
case cmdADDREVOKER:
|
|
|
|
if( menu_addrevoker( keyblock, sec_keyblock ) ) {
|
|
|
|
redisplay = 1;
|
|
|
|
sec_modified = modified = 1;
|
|
|
|
merge_keys_and_selfsig( sec_keyblock );
|
|
|
|
merge_keys_and_selfsig( keyblock );
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1999-04-28 13:06:52 +02:00
|
|
|
case cmdREVKEY: {
|
|
|
|
int n1;
|
|
|
|
|
|
|
|
if( !(n1=count_selected_keys( keyblock )) )
|
|
|
|
tty_printf(_("You must select at least one key.\n"));
|
|
|
|
else if( sec_keyblock && !cpr_get_answer_is_yes(
|
|
|
|
"keyedit.revoke.subkey.okay",
|
|
|
|
n1 > 1?
|
|
|
|
_("Do you really want to revoke the selected keys? "):
|
|
|
|
_("Do you really want to revoke this key? ")
|
|
|
|
))
|
|
|
|
;
|
|
|
|
else {
|
|
|
|
if( menu_revkey( keyblock, sec_keyblock ) ) {
|
|
|
|
modified = 1;
|
|
|
|
/*sec_modified = 1;*/
|
|
|
|
}
|
|
|
|
redisplay = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1998-10-18 17:21:22 +02:00
|
|
|
case cmdEXPIRE:
|
|
|
|
if( menu_expire( keyblock, sec_keyblock ) ) {
|
|
|
|
merge_keys_and_selfsig( sec_keyblock );
|
|
|
|
merge_keys_and_selfsig( keyblock );
|
|
|
|
sec_modified = 1;
|
|
|
|
modified = 1;
|
|
|
|
redisplay = 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2001-07-26 11:37:47 +02:00
|
|
|
case cmdPRIMARY:
|
|
|
|
if( menu_set_primary_uid ( keyblock, sec_keyblock ) ) {
|
|
|
|
merge_keys_and_selfsig( keyblock );
|
|
|
|
modified = 1;
|
|
|
|
redisplay = 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
case cmdPASSWD:
|
|
|
|
if( change_passphrase( sec_keyblock ) )
|
|
|
|
sec_modified = 1;
|
|
|
|
break;
|
|
|
|
|
1998-07-30 19:37:03 +02:00
|
|
|
case cmdTRUST:
|
2002-02-28 22:01:25 +01:00
|
|
|
show_key_with_all_names( keyblock, 0, 0, 0, 1, 0 );
|
1998-07-30 19:37:03 +02:00
|
|
|
tty_printf("\n");
|
|
|
|
if( edit_ownertrust( find_kbnode( keyblock,
|
2002-04-19 11:18:57 +02:00
|
|
|
PKT_PUBLIC_KEY )->pkt->pkt.public_key, 1 ) ) {
|
1998-07-30 19:37:03 +02:00
|
|
|
redisplay = 1;
|
2002-04-19 13:31:53 +02:00
|
|
|
/* No real need to set update_trust here as
|
|
|
|
edit_ownertrust() calls revalidation_mark()
|
|
|
|
anyway. */
|
|
|
|
update_trust=1;
|
2002-04-19 11:18:57 +02:00
|
|
|
}
|
1998-07-30 19:37:03 +02:00
|
|
|
break;
|
|
|
|
|
1998-08-05 18:51:59 +02:00
|
|
|
case cmdPREF:
|
2002-02-28 22:01:25 +01:00
|
|
|
show_key_with_all_names( keyblock, 0, 0, 0, 0, 1 );
|
1998-08-05 18:51:59 +02:00
|
|
|
break;
|
|
|
|
|
2001-04-25 12:05:33 +02:00
|
|
|
case cmdSHOWPREF:
|
2002-02-28 22:01:25 +01:00
|
|
|
show_key_with_all_names( keyblock, 0, 0, 0, 0, 2 );
|
2001-04-25 12:05:33 +02:00
|
|
|
break;
|
|
|
|
|
2001-08-09 15:11:51 +02:00
|
|
|
case cmdSETPREF:
|
* options.h, main.h, keygen.c (keygen_set_set_prefs, keygen_get_std_prefs,
keygen_upd_std_prefs), keyedit.c (keyedit_menu), g10.c (main), pkclist.c
(select_algo_from_prefs): Add --personal-preference-list which allows the
user to factor in their own preferred algorithms when the preference lists
are consulted. Obviously, this does not let the user violate a
recepient's preferences (and the RFC) - this only influences the ranking
of the agreed-on (and available) algorithms from the recepients.
Suggested by David Hollenberg.
* options.h, keygen.c (keygen_set_std_prefs), g10.c (main): Rename
--preference-list to --default-preference-list (as that is what it really
is), and make it a true default in that if the user selects "default" they
get this list and not the compiled-in list.
2002-05-22 16:07:12 +02:00
|
|
|
keygen_set_std_prefs ( !*arg_string? "default" : arg_string, 0);
|
2001-08-09 15:11:51 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case cmdUPDPREF:
|
|
|
|
{
|
2001-09-09 18:09:19 +02:00
|
|
|
p = keygen_get_std_prefs ();
|
2001-08-09 15:11:51 +02:00
|
|
|
tty_printf (("Current preference list: %s\n"), p);
|
|
|
|
m_free (p);
|
|
|
|
}
|
|
|
|
if (cpr_get_answer_is_yes ("keyedit.updpref.okay",
|
|
|
|
count_selected_uids (keyblock)?
|
|
|
|
_("Really update the preferences"
|
|
|
|
" for the selected user IDs? "):
|
|
|
|
_("Really update the preferences? "))){
|
|
|
|
|
|
|
|
if ( menu_set_preferences (keyblock, sec_keyblock) ) {
|
|
|
|
merge_keys_and_selfsig (keyblock);
|
|
|
|
modified = 1;
|
|
|
|
redisplay = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
case cmdNOP:
|
|
|
|
break;
|
|
|
|
|
1999-04-26 17:53:01 +02:00
|
|
|
case cmdREVSIG:
|
|
|
|
if( menu_revsig( keyblock ) ) {
|
|
|
|
redisplay = 1;
|
|
|
|
modified = 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
1999-06-29 21:50:54 +02:00
|
|
|
case cmdENABLEKEY:
|
|
|
|
case cmdDISABLEKEY:
|
|
|
|
if( enable_disable_key( keyblock, cmd == cmdDISABLEKEY ) ) {
|
|
|
|
redisplay = 1;
|
|
|
|
modified = 1;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2001-12-22 00:06:02 +01:00
|
|
|
case cmdSHOWPHOTO:
|
|
|
|
menu_showphoto(keyblock);
|
|
|
|
break;
|
|
|
|
|
1999-07-12 18:49:22 +02:00
|
|
|
case cmdQUIT:
|
|
|
|
if( have_commands )
|
|
|
|
goto leave;
|
|
|
|
if( !modified && !sec_modified )
|
|
|
|
goto leave;
|
|
|
|
if( !cpr_get_answer_is_yes("keyedit.save.okay",
|
|
|
|
_("Save changes? ")) ) {
|
|
|
|
if( cpr_enabled()
|
|
|
|
|| cpr_get_answer_is_yes("keyedit.cancel.okay",
|
|
|
|
_("Quit without saving? ")) )
|
|
|
|
goto leave;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* fall thru */
|
|
|
|
case cmdSAVE:
|
|
|
|
do_cmd_save:
|
|
|
|
if( modified || sec_modified ) {
|
|
|
|
if( modified ) {
|
2001-09-06 19:10:00 +02:00
|
|
|
rc = keydb_update_keyblock (kdbhd, keyblock);
|
1999-07-12 18:49:22 +02:00
|
|
|
if( rc ) {
|
|
|
|
log_error(_("update failed: %s\n"), g10_errstr(rc) );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( sec_modified ) {
|
2001-09-06 19:10:00 +02:00
|
|
|
rc = keydb_update_keyblock (sec_kdbhd, sec_keyblock );
|
1999-07-12 18:49:22 +02:00
|
|
|
if( rc ) {
|
2001-09-06 19:10:00 +02:00
|
|
|
log_error( _("update secret failed: %s\n"),
|
|
|
|
g10_errstr(rc) );
|
1999-07-12 18:49:22 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
tty_printf(_("Key not changed so no update needed.\n"));
|
2001-09-06 19:10:00 +02:00
|
|
|
|
2002-04-19 13:31:53 +02:00
|
|
|
if( update_trust )
|
|
|
|
{
|
2001-09-24 18:03:14 +02:00
|
|
|
revalidation_mark ();
|
2002-04-19 13:31:53 +02:00
|
|
|
update_trust=0;
|
|
|
|
}
|
1999-07-12 18:49:22 +02:00
|
|
|
goto leave;
|
|
|
|
|
|
|
|
case cmdINVCMD:
|
1998-07-29 21:35:05 +02:00
|
|
|
default:
|
|
|
|
tty_printf("\n");
|
|
|
|
tty_printf(_("Invalid command (try \"help\")\n"));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} /* end main loop */
|
|
|
|
|
1998-04-20 17:52:20 +02:00
|
|
|
leave:
|
|
|
|
release_kbnode( keyblock );
|
1998-07-29 21:35:05 +02:00
|
|
|
release_kbnode( sec_keyblock );
|
2001-09-06 19:10:00 +02:00
|
|
|
keydb_release (kdbhd);
|
1998-07-29 21:35:05 +02:00
|
|
|
m_free(answer);
|
1998-04-20 17:52:20 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-08-05 18:51:59 +02:00
|
|
|
/****************
|
|
|
|
* show preferences of a public keyblock.
|
|
|
|
*/
|
|
|
|
static void
|
2001-08-10 16:04:32 +02:00
|
|
|
show_prefs (PKT_user_id *uid, int verbose)
|
1998-08-05 18:51:59 +02:00
|
|
|
{
|
2002-05-10 17:27:20 +02:00
|
|
|
const prefitem_t fake={0,0};
|
2001-08-10 16:04:32 +02:00
|
|
|
const prefitem_t *prefs;
|
1998-08-05 18:51:59 +02:00
|
|
|
int i;
|
|
|
|
|
2002-05-10 17:27:20 +02:00
|
|
|
if( !uid )
|
|
|
|
return;
|
|
|
|
|
|
|
|
if( uid->prefs )
|
|
|
|
prefs=uid->prefs;
|
2002-05-13 22:44:30 +02:00
|
|
|
else if(verbose)
|
2002-05-10 17:27:20 +02:00
|
|
|
prefs=&fake;
|
|
|
|
else
|
|
|
|
return;
|
2001-04-25 12:05:33 +02:00
|
|
|
|
2002-05-10 17:27:20 +02:00
|
|
|
if (verbose) {
|
|
|
|
int any, des_seen=0, sha1_seen=0, uncomp_seen=0;
|
2001-04-25 12:05:33 +02:00
|
|
|
tty_printf (" Cipher: ");
|
2001-08-10 16:04:32 +02:00
|
|
|
for(i=any=0; prefs[i].type; i++ ) {
|
|
|
|
if( prefs[i].type == PREFTYPE_SYM ) {
|
|
|
|
const char *s = cipher_algo_to_string (prefs[i].value);
|
2001-04-25 12:05:33 +02:00
|
|
|
|
|
|
|
if (any)
|
|
|
|
tty_printf (", ");
|
|
|
|
any = 1;
|
|
|
|
/* We don't want to display strings for experimental algos */
|
2001-08-10 16:04:32 +02:00
|
|
|
if (s && prefs[i].value < 100 )
|
2001-04-25 12:05:33 +02:00
|
|
|
tty_printf ("%s", s );
|
|
|
|
else
|
2001-08-10 16:04:32 +02:00
|
|
|
tty_printf ("[%d]", prefs[i].value);
|
|
|
|
if (prefs[i].value == CIPHER_ALGO_3DES )
|
2001-04-25 12:05:33 +02:00
|
|
|
des_seen = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!des_seen) {
|
|
|
|
if (any)
|
|
|
|
tty_printf (", ");
|
2002-05-10 17:27:20 +02:00
|
|
|
tty_printf ("%s",cipher_algo_to_string(CIPHER_ALGO_3DES));
|
2001-04-25 12:05:33 +02:00
|
|
|
}
|
|
|
|
tty_printf ("\n Hash: ");
|
2001-08-10 16:04:32 +02:00
|
|
|
for(i=any=0; prefs[i].type; i++ ) {
|
|
|
|
if( prefs[i].type == PREFTYPE_HASH ) {
|
|
|
|
const char *s = digest_algo_to_string (prefs[i].value);
|
2001-04-25 12:05:33 +02:00
|
|
|
|
2001-12-07 01:57:50 +01:00
|
|
|
if (any)
|
|
|
|
tty_printf (", ");
|
|
|
|
any = 1;
|
|
|
|
/* We don't want to display strings for experimental algos */
|
|
|
|
if (s && prefs[i].value < 100 )
|
|
|
|
tty_printf ("%s", s );
|
|
|
|
else
|
|
|
|
tty_printf ("[%d]", prefs[i].value);
|
2002-05-10 17:27:20 +02:00
|
|
|
if (prefs[i].value == DIGEST_ALGO_SHA1 )
|
|
|
|
sha1_seen = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!sha1_seen) {
|
|
|
|
if (any)
|
|
|
|
tty_printf (", ");
|
|
|
|
tty_printf ("%s",digest_algo_to_string(DIGEST_ALGO_SHA1));
|
2001-12-07 01:57:50 +01:00
|
|
|
}
|
|
|
|
tty_printf ("\n Compression: ");
|
|
|
|
for(i=any=0; prefs[i].type; i++ ) {
|
|
|
|
if( prefs[i].type == PREFTYPE_ZIP ) {
|
|
|
|
const char *s=NULL;
|
|
|
|
switch(prefs[i].value)
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
s="Uncompressed";
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
s="ZIP";
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
s="ZLIB";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2001-04-25 12:05:33 +02:00
|
|
|
if (any)
|
|
|
|
tty_printf (", ");
|
|
|
|
any = 1;
|
|
|
|
/* We don't want to display strings for experimental algos */
|
2001-08-10 16:04:32 +02:00
|
|
|
if (s && prefs[i].value < 100 )
|
2001-04-25 12:05:33 +02:00
|
|
|
tty_printf ("%s", s );
|
|
|
|
else
|
2001-08-10 16:04:32 +02:00
|
|
|
tty_printf ("[%d]", prefs[i].value);
|
2002-05-10 17:27:20 +02:00
|
|
|
if (prefs[i].value == 0 )
|
|
|
|
uncomp_seen = 1;
|
|
|
|
}
|
2001-04-25 12:05:33 +02:00
|
|
|
}
|
2002-05-10 17:27:20 +02:00
|
|
|
if (!uncomp_seen) {
|
|
|
|
if (any)
|
|
|
|
tty_printf (", ");
|
|
|
|
else
|
|
|
|
tty_printf ("ZIP, ");
|
|
|
|
tty_printf ("Uncompressed");
|
|
|
|
}
|
|
|
|
tty_printf ("\n Features: ");
|
|
|
|
if(uid->mdc_feature)
|
|
|
|
tty_printf ("MDC");
|
|
|
|
tty_printf("\n");
|
2001-04-25 12:05:33 +02:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
tty_printf(" ");
|
2001-08-10 16:04:32 +02:00
|
|
|
for(i=0; prefs[i].type; i++ ) {
|
|
|
|
tty_printf( " %c%d", prefs[i].type == PREFTYPE_SYM ? 'S' :
|
|
|
|
prefs[i].type == PREFTYPE_HASH ? 'H' :
|
|
|
|
prefs[i].type == PREFTYPE_ZIP ? 'Z':'?',
|
|
|
|
prefs[i].value);
|
2001-04-25 12:05:33 +02:00
|
|
|
}
|
2001-08-30 18:39:23 +02:00
|
|
|
if (uid->mdc_feature)
|
|
|
|
tty_printf (" [mdc]");
|
2001-04-25 12:05:33 +02:00
|
|
|
tty_printf("\n");
|
1998-08-05 18:51:59 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
|
2002-05-28 10:27:45 +02:00
|
|
|
/* This is the version of show_key_with_all_names used when
|
|
|
|
opt.with_colons is used. It prints all available data in a easy to
|
|
|
|
parse format and does not translate utf8 */
|
|
|
|
static void
|
|
|
|
show_key_with_all_names_colon (KBNODE keyblock)
|
|
|
|
{
|
|
|
|
KBNODE node;
|
|
|
|
int i, j;
|
|
|
|
byte pk_version=0;
|
|
|
|
|
|
|
|
/* the keys */
|
|
|
|
for ( node = keyblock; node; node = node->next )
|
|
|
|
{
|
|
|
|
if (node->pkt->pkttype == PKT_PUBLIC_KEY
|
|
|
|
|| (node->pkt->pkttype == PKT_PUBLIC_SUBKEY) )
|
|
|
|
{
|
|
|
|
PKT_public_key *pk = node->pkt->pkt.public_key;
|
|
|
|
int otrust=0, trust=0;
|
|
|
|
u32 keyid[2];
|
|
|
|
|
|
|
|
if (node->pkt->pkttype == PKT_PUBLIC_KEY)
|
|
|
|
{
|
|
|
|
trust = get_validity_info (pk, NULL);
|
|
|
|
otrust = get_ownertrust_info (pk);
|
|
|
|
pk_version = pk->version;
|
|
|
|
}
|
|
|
|
|
|
|
|
keyid_from_pk (pk, keyid);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fputs (node->pkt->pkttype == PKT_PUBLIC_KEY?"pub:":"sub:", stdout);
|
|
|
|
if (!pk->is_valid)
|
|
|
|
putchar ('i');
|
|
|
|
else if (pk->is_revoked)
|
|
|
|
putchar ('r');
|
|
|
|
else if (pk->has_expired)
|
|
|
|
putchar ('e');
|
|
|
|
else
|
|
|
|
putchar (trust);
|
|
|
|
printf (":%u:%d:%08lX%08lX:%lu:%lu:",
|
|
|
|
nbits_from_pk (pk),
|
|
|
|
pk->pubkey_algo,
|
|
|
|
(ulong)keyid[0], (ulong)keyid[1],
|
|
|
|
(ulong)pk->timestamp,
|
|
|
|
(ulong)pk->expiredate );
|
|
|
|
if (pk->local_id)
|
|
|
|
printf ("%lu", pk->local_id);
|
|
|
|
putchar (':');
|
|
|
|
putchar (otrust);
|
|
|
|
putchar(':');
|
|
|
|
putchar('\n');
|
|
|
|
|
|
|
|
print_fingerprint (pk, NULL, 0);
|
|
|
|
|
|
|
|
/* print the revoker record */
|
|
|
|
if( !pk->revkey && pk->numrevkeys )
|
|
|
|
BUG();
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (i=0; i < pk->numrevkeys; i++)
|
|
|
|
{
|
|
|
|
byte *p;
|
|
|
|
|
2002-05-29 13:27:08 +02:00
|
|
|
printf ("rvk:::%d::::::", pk->revkey[i].algid);
|
2002-05-28 10:27:45 +02:00
|
|
|
p = pk->revkey[i].fpr;
|
|
|
|
for (j=0; j < 20; j++, p++ )
|
|
|
|
printf ("%02X", *p);
|
|
|
|
printf (":%02x%c:\n", pk->revkey[i].class,
|
|
|
|
(pk->revkey[i].class&0x40)? 'l':'x');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* the user ids */
|
|
|
|
i = 0;
|
|
|
|
for (node = keyblock; node; node = node->next)
|
|
|
|
{
|
|
|
|
if ( node->pkt->pkttype == PKT_USER_ID )
|
|
|
|
{
|
|
|
|
PKT_user_id *uid = node->pkt->pkt.user_id;
|
|
|
|
int trustletter = '?';
|
|
|
|
|
|
|
|
++i;
|
|
|
|
printf ("uid:%c::::::::", trustletter);
|
|
|
|
print_string (stdout, uid->name, uid->len, ':');
|
|
|
|
putchar (':');
|
|
|
|
/* signature class */
|
|
|
|
putchar (':');
|
|
|
|
/* capabilities */
|
|
|
|
putchar (':');
|
|
|
|
/* preferences */
|
|
|
|
if (pk_version>3 || uid->selfsigversion>3)
|
|
|
|
{
|
|
|
|
const prefitem_t *prefs = uid->prefs;
|
|
|
|
|
|
|
|
for (j=0; prefs && prefs[j].type; j++)
|
|
|
|
{
|
|
|
|
if (j)
|
|
|
|
putchar (' ');
|
|
|
|
printf ("%c%d", prefs[j].type == PREFTYPE_SYM ? 'S' :
|
|
|
|
prefs[j].type == PREFTYPE_HASH ? 'H' :
|
|
|
|
prefs[j].type == PREFTYPE_ZIP ? 'Z':'?',
|
|
|
|
prefs[j].value);
|
|
|
|
}
|
|
|
|
if (uid->mdc_feature)
|
|
|
|
printf (",mdc");
|
|
|
|
}
|
|
|
|
putchar (':');
|
|
|
|
/* flags */
|
|
|
|
printf ("%d,", i);
|
|
|
|
if (uid->is_primary)
|
|
|
|
putchar ('p');
|
|
|
|
if (uid->is_revoked)
|
|
|
|
putchar ('r');
|
|
|
|
if ((node->flag & NODFLG_SELUID))
|
|
|
|
putchar ('s');
|
|
|
|
if ((node->flag & NODFLG_MARK_A))
|
|
|
|
putchar ('m');
|
|
|
|
putchar (':');
|
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-04-20 17:52:20 +02:00
|
|
|
/****************
|
1998-07-29 21:35:05 +02:00
|
|
|
* Display the key a the user ids, if only_marked is true, do only
|
|
|
|
* so for user ids with mark A flag set and dont display the index number
|
1998-04-20 17:52:20 +02:00
|
|
|
*/
|
1998-07-29 21:35:05 +02:00
|
|
|
static void
|
2002-02-28 22:01:25 +01:00
|
|
|
show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
|
1998-08-05 18:51:59 +02:00
|
|
|
int with_fpr, int with_subkeys, int with_prefs )
|
1998-04-20 17:52:20 +02:00
|
|
|
{
|
1998-07-29 21:35:05 +02:00
|
|
|
KBNODE node;
|
1999-05-06 14:26:10 +02:00
|
|
|
int i, rc;
|
2002-04-19 11:18:57 +02:00
|
|
|
int do_warn = 0;
|
2002-05-13 22:44:30 +02:00
|
|
|
byte pk_version=0;
|
1998-07-29 21:35:05 +02:00
|
|
|
|
2002-05-28 10:27:45 +02:00
|
|
|
if (opt.with_colons)
|
|
|
|
{
|
|
|
|
show_key_with_all_names_colon (keyblock);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
/* the keys */
|
|
|
|
for( node = keyblock; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_KEY
|
|
|
|
|| (with_subkeys && node->pkt->pkttype == PKT_PUBLIC_SUBKEY) ) {
|
|
|
|
PKT_public_key *pk = node->pkt->pkt.public_key;
|
1998-08-05 18:51:59 +02:00
|
|
|
int otrust=0, trust=0;
|
|
|
|
|
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_KEY ) {
|
|
|
|
/* do it here, so that debug messages don't clutter the
|
|
|
|
* output */
|
2002-04-19 11:18:57 +02:00
|
|
|
static int did_warn = 0;
|
|
|
|
|
2001-09-24 18:03:14 +02:00
|
|
|
trust = get_validity_info (pk, NULL);
|
|
|
|
otrust = get_ownertrust_info (pk);
|
2002-04-19 11:18:57 +02:00
|
|
|
|
|
|
|
/* Show a warning once */
|
|
|
|
if (!did_warn
|
|
|
|
&& (get_validity (pk, NULL) & TRUST_FLAG_PENDING_CHECK)) {
|
|
|
|
did_warn = 1;
|
|
|
|
do_warn = 1;
|
|
|
|
}
|
2002-05-13 22:44:30 +02:00
|
|
|
|
|
|
|
pk_version=pk->version;
|
1998-08-05 18:51:59 +02:00
|
|
|
}
|
|
|
|
|
2002-05-04 16:45:34 +02:00
|
|
|
if(with_revoker) {
|
|
|
|
if( !pk->revkey && pk->numrevkeys )
|
|
|
|
BUG();
|
|
|
|
else
|
|
|
|
for(i=0;i<pk->numrevkeys;i++) {
|
|
|
|
u32 r_keyid[2];
|
|
|
|
char *user;
|
|
|
|
|
|
|
|
keyid_from_fingerprint(pk->revkey[i].fpr,
|
2002-05-28 10:27:45 +02:00
|
|
|
MAX_FINGERPRINT_LEN,r_keyid);
|
|
|
|
|
|
|
|
user=get_user_id_string (r_keyid);
|
|
|
|
tty_printf (_("This key may be revoked by %s key "),
|
|
|
|
pubkey_algo_to_string (pk->revkey[i].algid));
|
|
|
|
tty_print_utf8_string (user, strlen (user));
|
|
|
|
if ((pk->revkey[i].class&0x40))
|
|
|
|
tty_printf (_(" (sensitive)"));
|
|
|
|
tty_printf ("\n");
|
2002-05-04 16:45:34 +02:00
|
|
|
m_free(user);
|
|
|
|
}
|
|
|
|
}
|
2002-02-28 22:01:25 +01:00
|
|
|
|
2000-07-05 13:28:59 +02:00
|
|
|
tty_printf(_("%s%c %4u%c/%08lX created: %s expires: %s"),
|
1998-07-29 21:35:05 +02:00
|
|
|
node->pkt->pkttype == PKT_PUBLIC_KEY? "pub":"sub",
|
|
|
|
(node->flag & NODFLG_SELKEY)? '*':' ',
|
|
|
|
nbits_from_pk( pk ),
|
|
|
|
pubkey_letter( pk->pubkey_algo ),
|
|
|
|
(ulong)keyid_from_pk(pk,NULL),
|
|
|
|
datestr_from_pk(pk),
|
|
|
|
expirestr_from_pk(pk) );
|
1998-07-30 19:37:03 +02:00
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_KEY ) {
|
2000-07-05 13:28:59 +02:00
|
|
|
tty_printf(_(" trust: %c/%c"), otrust, trust );
|
1999-07-01 12:53:35 +02:00
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_KEY
|
2001-09-24 18:03:14 +02:00
|
|
|
&& (get_ownertrust (pk)&TRUST_FLAG_DISABLED)) {
|
1999-07-01 12:53:35 +02:00
|
|
|
tty_printf("\n*** ");
|
|
|
|
tty_printf(_("This key has been disabled"));
|
|
|
|
}
|
|
|
|
|
1998-10-07 15:30:43 +02:00
|
|
|
if( with_fpr ) {
|
|
|
|
tty_printf("\n");
|
2001-09-20 09:12:52 +02:00
|
|
|
print_fingerprint ( pk, NULL, 2 );
|
1998-10-07 15:30:43 +02:00
|
|
|
}
|
1998-07-30 19:37:03 +02:00
|
|
|
}
|
|
|
|
tty_printf("\n");
|
1998-05-13 19:53:36 +02:00
|
|
|
}
|
1998-07-29 21:35:05 +02:00
|
|
|
else if( node->pkt->pkttype == PKT_SECRET_KEY
|
|
|
|
|| (with_subkeys && node->pkt->pkttype == PKT_SECRET_SUBKEY) ) {
|
|
|
|
PKT_secret_key *sk = node->pkt->pkt.secret_key;
|
2000-07-05 13:28:59 +02:00
|
|
|
tty_printf(_("%s%c %4u%c/%08lX created: %s expires: %s"),
|
2000-04-10 13:32:38 +02:00
|
|
|
node->pkt->pkttype == PKT_SECRET_KEY? "sec":"ssb",
|
1998-07-29 21:35:05 +02:00
|
|
|
(node->flag & NODFLG_SELKEY)? '*':' ',
|
|
|
|
nbits_from_sk( sk ),
|
|
|
|
pubkey_letter( sk->pubkey_algo ),
|
|
|
|
(ulong)keyid_from_sk(sk,NULL),
|
|
|
|
datestr_from_sk(sk),
|
|
|
|
expirestr_from_sk(sk) );
|
2000-07-05 13:28:59 +02:00
|
|
|
tty_printf("\n");
|
1998-07-29 21:35:05 +02:00
|
|
|
}
|
1999-05-06 14:26:10 +02:00
|
|
|
else if( with_subkeys && node->pkt->pkttype == PKT_SIGNATURE
|
|
|
|
&& node->pkt->pkt.signature->sig_class == 0x28 ) {
|
|
|
|
PKT_signature *sig = node->pkt->pkt.signature;
|
|
|
|
|
|
|
|
rc = check_key_signature( keyblock, node, NULL );
|
|
|
|
if( !rc )
|
2000-07-05 13:28:59 +02:00
|
|
|
tty_printf( _("rev! subkey has been revoked: %s\n"),
|
1999-05-06 14:26:10 +02:00
|
|
|
datestr_from_sig( sig ) );
|
|
|
|
else if( rc == G10ERR_BAD_SIGN )
|
2000-07-05 13:28:59 +02:00
|
|
|
tty_printf( _("rev- faked revocation found\n") );
|
1999-05-06 14:26:10 +02:00
|
|
|
else if( rc )
|
2000-07-05 13:28:59 +02:00
|
|
|
tty_printf( _("rev? problem checking revocation: %s\n"),
|
1999-05-06 14:26:10 +02:00
|
|
|
g10_errstr(rc) );
|
|
|
|
}
|
1998-07-29 21:35:05 +02:00
|
|
|
}
|
|
|
|
/* the user ids */
|
|
|
|
i = 0;
|
|
|
|
for( node = keyblock; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_USER_ID ) {
|
|
|
|
PKT_user_id *uid = node->pkt->pkt.user_id;
|
|
|
|
++i;
|
|
|
|
if( !only_marked || (only_marked && (node->flag & NODFLG_MARK_A))){
|
|
|
|
if( only_marked )
|
|
|
|
tty_printf(" ");
|
|
|
|
else if( node->flag & NODFLG_SELUID )
|
|
|
|
tty_printf("(%d)* ", i);
|
2001-04-25 12:05:33 +02:00
|
|
|
else if( uid->is_primary )
|
|
|
|
tty_printf("(%d). ", i);
|
1998-07-29 21:35:05 +02:00
|
|
|
else
|
|
|
|
tty_printf("(%d) ", i);
|
2001-04-25 12:05:33 +02:00
|
|
|
if ( uid->is_revoked )
|
|
|
|
tty_printf ("[revoked] ");
|
1999-08-31 17:30:12 +02:00
|
|
|
tty_print_utf8_string( uid->name, uid->len );
|
1998-07-29 21:35:05 +02:00
|
|
|
tty_printf("\n");
|
2002-05-13 22:44:30 +02:00
|
|
|
if( with_prefs && (pk_version>3 || uid->selfsigversion>3))
|
2001-08-10 16:04:32 +02:00
|
|
|
show_prefs (uid, with_prefs == 2);
|
1998-06-25 12:19:08 +02:00
|
|
|
}
|
1998-07-29 21:35:05 +02:00
|
|
|
}
|
|
|
|
}
|
2002-04-19 11:18:57 +02:00
|
|
|
|
|
|
|
if (do_warn)
|
|
|
|
tty_printf (_("Please note that the shown key validity "
|
2002-05-13 22:44:30 +02:00
|
|
|
"is not necessarily correct\n"
|
2002-04-19 11:18:57 +02:00
|
|
|
"unless you restart the program.\n"));
|
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
show_key_and_fingerprint( KBNODE keyblock )
|
|
|
|
{
|
|
|
|
KBNODE node;
|
|
|
|
PKT_public_key *pk = NULL;
|
1998-05-13 19:53:36 +02:00
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
for( node = keyblock; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_KEY ) {
|
|
|
|
pk = node->pkt->pkt.public_key;
|
|
|
|
tty_printf("pub %4u%c/%08lX %s ",
|
|
|
|
nbits_from_pk( pk ),
|
|
|
|
pubkey_letter( pk->pubkey_algo ),
|
|
|
|
(ulong)keyid_from_pk(pk,NULL),
|
|
|
|
datestr_from_pk(pk) );
|
1998-06-25 12:19:08 +02:00
|
|
|
}
|
1998-07-29 21:35:05 +02:00
|
|
|
else if( node->pkt->pkttype == PKT_USER_ID ) {
|
|
|
|
PKT_user_id *uid = node->pkt->pkt.user_id;
|
1999-08-31 17:30:12 +02:00
|
|
|
tty_print_utf8_string( uid->name, uid->len );
|
1998-07-29 21:35:05 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
tty_printf("\n");
|
|
|
|
if( pk )
|
2001-09-20 09:12:52 +02:00
|
|
|
print_fingerprint( pk, NULL, 2 );
|
1998-07-29 21:35:05 +02:00
|
|
|
}
|
|
|
|
|
1998-04-20 17:52:20 +02:00
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
|
|
|
|
/****************
|
2001-08-14 13:33:49 +02:00
|
|
|
* Ask for a new user id, do the selfsignature and put it into
|
1998-07-29 21:35:05 +02:00
|
|
|
* both keyblocks.
|
|
|
|
* Return true if there is a new user id
|
|
|
|
*/
|
|
|
|
static int
|
2001-12-22 00:06:02 +01:00
|
|
|
menu_adduid( KBNODE pub_keyblock, KBNODE sec_keyblock, int photo)
|
1998-07-29 21:35:05 +02:00
|
|
|
{
|
|
|
|
PKT_user_id *uid;
|
|
|
|
PKT_public_key *pk=NULL;
|
|
|
|
PKT_secret_key *sk=NULL;
|
|
|
|
PKT_signature *sig=NULL;
|
|
|
|
PACKET *pkt;
|
|
|
|
KBNODE node;
|
|
|
|
KBNODE pub_where=NULL, sec_where=NULL;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
for( node = pub_keyblock; node; pub_where = node, node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_KEY )
|
|
|
|
pk = node->pkt->pkt.public_key;
|
|
|
|
else if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY )
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if( !node ) /* no subkey */
|
|
|
|
pub_where = NULL;
|
|
|
|
for( node = sec_keyblock; node; sec_where = node, node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_SECRET_KEY )
|
1998-10-07 15:30:43 +02:00
|
|
|
sk = copy_secret_key( NULL, node->pkt->pkt.secret_key);
|
1998-07-29 21:35:05 +02:00
|
|
|
else if( node->pkt->pkttype == PKT_SECRET_SUBKEY )
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if( !node ) /* no subkey */
|
|
|
|
sec_where = NULL;
|
2001-12-22 00:06:02 +01:00
|
|
|
assert(pk && sk);
|
|
|
|
|
|
|
|
if(photo) {
|
2002-05-02 00:33:18 +02:00
|
|
|
int hasattrib=0;
|
|
|
|
|
2001-12-22 00:06:02 +01:00
|
|
|
for( node = pub_keyblock; node; node = node->next )
|
|
|
|
if( node->pkt->pkttype == PKT_USER_ID &&
|
2002-01-06 04:52:14 +01:00
|
|
|
node->pkt->pkt.user_id->attrib_data!=NULL)
|
|
|
|
{
|
2002-05-02 00:33:18 +02:00
|
|
|
hasattrib=1;
|
|
|
|
break;
|
|
|
|
}
|
2001-12-22 00:06:02 +01:00
|
|
|
|
2002-05-02 00:33:18 +02:00
|
|
|
/* It is legal but bad for compatibility to add a photo ID to a
|
|
|
|
v3 key as it means that PGP2 will not be able to use that key
|
|
|
|
anymore. Don't bother to ask this if the key already has a
|
|
|
|
photo - any damage has already been done at that point. -dms */
|
|
|
|
if(pk->version==3 && !hasattrib)
|
2001-12-22 00:06:02 +01:00
|
|
|
{
|
2002-01-06 04:52:14 +01:00
|
|
|
if(opt.expert)
|
|
|
|
{
|
|
|
|
tty_printf(_("WARNING: This is a PGP2-style key. "
|
|
|
|
"Adding a photo ID may cause some versions\n"
|
|
|
|
" of PGP to reject this key.\n"));
|
|
|
|
|
|
|
|
if(!cpr_get_answer_is_yes("keyedit.v3_photo.okay",
|
|
|
|
_("Are you sure you still want "
|
2002-04-01 01:51:33 +02:00
|
|
|
"to add it? (y/N) ")))
|
2002-01-06 04:52:14 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
tty_printf(_("You may not add a photo ID to "
|
|
|
|
"a PGP2-style key.\n"));
|
|
|
|
return 0;
|
|
|
|
}
|
2001-12-22 00:06:02 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
uid = generate_photo_id(pk);
|
|
|
|
} else
|
|
|
|
uid = generate_user_id();
|
|
|
|
if( !uid )
|
|
|
|
return 0;
|
1998-07-29 21:35:05 +02:00
|
|
|
|
2001-12-21 22:02:05 +01:00
|
|
|
rc = make_keysig_packet( &sig, pk, uid, NULL, sk, 0x13, 0, 0, 0, 0,
|
1998-11-20 18:42:18 +01:00
|
|
|
keygen_add_std_prefs, pk );
|
1998-10-07 15:30:43 +02:00
|
|
|
free_secret_key( sk );
|
1998-07-29 21:35:05 +02:00
|
|
|
if( rc ) {
|
|
|
|
log_error("signing failed: %s\n", g10_errstr(rc) );
|
|
|
|
free_user_id(uid);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* insert/append to secret keyblock */
|
|
|
|
pkt = m_alloc_clear( sizeof *pkt );
|
|
|
|
pkt->pkttype = PKT_USER_ID;
|
2001-08-10 16:04:32 +02:00
|
|
|
pkt->pkt.user_id = scopy_user_id(uid);
|
1998-07-29 21:35:05 +02:00
|
|
|
node = new_kbnode(pkt);
|
|
|
|
if( sec_where )
|
|
|
|
insert_kbnode( sec_where, node, 0 );
|
1998-04-20 17:52:20 +02:00
|
|
|
else
|
1998-07-29 21:35:05 +02:00
|
|
|
add_kbnode( sec_keyblock, node );
|
|
|
|
pkt = m_alloc_clear( sizeof *pkt );
|
|
|
|
pkt->pkttype = PKT_SIGNATURE;
|
|
|
|
pkt->pkt.signature = copy_signature(NULL, sig);
|
|
|
|
if( sec_where )
|
|
|
|
insert_kbnode( node, new_kbnode(pkt), 0 );
|
|
|
|
else
|
|
|
|
add_kbnode( sec_keyblock, new_kbnode(pkt) );
|
|
|
|
/* insert/append to public keyblock */
|
|
|
|
pkt = m_alloc_clear( sizeof *pkt );
|
|
|
|
pkt->pkttype = PKT_USER_ID;
|
|
|
|
pkt->pkt.user_id = uid;
|
|
|
|
node = new_kbnode(pkt);
|
|
|
|
if( pub_where )
|
|
|
|
insert_kbnode( pub_where, node, 0 );
|
|
|
|
else
|
|
|
|
add_kbnode( pub_keyblock, node );
|
|
|
|
pkt = m_alloc_clear( sizeof *pkt );
|
|
|
|
pkt->pkttype = PKT_SIGNATURE;
|
|
|
|
pkt->pkt.signature = copy_signature(NULL, sig);
|
|
|
|
if( pub_where )
|
|
|
|
insert_kbnode( node, new_kbnode(pkt), 0 );
|
|
|
|
else
|
|
|
|
add_kbnode( pub_keyblock, new_kbnode(pkt) );
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* Remove all selceted userids from the keyrings
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
menu_deluid( KBNODE pub_keyblock, KBNODE sec_keyblock )
|
|
|
|
{
|
|
|
|
KBNODE node;
|
|
|
|
int selected=0;
|
|
|
|
|
|
|
|
for( node = pub_keyblock; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_USER_ID ) {
|
|
|
|
selected = node->flag & NODFLG_SELUID;
|
|
|
|
if( selected ) {
|
2002-04-20 00:38:20 +02:00
|
|
|
/* Only cause a trust update if we delete a
|
|
|
|
non-revoked user id */
|
|
|
|
if(!node->pkt->pkt.user_id->is_revoked)
|
|
|
|
update_trust=1;
|
1998-07-29 21:35:05 +02:00
|
|
|
delete_kbnode( node );
|
|
|
|
if( sec_keyblock ) {
|
|
|
|
KBNODE snode;
|
|
|
|
int s_selected = 0;
|
|
|
|
PKT_user_id *uid = node->pkt->pkt.user_id;
|
|
|
|
for( snode = sec_keyblock; snode; snode = snode->next ) {
|
|
|
|
if( snode->pkt->pkttype == PKT_USER_ID ) {
|
|
|
|
PKT_user_id *suid = snode->pkt->pkt.user_id;
|
|
|
|
|
|
|
|
s_selected =
|
|
|
|
(uid->len == suid->len
|
|
|
|
&& !memcmp( uid->name, suid->name, uid->len));
|
|
|
|
if( s_selected )
|
|
|
|
delete_kbnode( snode );
|
|
|
|
}
|
|
|
|
else if( s_selected
|
|
|
|
&& snode->pkt->pkttype == PKT_SIGNATURE )
|
|
|
|
delete_kbnode( snode );
|
|
|
|
else if( snode->pkt->pkttype == PKT_SECRET_SUBKEY )
|
|
|
|
s_selected = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if( selected && node->pkt->pkttype == PKT_SIGNATURE )
|
|
|
|
delete_kbnode( node );
|
|
|
|
else if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY )
|
|
|
|
selected = 0;
|
|
|
|
}
|
|
|
|
commit_kbnode( &pub_keyblock );
|
|
|
|
if( sec_keyblock )
|
|
|
|
commit_kbnode( &sec_keyblock );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-05-27 09:45:46 +02:00
|
|
|
static int
|
|
|
|
menu_delsig( KBNODE pub_keyblock )
|
|
|
|
{
|
|
|
|
KBNODE node;
|
|
|
|
PKT_user_id *uid = NULL;
|
|
|
|
int changed=0;
|
|
|
|
|
|
|
|
for( node = pub_keyblock; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_USER_ID ) {
|
|
|
|
uid = (node->flag & NODFLG_SELUID)? node->pkt->pkt.user_id : NULL;
|
|
|
|
}
|
|
|
|
else if( uid && node->pkt->pkttype == PKT_SIGNATURE ) {
|
1999-06-16 20:25:37 +02:00
|
|
|
int okay, valid, selfsig, inv_sig, no_key, other_err;
|
1999-05-27 09:45:46 +02:00
|
|
|
|
|
|
|
tty_printf("uid ");
|
1999-08-31 17:30:12 +02:00
|
|
|
tty_print_utf8_string( uid->name, uid->len );
|
1999-05-27 09:45:46 +02:00
|
|
|
tty_printf("\n");
|
|
|
|
|
1999-06-16 20:25:37 +02:00
|
|
|
okay = inv_sig = no_key = other_err = 0;
|
1999-05-27 09:45:46 +02:00
|
|
|
valid = print_and_check_one_sig( pub_keyblock, node,
|
1999-06-16 20:25:37 +02:00
|
|
|
&inv_sig, &no_key, &other_err,
|
|
|
|
&selfsig, 1 );
|
|
|
|
|
2002-04-19 13:31:53 +02:00
|
|
|
if( valid ) {
|
1999-06-16 20:25:37 +02:00
|
|
|
okay = cpr_get_answer_yes_no_quit(
|
|
|
|
"keyedit.delsig.valid",
|
|
|
|
_("Delete this good signature? (y/N/q)"));
|
2002-04-19 13:31:53 +02:00
|
|
|
|
|
|
|
/* Only update trust if we delete a good signature.
|
|
|
|
The other two cases do not affect trust. */
|
|
|
|
if(okay)
|
|
|
|
update_trust=1;
|
|
|
|
}
|
1999-06-16 20:25:37 +02:00
|
|
|
else if( inv_sig || other_err )
|
|
|
|
okay = cpr_get_answer_yes_no_quit(
|
|
|
|
"keyedit.delsig.invalid",
|
|
|
|
_("Delete this invalid signature? (y/N/q)"));
|
|
|
|
else if( no_key )
|
|
|
|
okay = cpr_get_answer_yes_no_quit(
|
|
|
|
"keyedit.delsig.unknown",
|
|
|
|
_("Delete this unknown signature? (y/N/q)"));
|
|
|
|
|
1999-05-27 09:45:46 +02:00
|
|
|
if( okay == -1 )
|
|
|
|
break;
|
1999-06-16 20:25:37 +02:00
|
|
|
if( okay && selfsig && !cpr_get_answer_is_yes(
|
1999-05-27 09:45:46 +02:00
|
|
|
"keyedit.delsig.selfsig",
|
|
|
|
_("Really delete this self-signature? (y/N)") ))
|
|
|
|
okay = 0;
|
|
|
|
if( okay ) {
|
|
|
|
delete_kbnode( node );
|
|
|
|
changed++;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
else if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY )
|
|
|
|
uid = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( changed ) {
|
|
|
|
commit_kbnode( &pub_keyblock );
|
|
|
|
tty_printf( changed == 1? _("Deleted %d signature.\n")
|
|
|
|
: _("Deleted %d signatures.\n"), changed );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
tty_printf( _("Nothing deleted.\n") );
|
|
|
|
|
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
/****************
|
|
|
|
* Remove some of the secondary keys
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
menu_delkey( KBNODE pub_keyblock, KBNODE sec_keyblock )
|
|
|
|
{
|
|
|
|
KBNODE node;
|
|
|
|
int selected=0;
|
|
|
|
|
|
|
|
for( node = pub_keyblock; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
|
|
|
|
selected = node->flag & NODFLG_SELKEY;
|
|
|
|
if( selected ) {
|
|
|
|
delete_kbnode( node );
|
|
|
|
if( sec_keyblock ) {
|
|
|
|
KBNODE snode;
|
|
|
|
int s_selected = 0;
|
|
|
|
u32 ki[2];
|
|
|
|
|
|
|
|
keyid_from_pk( node->pkt->pkt.public_key, ki );
|
|
|
|
for( snode = sec_keyblock; snode; snode = snode->next ) {
|
|
|
|
if( snode->pkt->pkttype == PKT_SECRET_SUBKEY ) {
|
|
|
|
u32 ki2[2];
|
|
|
|
|
|
|
|
keyid_from_sk( snode->pkt->pkt.secret_key, ki2 );
|
|
|
|
s_selected = (ki[0] == ki2[0] && ki[1] == ki2[1]);
|
|
|
|
if( s_selected )
|
|
|
|
delete_kbnode( snode );
|
|
|
|
}
|
|
|
|
else if( s_selected
|
|
|
|
&& snode->pkt->pkttype == PKT_SIGNATURE )
|
|
|
|
delete_kbnode( snode );
|
|
|
|
else
|
|
|
|
s_selected = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if( selected && node->pkt->pkttype == PKT_SIGNATURE )
|
|
|
|
delete_kbnode( node );
|
|
|
|
else
|
|
|
|
selected = 0;
|
|
|
|
}
|
|
|
|
commit_kbnode( &pub_keyblock );
|
|
|
|
if( sec_keyblock )
|
|
|
|
commit_kbnode( &sec_keyblock );
|
2002-04-19 13:31:53 +02:00
|
|
|
|
|
|
|
/* No need to set update_trust here since signing keys no longer
|
|
|
|
are used to certify other keys, so there is no change in trust
|
|
|
|
when revoking/removing them */
|
1998-07-29 21:35:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-05-19 17:04:04 +02:00
|
|
|
/****************
|
|
|
|
* Ask for a new revoker, do the selfsignature and put it into
|
|
|
|
* both keyblocks.
|
|
|
|
* Return true if there is a new revoker
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock )
|
|
|
|
{
|
|
|
|
PKT_public_key *pk=NULL,*revoker_pk=NULL;
|
|
|
|
PKT_secret_key *sk=NULL;
|
|
|
|
PKT_signature *sig=NULL;
|
|
|
|
PACKET *pkt;
|
|
|
|
struct revocation_key revkey;
|
|
|
|
size_t fprlen;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
assert(pub_keyblock->pkt->pkttype==PKT_PUBLIC_KEY);
|
|
|
|
assert(sec_keyblock->pkt->pkttype==PKT_SECRET_KEY);
|
|
|
|
|
|
|
|
pk=pub_keyblock->pkt->pkt.public_key;
|
|
|
|
sk=copy_secret_key(NULL,sec_keyblock->pkt->pkt.secret_key);
|
|
|
|
|
|
|
|
for(;;)
|
|
|
|
{
|
|
|
|
char *answer;
|
|
|
|
u32 keyid[2];
|
|
|
|
char *p;
|
|
|
|
size_t n;
|
|
|
|
|
|
|
|
if(revoker_pk)
|
|
|
|
free_public_key(revoker_pk);
|
|
|
|
|
|
|
|
revoker_pk=m_alloc_clear(sizeof(*revoker_pk));
|
|
|
|
|
|
|
|
tty_printf("\n");
|
|
|
|
|
|
|
|
answer=cpr_get_utf8("keyedit.add_revoker",
|
|
|
|
_("Enter the user ID of the designated revoker: "));
|
|
|
|
if(answer[0]=='\0' || answer[0]=='\004')
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
rc=get_pubkey_byname(revoker_pk,answer,NULL,NULL);
|
|
|
|
|
|
|
|
if(rc)
|
|
|
|
{
|
|
|
|
log_error (_("key `%s' not found: %s\n"),answer,g10_errstr(rc));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
fingerprint_from_pk(revoker_pk,revkey.fpr,&fprlen);
|
|
|
|
if(fprlen!=20)
|
|
|
|
{
|
|
|
|
log_error(_("cannot appoint a PGP 2.x style key as a "
|
|
|
|
"designated revoker\n"));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(cmp_public_keys(revoker_pk,pk)==0)
|
|
|
|
{
|
|
|
|
/* This actually causes no harm (after all, a key that
|
|
|
|
designates itself as a revoker is the same as a
|
|
|
|
regular key), but it's easy enough to check. */
|
|
|
|
log_error(_("you cannot appoint a key as its own "
|
|
|
|
"designated revoker\n"));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
keyid_from_pk(revoker_pk,keyid);
|
|
|
|
|
|
|
|
tty_printf("\npub %4u%c/%08lX %s ",
|
|
|
|
nbits_from_pk( revoker_pk ),
|
|
|
|
pubkey_letter( revoker_pk->pubkey_algo ),
|
|
|
|
(ulong)keyid[1], datestr_from_pk(pk) );
|
|
|
|
|
|
|
|
p = get_user_id( keyid, &n );
|
|
|
|
tty_print_utf8_string( p, n );
|
|
|
|
m_free(p);
|
|
|
|
tty_printf("\n");
|
|
|
|
print_fingerprint(revoker_pk,NULL,2);
|
|
|
|
tty_printf("\n");
|
|
|
|
|
|
|
|
tty_printf("WARNING: appointing a key as a designated revoker "
|
|
|
|
"cannot be undone!\n");
|
|
|
|
|
|
|
|
tty_printf("\n");
|
|
|
|
|
|
|
|
if(!cpr_get_answer_is_yes("keyedit.add_revoker.okay",
|
|
|
|
"Are you sure you want to appoint this "
|
|
|
|
"key as a designated revoker? (y/N): "))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
revkey.class=0x80;
|
|
|
|
revkey.algid=revoker_pk->pubkey_algo;
|
|
|
|
free_public_key(revoker_pk);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = make_keysig_packet( &sig, pk, NULL, NULL, sk, 0x1F, 0, 0, 0, 0,
|
|
|
|
keygen_add_revkey,&revkey );
|
|
|
|
if( rc )
|
|
|
|
{
|
|
|
|
log_error("signing failed: %s\n", g10_errstr(rc) );
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
free_secret_key(sk);
|
|
|
|
sk=NULL;
|
|
|
|
|
|
|
|
/* insert into secret keyblock */
|
|
|
|
pkt = m_alloc_clear( sizeof *pkt );
|
|
|
|
pkt->pkttype = PKT_SIGNATURE;
|
|
|
|
pkt->pkt.signature = copy_signature(NULL, sig);
|
|
|
|
insert_kbnode( sec_keyblock, new_kbnode(pkt), PKT_SIGNATURE );
|
|
|
|
|
|
|
|
/* insert into public keyblock */
|
|
|
|
pkt = m_alloc_clear( sizeof *pkt );
|
|
|
|
pkt->pkttype = PKT_SIGNATURE;
|
|
|
|
pkt->pkt.signature = sig;
|
|
|
|
insert_kbnode( pub_keyblock, new_kbnode(pkt), PKT_SIGNATURE );
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
if(sk)
|
|
|
|
free_secret_key(sk);
|
|
|
|
if(sig)
|
|
|
|
free_seckey_enc(sig);
|
|
|
|
if(revoker_pk)
|
|
|
|
free_public_key(revoker_pk);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1998-10-18 17:21:22 +02:00
|
|
|
|
|
|
|
static int
|
|
|
|
menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock )
|
|
|
|
{
|
1998-11-20 18:42:18 +01:00
|
|
|
int n1, signumber, rc;
|
1998-10-18 17:21:22 +02:00
|
|
|
u32 expiredate;
|
|
|
|
int mainkey=0;
|
|
|
|
PKT_secret_key *sk; /* copy of the main sk */
|
|
|
|
PKT_public_key *main_pk, *sub_pk;
|
|
|
|
PKT_user_id *uid;
|
|
|
|
KBNODE node;
|
|
|
|
u32 keyid[2];
|
|
|
|
|
|
|
|
if( count_selected_keys( sec_keyblock ) ) {
|
|
|
|
tty_printf(_("Please remove selections from the secret keys.\n"));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
n1 = count_selected_keys( pub_keyblock );
|
|
|
|
if( n1 > 1 ) {
|
|
|
|
tty_printf(_("Please select at most one secondary key.\n"));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else if( n1 )
|
1999-06-16 20:25:37 +02:00
|
|
|
tty_printf(_("Changing expiration time for a secondary key.\n"));
|
1998-10-18 17:21:22 +02:00
|
|
|
else {
|
1999-06-16 20:25:37 +02:00
|
|
|
tty_printf(_("Changing expiration time for the primary key.\n"));
|
1998-10-18 17:21:22 +02:00
|
|
|
mainkey=1;
|
|
|
|
}
|
|
|
|
|
|
|
|
expiredate = ask_expiredate();
|
|
|
|
node = find_kbnode( sec_keyblock, PKT_SECRET_KEY );
|
|
|
|
sk = copy_secret_key( NULL, node->pkt->pkt.secret_key);
|
|
|
|
|
|
|
|
/* Now we can actually change the self signature(s) */
|
|
|
|
main_pk = sub_pk = NULL;
|
|
|
|
uid = NULL;
|
1998-11-20 18:42:18 +01:00
|
|
|
signumber = 0;
|
1998-10-18 17:21:22 +02:00
|
|
|
for( node=pub_keyblock; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_KEY ) {
|
|
|
|
main_pk = node->pkt->pkt.public_key;
|
|
|
|
keyid_from_pk( main_pk, keyid );
|
1998-11-20 18:42:18 +01:00
|
|
|
main_pk->expiredate = expiredate;
|
1998-10-18 17:21:22 +02:00
|
|
|
}
|
|
|
|
else if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
1998-11-20 18:42:18 +01:00
|
|
|
&& (node->flag & NODFLG_SELKEY ) ) {
|
1998-10-18 17:21:22 +02:00
|
|
|
sub_pk = node->pkt->pkt.public_key;
|
1998-11-20 18:42:18 +01:00
|
|
|
sub_pk->expiredate = expiredate;
|
|
|
|
}
|
1998-10-18 17:21:22 +02:00
|
|
|
else if( node->pkt->pkttype == PKT_USER_ID )
|
|
|
|
uid = node->pkt->pkt.user_id;
|
2000-02-10 17:41:06 +01:00
|
|
|
else if( main_pk && node->pkt->pkttype == PKT_SIGNATURE
|
2000-07-24 10:24:35 +02:00
|
|
|
&& ( mainkey || sub_pk ) ) {
|
1998-10-18 17:21:22 +02:00
|
|
|
PKT_signature *sig = node->pkt->pkt.signature;
|
|
|
|
if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
|
|
|
|
&& ( (mainkey && uid && (sig->sig_class&~3) == 0x10)
|
|
|
|
|| (!mainkey && sig->sig_class == 0x18) ) ) {
|
1998-11-20 18:42:18 +01:00
|
|
|
/* this is a selfsignature which is to be replaced */
|
1998-10-18 17:21:22 +02:00
|
|
|
PKT_signature *newsig;
|
|
|
|
PACKET *newpkt;
|
|
|
|
KBNODE sn;
|
1998-11-20 18:42:18 +01:00
|
|
|
int signumber2 = 0;
|
|
|
|
|
|
|
|
signumber++;
|
|
|
|
|
|
|
|
if( (mainkey && main_pk->version < 4)
|
|
|
|
|| (!mainkey && sub_pk->version < 4 ) ) {
|
|
|
|
log_info(_(
|
|
|
|
"You can't change the expiration date of a v3 key\n"));
|
|
|
|
free_secret_key( sk );
|
|
|
|
return 0;
|
|
|
|
}
|
1998-10-18 17:21:22 +02:00
|
|
|
|
|
|
|
/* find the corresponding secret self-signature */
|
|
|
|
for( sn=sec_keyblock; sn; sn = sn->next ) {
|
1998-11-20 18:42:18 +01:00
|
|
|
if( sn->pkt->pkttype == PKT_SIGNATURE ) {
|
|
|
|
PKT_signature *b = sn->pkt->pkt.signature;
|
|
|
|
if( keyid[0] == b->keyid[0] && keyid[1] == b->keyid[1]
|
|
|
|
&& sig->sig_class == b->sig_class
|
|
|
|
&& ++signumber2 == signumber )
|
|
|
|
break;
|
|
|
|
}
|
1998-10-18 17:21:22 +02:00
|
|
|
}
|
|
|
|
if( !sn )
|
|
|
|
log_info(_("No corresponding signature in secret ring\n"));
|
|
|
|
|
|
|
|
/* create new self signature */
|
|
|
|
if( mainkey )
|
|
|
|
rc = make_keysig_packet( &newsig, main_pk, uid, NULL,
|
2001-12-21 22:02:05 +01:00
|
|
|
sk, 0x13, 0, 0, 0, 0,
|
1998-11-20 18:42:18 +01:00
|
|
|
keygen_add_std_prefs, main_pk );
|
1998-10-18 17:21:22 +02:00
|
|
|
else
|
|
|
|
rc = make_keysig_packet( &newsig, main_pk, NULL, sub_pk,
|
2001-12-21 22:02:05 +01:00
|
|
|
sk, 0x18, 0, 0, 0, 0,
|
1998-11-20 18:42:18 +01:00
|
|
|
keygen_add_key_expire, sub_pk );
|
1998-10-18 17:21:22 +02:00
|
|
|
if( rc ) {
|
|
|
|
log_error("make_keysig_packet failed: %s\n",
|
|
|
|
g10_errstr(rc));
|
|
|
|
free_secret_key( sk );
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* replace the packet */
|
|
|
|
newpkt = m_alloc_clear( sizeof *newpkt );
|
|
|
|
newpkt->pkttype = PKT_SIGNATURE;
|
|
|
|
newpkt->pkt.signature = newsig;
|
|
|
|
free_packet( node->pkt );
|
|
|
|
m_free( node->pkt );
|
|
|
|
node->pkt = newpkt;
|
|
|
|
if( sn ) {
|
|
|
|
newpkt = m_alloc_clear( sizeof *newpkt );
|
|
|
|
newpkt->pkttype = PKT_SIGNATURE;
|
|
|
|
newpkt->pkt.signature = copy_signature( NULL, newsig );
|
|
|
|
free_packet( sn->pkt );
|
|
|
|
m_free( sn->pkt );
|
|
|
|
sn->pkt = newpkt;
|
|
|
|
}
|
2000-02-10 17:41:06 +01:00
|
|
|
sub_pk = NULL;
|
1998-10-18 17:21:22 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
free_secret_key( sk );
|
2002-04-19 13:31:53 +02:00
|
|
|
update_trust=1;
|
1998-10-18 17:21:22 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2001-07-26 11:37:47 +02:00
|
|
|
static int
|
|
|
|
change_primary_uid_cb ( PKT_signature *sig, void *opaque )
|
|
|
|
{
|
|
|
|
byte buf[1];
|
|
|
|
|
|
|
|
/* first clear all primary uid flags so that we are sure none are
|
|
|
|
* lingering around */
|
2001-08-09 11:34:25 +02:00
|
|
|
delete_sig_subpkt (sig->hashed, SIGSUBPKT_PRIMARY_UID);
|
|
|
|
delete_sig_subpkt (sig->unhashed, SIGSUBPKT_PRIMARY_UID);
|
2001-07-26 11:37:47 +02:00
|
|
|
|
|
|
|
/* if opaque is set,we want to set the primary id */
|
|
|
|
if (opaque) {
|
|
|
|
buf[0] = 1;
|
|
|
|
build_sig_subpkt (sig, SIGSUBPKT_PRIMARY_UID, buf, 1 );
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-08-09 15:11:51 +02:00
|
|
|
|
2001-07-26 11:37:47 +02:00
|
|
|
/*
|
|
|
|
* Set the primary uid flag for the selected UID. We will also reset
|
|
|
|
* all other primary uid flags. For this to work with have to update
|
|
|
|
* all the signature timestamps. If we would do this with the current
|
|
|
|
* time, we lose quite a lot of information, so we use a a kludge to
|
|
|
|
* do this: Just increment the timestamp by one second which is
|
|
|
|
* sufficient to updated a signature during import.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
menu_set_primary_uid ( KBNODE pub_keyblock, KBNODE sec_keyblock )
|
|
|
|
{
|
|
|
|
PKT_secret_key *sk; /* copy of the main sk */
|
|
|
|
PKT_public_key *main_pk;
|
|
|
|
PKT_user_id *uid;
|
|
|
|
KBNODE node;
|
|
|
|
u32 keyid[2];
|
|
|
|
int selected;
|
2002-04-11 06:04:41 +02:00
|
|
|
int attribute = 0;
|
2001-07-26 11:37:47 +02:00
|
|
|
int modified = 0;
|
|
|
|
|
|
|
|
if ( count_selected_uids (pub_keyblock) != 1 ) {
|
|
|
|
tty_printf(_("Please select exactly one user ID.\n"));
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
node = find_kbnode( sec_keyblock, PKT_SECRET_KEY );
|
|
|
|
sk = copy_secret_key( NULL, node->pkt->pkt.secret_key);
|
|
|
|
|
|
|
|
/* Now we can actually change the self signature(s) */
|
|
|
|
main_pk = NULL;
|
|
|
|
uid = NULL;
|
|
|
|
selected = 0;
|
2002-04-11 06:04:41 +02:00
|
|
|
|
|
|
|
/* Is our selected uid an attribute packet? */
|
|
|
|
for ( node=pub_keyblock; node; node = node->next )
|
|
|
|
if (node->pkt->pkttype == PKT_USER_ID && node->flag & NODFLG_SELUID)
|
|
|
|
attribute = (node->pkt->pkt.user_id->attrib_data!=NULL);
|
|
|
|
|
2001-07-26 11:37:47 +02:00
|
|
|
for ( node=pub_keyblock; node; node = node->next ) {
|
|
|
|
if ( node->pkt->pkttype == PKT_PUBLIC_SUBKEY )
|
|
|
|
break; /* ready */
|
|
|
|
|
|
|
|
if ( node->pkt->pkttype == PKT_PUBLIC_KEY ) {
|
|
|
|
main_pk = node->pkt->pkt.public_key;
|
|
|
|
keyid_from_pk( main_pk, keyid );
|
|
|
|
}
|
|
|
|
else if ( node->pkt->pkttype == PKT_USER_ID ) {
|
|
|
|
uid = node->pkt->pkt.user_id;
|
|
|
|
selected = node->flag & NODFLG_SELUID;
|
|
|
|
}
|
|
|
|
else if ( main_pk && uid && node->pkt->pkttype == PKT_SIGNATURE ) {
|
|
|
|
PKT_signature *sig = node->pkt->pkt.signature;
|
|
|
|
if ( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
|
|
|
|
&& (uid && (sig->sig_class&~3) == 0x10)
|
2002-04-11 06:04:41 +02:00
|
|
|
&& attribute == (uid->attrib_data!=NULL)) {
|
2002-05-06 18:40:33 +02:00
|
|
|
if(sig->version < 4) {
|
|
|
|
char *user=utf8_to_native(uid->name,strlen(uid->name),0);
|
|
|
|
|
|
|
|
log_info(_("skipping v3 self-signature on user id \"%s\"\n"),
|
|
|
|
user);
|
|
|
|
m_free(user);
|
|
|
|
}
|
|
|
|
else {
|
2002-04-11 06:04:41 +02:00
|
|
|
/* This is a selfsignature which is to be replaced.
|
|
|
|
We can just ignore v3 signatures because they are
|
|
|
|
not able to carry the primary ID flag. We also
|
|
|
|
ignore self-sigs on user IDs that are not of the
|
|
|
|
same type that we are making primary. That is, if
|
|
|
|
we are making a user ID primary, we alter user IDs.
|
|
|
|
If we are making an attribute packet primary, we
|
|
|
|
alter attribute packets. */
|
|
|
|
|
2001-07-26 11:37:47 +02:00
|
|
|
/* FIXME: We must make sure that we only have one
|
|
|
|
self-signature per user ID here (not counting
|
|
|
|
revocations) */
|
|
|
|
PKT_signature *newsig;
|
|
|
|
PACKET *newpkt;
|
|
|
|
const byte *p;
|
|
|
|
int action;
|
|
|
|
|
|
|
|
/* see whether this signature has the primary UID flag */
|
2001-08-09 11:34:25 +02:00
|
|
|
p = parse_sig_subpkt (sig->hashed,
|
2001-07-26 11:37:47 +02:00
|
|
|
SIGSUBPKT_PRIMARY_UID, NULL );
|
|
|
|
if ( !p )
|
2001-08-09 11:34:25 +02:00
|
|
|
p = parse_sig_subpkt (sig->unhashed,
|
2001-07-26 11:37:47 +02:00
|
|
|
SIGSUBPKT_PRIMARY_UID, NULL );
|
|
|
|
if ( p && *p ) /* yes */
|
|
|
|
action = selected? 0 : -1;
|
|
|
|
else /* no */
|
|
|
|
action = selected? 1 : 0;
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 22:47:23 +02:00
|
|
|
|
2001-07-26 11:37:47 +02:00
|
|
|
if (action) {
|
|
|
|
int rc = update_keysig_packet (&newsig, sig,
|
|
|
|
main_pk, uid,
|
|
|
|
sk,
|
|
|
|
change_primary_uid_cb,
|
|
|
|
action > 0? "x":NULL );
|
|
|
|
if( rc ) {
|
|
|
|
log_error ("update_keysig_packet failed: %s\n",
|
|
|
|
g10_errstr(rc));
|
|
|
|
free_secret_key( sk );
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* replace the packet */
|
|
|
|
newpkt = m_alloc_clear( sizeof *newpkt );
|
|
|
|
newpkt->pkttype = PKT_SIGNATURE;
|
|
|
|
newpkt->pkt.signature = newsig;
|
|
|
|
free_packet( node->pkt );
|
|
|
|
m_free( node->pkt );
|
|
|
|
node->pkt = newpkt;
|
|
|
|
modified = 1;
|
2002-05-06 18:40:33 +02:00
|
|
|
}
|
|
|
|
}
|
2001-07-26 11:37:47 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
free_secret_key( sk );
|
|
|
|
return modified;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-08-09 15:11:51 +02:00
|
|
|
/*
|
|
|
|
* Set preferences to new values for the selected user IDs
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
menu_set_preferences (KBNODE pub_keyblock, KBNODE sec_keyblock )
|
|
|
|
{
|
|
|
|
PKT_secret_key *sk; /* copy of the main sk */
|
|
|
|
PKT_public_key *main_pk;
|
|
|
|
PKT_user_id *uid;
|
|
|
|
KBNODE node;
|
|
|
|
u32 keyid[2];
|
|
|
|
int selected, select_all;
|
|
|
|
int modified = 0;
|
|
|
|
|
|
|
|
select_all = !count_selected_uids (pub_keyblock);
|
|
|
|
|
|
|
|
node = find_kbnode( sec_keyblock, PKT_SECRET_KEY );
|
|
|
|
sk = copy_secret_key( NULL, node->pkt->pkt.secret_key);
|
|
|
|
|
|
|
|
/* Now we can actually change the self signature(s) */
|
|
|
|
main_pk = NULL;
|
|
|
|
uid = NULL;
|
|
|
|
selected = 0;
|
|
|
|
for ( node=pub_keyblock; node; node = node->next ) {
|
|
|
|
if ( node->pkt->pkttype == PKT_PUBLIC_SUBKEY )
|
|
|
|
break; /* ready */
|
|
|
|
|
|
|
|
if ( node->pkt->pkttype == PKT_PUBLIC_KEY ) {
|
|
|
|
main_pk = node->pkt->pkt.public_key;
|
|
|
|
keyid_from_pk( main_pk, keyid );
|
|
|
|
}
|
|
|
|
else if ( node->pkt->pkttype == PKT_USER_ID ) {
|
|
|
|
uid = node->pkt->pkt.user_id;
|
|
|
|
selected = select_all || (node->flag & NODFLG_SELUID);
|
|
|
|
}
|
|
|
|
else if ( main_pk && uid && selected
|
|
|
|
&& node->pkt->pkttype == PKT_SIGNATURE ) {
|
|
|
|
PKT_signature *sig = node->pkt->pkt.signature;
|
|
|
|
if ( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
|
2002-05-07 00:38:53 +02:00
|
|
|
&& (uid && (sig->sig_class&~3) == 0x10) ) {
|
|
|
|
if( sig->version < 4 ) {
|
|
|
|
char *user=utf8_to_native(uid->name,strlen(uid->name),0);
|
|
|
|
|
|
|
|
log_info(_("skipping v3 self-signature on user id \"%s\"\n"),
|
|
|
|
user);
|
|
|
|
m_free(user);
|
|
|
|
}
|
|
|
|
else {
|
2001-08-09 15:11:51 +02:00
|
|
|
/* This is a selfsignature which is to be replaced
|
|
|
|
* We have to ignore v3 signatures because they are
|
|
|
|
* not able to carry the preferences */
|
|
|
|
PKT_signature *newsig;
|
|
|
|
PACKET *newpkt;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
rc = update_keysig_packet (&newsig, sig,
|
|
|
|
main_pk, uid,
|
|
|
|
sk,
|
|
|
|
keygen_upd_std_prefs,
|
|
|
|
NULL );
|
|
|
|
if( rc ) {
|
|
|
|
log_error ("update_keysig_packet failed: %s\n",
|
|
|
|
g10_errstr(rc));
|
|
|
|
free_secret_key( sk );
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* replace the packet */
|
|
|
|
newpkt = m_alloc_clear( sizeof *newpkt );
|
|
|
|
newpkt->pkttype = PKT_SIGNATURE;
|
|
|
|
newpkt->pkt.signature = newsig;
|
|
|
|
free_packet( node->pkt );
|
|
|
|
m_free( node->pkt );
|
|
|
|
node->pkt = newpkt;
|
|
|
|
modified = 1;
|
2002-05-07 00:38:53 +02:00
|
|
|
}
|
2001-08-09 15:11:51 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
free_secret_key( sk );
|
|
|
|
return modified;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-07-29 21:35:05 +02:00
|
|
|
/****************
|
|
|
|
* Select one user id or remove all selection if index is 0.
|
|
|
|
* Returns: True if the selection changed;
|
|
|
|
*/
|
|
|
|
static int
|
1999-02-16 14:16:33 +01:00
|
|
|
menu_select_uid( KBNODE keyblock, int idx )
|
1998-07-29 21:35:05 +02:00
|
|
|
{
|
|
|
|
KBNODE node;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* first check that the index is valid */
|
1999-02-16 14:16:33 +01:00
|
|
|
if( idx ) {
|
1998-07-29 21:35:05 +02:00
|
|
|
for( i=0, node = keyblock; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_USER_ID ) {
|
1999-02-16 14:16:33 +01:00
|
|
|
if( ++i == idx )
|
1998-07-29 21:35:05 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( !node ) {
|
1999-09-01 15:40:07 +02:00
|
|
|
tty_printf(_("No user ID with index %d\n"), idx );
|
1998-07-29 21:35:05 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else { /* reset all */
|
|
|
|
for( i=0, node = keyblock; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_USER_ID )
|
|
|
|
node->flag &= ~NODFLG_SELUID;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
/* and toggle the new index */
|
|
|
|
for( i=0, node = keyblock; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_USER_ID ) {
|
1999-02-28 19:14:18 +01:00
|
|
|
if( ++i == idx ) {
|
1998-07-29 21:35:05 +02:00
|
|
|
if( (node->flag & NODFLG_SELUID) )
|
|
|
|
node->flag &= ~NODFLG_SELUID;
|
|
|
|
else
|
|
|
|
node->flag |= NODFLG_SELUID;
|
1999-02-28 19:14:18 +01:00
|
|
|
}
|
1998-07-29 21:35:05 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* Select secondary keys
|
|
|
|
* Returns: True if the selection changed;
|
|
|
|
*/
|
|
|
|
static int
|
1999-02-16 14:16:33 +01:00
|
|
|
menu_select_key( KBNODE keyblock, int idx )
|
1998-07-29 21:35:05 +02:00
|
|
|
{
|
|
|
|
KBNODE node;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* first check that the index is valid */
|
1999-02-16 14:16:33 +01:00
|
|
|
if( idx ) {
|
1998-07-29 21:35:05 +02:00
|
|
|
for( i=0, node = keyblock; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
|| node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
|
1999-02-16 14:16:33 +01:00
|
|
|
if( ++i == idx )
|
1998-07-29 21:35:05 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( !node ) {
|
1999-02-16 14:16:33 +01:00
|
|
|
tty_printf(_("No secondary key with index %d\n"), idx );
|
1998-07-29 21:35:05 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else { /* reset all */
|
|
|
|
for( i=0, node = keyblock; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
|| node->pkt->pkttype == PKT_SECRET_SUBKEY )
|
|
|
|
node->flag &= ~NODFLG_SELKEY;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
/* and set the new index */
|
|
|
|
for( i=0, node = keyblock; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
|| node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
|
1999-02-28 19:14:18 +01:00
|
|
|
if( ++i == idx ) {
|
1998-07-29 21:35:05 +02:00
|
|
|
if( (node->flag & NODFLG_SELKEY) )
|
|
|
|
node->flag &= ~NODFLG_SELKEY;
|
|
|
|
else
|
|
|
|
node->flag |= NODFLG_SELKEY;
|
1999-02-28 19:14:18 +01:00
|
|
|
}
|
1998-07-29 21:35:05 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
count_uids_with_flag( KBNODE keyblock, unsigned flag )
|
|
|
|
{
|
|
|
|
KBNODE node;
|
|
|
|
int i=0;
|
|
|
|
|
|
|
|
for( node = keyblock; node; node = node->next )
|
|
|
|
if( node->pkt->pkttype == PKT_USER_ID && (node->flag & flag) )
|
|
|
|
i++;
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
count_keys_with_flag( KBNODE keyblock, unsigned flag )
|
|
|
|
{
|
|
|
|
KBNODE node;
|
|
|
|
int i=0;
|
|
|
|
|
|
|
|
for( node = keyblock; node; node = node->next )
|
|
|
|
if( ( node->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
|| node->pkt->pkttype == PKT_SECRET_SUBKEY)
|
|
|
|
&& (node->flag & flag) )
|
|
|
|
i++;
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
count_uids( KBNODE keyblock )
|
|
|
|
{
|
|
|
|
KBNODE node;
|
|
|
|
int i=0;
|
|
|
|
|
|
|
|
for( node = keyblock; node; node = node->next )
|
|
|
|
if( node->pkt->pkttype == PKT_USER_ID )
|
|
|
|
i++;
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* Returns true if there is at least one selected user id
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
count_selected_uids( KBNODE keyblock )
|
|
|
|
{
|
|
|
|
return count_uids_with_flag( keyblock, NODFLG_SELUID);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
count_selected_keys( KBNODE keyblock )
|
|
|
|
{
|
|
|
|
return count_keys_with_flag( keyblock, NODFLG_SELKEY);
|
1998-04-20 17:52:20 +02:00
|
|
|
}
|
|
|
|
|
2002-04-13 06:32:03 +02:00
|
|
|
/* returns how many real (i.e. not attribute) uids are unmarked */
|
|
|
|
static int
|
|
|
|
real_uids_left( KBNODE keyblock )
|
|
|
|
{
|
|
|
|
KBNODE node;
|
|
|
|
int real=0;
|
|
|
|
|
|
|
|
for(node=keyblock;node;node=node->next)
|
|
|
|
if(node->pkt->pkttype==PKT_USER_ID && !(node->flag&NODFLG_SELUID) &&
|
|
|
|
!node->pkt->pkt.user_id->attrib_data)
|
|
|
|
real++;
|
|
|
|
|
|
|
|
return real;
|
|
|
|
}
|
|
|
|
|
1999-04-26 17:53:01 +02:00
|
|
|
/*
|
|
|
|
* Ask whether the signature should be revoked. If the user commits this,
|
|
|
|
* flag bit MARK_A is set on the signature and the user ID.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
ask_revoke_sig( KBNODE keyblock, KBNODE node )
|
|
|
|
{
|
2002-04-01 01:51:33 +02:00
|
|
|
int doit=0;
|
1999-04-26 17:53:01 +02:00
|
|
|
PKT_signature *sig = node->pkt->pkt.signature;
|
|
|
|
KBNODE unode = find_prev_kbnode( keyblock, node, PKT_USER_ID );
|
|
|
|
|
|
|
|
if( !unode ) {
|
|
|
|
log_error("Oops: no user ID for signature\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
tty_printf(_("user ID: \""));
|
1999-08-31 17:30:12 +02:00
|
|
|
tty_print_utf8_string( unode->pkt->pkt.user_id->name,
|
|
|
|
unode->pkt->pkt.user_id->len );
|
2002-03-05 05:57:10 +01:00
|
|
|
|
|
|
|
if(sig->flags.exportable)
|
|
|
|
tty_printf(_("\"\nsigned with your key %08lX at %s\n"),
|
|
|
|
(ulong)sig->keyid[1], datestr_from_sig(sig) );
|
|
|
|
else
|
|
|
|
tty_printf(_("\"\nlocally signed with your key %08lX at %s\n"),
|
|
|
|
(ulong)sig->keyid[1], datestr_from_sig(sig) );
|
1999-04-26 17:53:01 +02:00
|
|
|
|
2002-04-01 01:51:33 +02:00
|
|
|
if(sig->flags.expired)
|
|
|
|
{
|
|
|
|
tty_printf(_("This signature expired on %s.\n"),
|
|
|
|
expirestr_from_sig(sig));
|
|
|
|
/* Use a different question so we can have different help text */
|
|
|
|
doit=cpr_get_answer_is_yes("ask_revoke_sig.expired",
|
|
|
|
_("Are you sure you still want to revoke it? (y/N) "));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
doit=cpr_get_answer_is_yes("ask_revoke_sig.one",
|
|
|
|
_("Create a revocation certificate for this signature? (y/N) "));
|
|
|
|
|
|
|
|
if(doit) {
|
2001-12-21 22:02:05 +01:00
|
|
|
node->flag |= NODFLG_MARK_A;
|
|
|
|
unode->flag |= NODFLG_MARK_A;
|
1999-04-26 17:53:01 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* Display all user ids of the current public key together with signatures
|
|
|
|
* done by one of our keys. Then walk over all this sigs and ask the user
|
|
|
|
* whether he wants to revoke this signature.
|
|
|
|
* Return: True when the keyblock has changed.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
menu_revsig( KBNODE keyblock )
|
|
|
|
{
|
|
|
|
PKT_signature *sig;
|
|
|
|
PKT_public_key *primary_pk;
|
|
|
|
KBNODE node;
|
|
|
|
int changed = 0;
|
|
|
|
int rc, any;
|
2000-02-17 13:41:58 +01:00
|
|
|
struct revocation_reason_info *reason = NULL;
|
1999-04-26 17:53:01 +02:00
|
|
|
|
|
|
|
/* FIXME: detect duplicates here */
|
1999-09-06 20:10:27 +02:00
|
|
|
tty_printf(_("You have signed these user IDs:\n"));
|
1999-04-26 17:53:01 +02:00
|
|
|
for( node = keyblock; node; node = node->next ) {
|
|
|
|
node->flag &= ~(NODFLG_SELSIG | NODFLG_MARK_A);
|
|
|
|
if( node->pkt->pkttype == PKT_USER_ID ) {
|
|
|
|
PKT_user_id *uid = node->pkt->pkt.user_id;
|
|
|
|
/* Hmmm: Should we show only UIDs with a signature? */
|
|
|
|
tty_printf(" ");
|
1999-08-31 17:30:12 +02:00
|
|
|
tty_print_utf8_string( uid->name, uid->len );
|
1999-04-26 17:53:01 +02:00
|
|
|
tty_printf("\n");
|
|
|
|
}
|
|
|
|
else if( node->pkt->pkttype == PKT_SIGNATURE
|
|
|
|
&& ((sig = node->pkt->pkt.signature),
|
2001-09-26 14:49:10 +02:00
|
|
|
!seckey_available(sig->keyid) ) ) {
|
1999-04-26 17:53:01 +02:00
|
|
|
if( (sig->sig_class&~3) == 0x10 ) {
|
2002-03-05 05:57:10 +01:00
|
|
|
tty_printf(_(" signed by %08lX at %s%s%s\n"),
|
|
|
|
(ulong)sig->keyid[1], datestr_from_sig(sig),
|
|
|
|
sig->flags.exportable?"":" (non-exportable)",
|
|
|
|
sig->flags.revocable?"":" (non-revocable)");
|
2001-12-21 22:02:05 +01:00
|
|
|
if(sig->flags.revocable)
|
|
|
|
node->flag |= NODFLG_SELSIG;
|
1999-04-26 17:53:01 +02:00
|
|
|
}
|
|
|
|
else if( sig->sig_class == 0x30 ) {
|
1999-09-06 20:10:27 +02:00
|
|
|
tty_printf(_(" revoked by %08lX at %s\n"),
|
2001-05-25 09:22:34 +02:00
|
|
|
(ulong)sig->keyid[1], datestr_from_sig(sig) );
|
1999-04-26 17:53:01 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ask */
|
|
|
|
for( node = keyblock; node; node = node->next ) {
|
|
|
|
if( !(node->flag & NODFLG_SELSIG) )
|
|
|
|
continue;
|
|
|
|
ask_revoke_sig( keyblock, node );
|
|
|
|
}
|
|
|
|
|
|
|
|
/* present selected */
|
|
|
|
any = 0;
|
|
|
|
for( node = keyblock; node; node = node->next ) {
|
|
|
|
if( !(node->flag & NODFLG_MARK_A) )
|
|
|
|
continue;
|
|
|
|
if( !any ) {
|
|
|
|
any = 1;
|
1999-09-06 20:10:27 +02:00
|
|
|
tty_printf(_("You are about to revoke these signatures:\n"));
|
1999-04-26 17:53:01 +02:00
|
|
|
}
|
|
|
|
if( node->pkt->pkttype == PKT_USER_ID ) {
|
|
|
|
PKT_user_id *uid = node->pkt->pkt.user_id;
|
|
|
|
tty_printf(" ");
|
1999-08-31 17:30:12 +02:00
|
|
|
tty_print_utf8_string( uid->name, uid->len );
|
1999-04-26 17:53:01 +02:00
|
|
|
tty_printf("\n");
|
|
|
|
}
|
|
|
|
else if( node->pkt->pkttype == PKT_SIGNATURE ) {
|
|
|
|
sig = node->pkt->pkt.signature;
|
2002-03-05 05:57:10 +01:00
|
|
|
tty_printf(_(" signed by %08lX at %s%s\n"),
|
|
|
|
(ulong)sig->keyid[1], datestr_from_sig(sig),
|
|
|
|
sig->flags.exportable?"":_(" (non-exportable)") );
|
1999-04-26 17:53:01 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if( !any )
|
|
|
|
return 0; /* none selected */
|
|
|
|
|
|
|
|
if( !cpr_get_answer_is_yes("ask_revoke_sig.okay",
|
2002-04-01 01:51:33 +02:00
|
|
|
_("Really create the revocation certificates? (y/N) ")) )
|
1999-04-26 17:53:01 +02:00
|
|
|
return 0; /* forget it */
|
|
|
|
|
2000-02-17 13:41:58 +01:00
|
|
|
reason = ask_revocation_reason( 0, 1, 0 );
|
|
|
|
if( !reason ) { /* user decided to cancel */
|
|
|
|
return 0;
|
|
|
|
}
|
1999-04-26 17:53:01 +02:00
|
|
|
|
|
|
|
/* now we can sign the user ids */
|
|
|
|
reloop: /* (must use this, because we are modifing the list) */
|
|
|
|
primary_pk = keyblock->pkt->pkt.public_key;
|
|
|
|
for( node=keyblock; node; node = node->next ) {
|
|
|
|
KBNODE unode;
|
|
|
|
PACKET *pkt;
|
2000-02-17 13:41:58 +01:00
|
|
|
struct sign_attrib attrib;
|
1999-04-26 17:53:01 +02:00
|
|
|
PKT_secret_key *sk;
|
|
|
|
|
|
|
|
if( !(node->flag & NODFLG_MARK_A)
|
|
|
|
|| node->pkt->pkttype != PKT_SIGNATURE )
|
|
|
|
continue;
|
|
|
|
unode = find_prev_kbnode( keyblock, node, PKT_USER_ID );
|
|
|
|
assert( unode ); /* we already checked this */
|
|
|
|
|
|
|
|
memset( &attrib, 0, sizeof attrib );
|
2000-02-17 13:41:58 +01:00
|
|
|
attrib.reason = reason;
|
2002-03-05 05:57:10 +01:00
|
|
|
attrib.non_exportable=!node->pkt->pkt.signature->flags.exportable;
|
2000-02-17 13:41:58 +01:00
|
|
|
|
1999-04-26 17:53:01 +02:00
|
|
|
node->flag &= ~NODFLG_MARK_A;
|
|
|
|
sk = m_alloc_secure_clear( sizeof *sk );
|
|
|
|
if( get_seckey( sk, node->pkt->pkt.signature->keyid ) ) {
|
|
|
|
log_info(_("no secret key\n"));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
rc = make_keysig_packet( &sig, primary_pk,
|
|
|
|
unode->pkt->pkt.user_id,
|
|
|
|
NULL,
|
|
|
|
sk,
|
2001-12-21 22:02:05 +01:00
|
|
|
0x30, 0, 0, 0, 0,
|
2000-02-17 13:41:58 +01:00
|
|
|
sign_mk_attrib,
|
1999-04-26 17:53:01 +02:00
|
|
|
&attrib );
|
|
|
|
free_secret_key(sk);
|
|
|
|
if( rc ) {
|
|
|
|
log_error(_("signing failed: %s\n"), g10_errstr(rc));
|
2000-02-17 13:41:58 +01:00
|
|
|
release_revocation_reason_info( reason );
|
1999-04-26 17:53:01 +02:00
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
changed = 1; /* we changed the keyblock */
|
2002-04-19 13:31:53 +02:00
|
|
|
update_trust = 1;
|
1999-04-26 17:53:01 +02:00
|
|
|
|
|
|
|
pkt = m_alloc_clear( sizeof *pkt );
|
|
|
|
pkt->pkttype = PKT_SIGNATURE;
|
|
|
|
pkt->pkt.signature = sig;
|
1999-05-06 14:26:10 +02:00
|
|
|
insert_kbnode( unode, new_kbnode(pkt), 0 );
|
1999-04-26 17:53:01 +02:00
|
|
|
goto reloop;
|
|
|
|
}
|
|
|
|
|
2000-02-17 13:41:58 +01:00
|
|
|
release_revocation_reason_info( reason );
|
1999-04-26 17:53:01 +02:00
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
1999-04-28 13:06:52 +02:00
|
|
|
/****************
|
|
|
|
* Revoke some of the secondary keys.
|
|
|
|
* Hmmm: Should we add a revocation to the secret keyring too?
|
|
|
|
* Does its all make sense to duplicate most of the information?
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
menu_revkey( KBNODE pub_keyblock, KBNODE sec_keyblock )
|
|
|
|
{
|
|
|
|
PKT_public_key *mainpk;
|
|
|
|
KBNODE node;
|
|
|
|
int changed = 0;
|
|
|
|
int rc;
|
2000-02-17 13:41:58 +01:00
|
|
|
struct revocation_reason_info *reason = NULL;
|
|
|
|
|
|
|
|
reason = ask_revocation_reason( 1, 0, 0 );
|
|
|
|
if( !reason ) { /* user decided to cancel */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1999-04-28 13:06:52 +02:00
|
|
|
|
1999-05-06 14:26:10 +02:00
|
|
|
reloop: /* (better this way because we are modifing the keyring) */
|
1999-04-28 13:06:52 +02:00
|
|
|
mainpk = pub_keyblock->pkt->pkt.public_key;
|
|
|
|
for( node = pub_keyblock; node; node = node->next ) {
|
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY
|
|
|
|
&& (node->flag & NODFLG_SELKEY) ) {
|
|
|
|
PACKET *pkt;
|
|
|
|
PKT_signature *sig;
|
|
|
|
PKT_secret_key *sk;
|
|
|
|
PKT_public_key *subpk = node->pkt->pkt.public_key;
|
2000-02-17 13:41:58 +01:00
|
|
|
struct sign_attrib attrib;
|
|
|
|
|
|
|
|
memset( &attrib, 0, sizeof attrib );
|
|
|
|
attrib.reason = reason;
|
1999-04-28 13:06:52 +02:00
|
|
|
|
|
|
|
node->flag &= ~NODFLG_SELKEY;
|
|
|
|
sk = copy_secret_key( NULL, sec_keyblock->pkt->pkt.secret_key );
|
2001-08-01 12:30:24 +02:00
|
|
|
rc = make_keysig_packet( &sig, mainpk, NULL, subpk, sk,
|
2001-12-21 22:02:05 +01:00
|
|
|
0x28, 0, 0, 0, 0,
|
2001-08-01 12:30:24 +02:00
|
|
|
sign_mk_attrib, &attrib );
|
1999-04-28 13:06:52 +02:00
|
|
|
free_secret_key(sk);
|
|
|
|
if( rc ) {
|
|
|
|
log_error(_("signing failed: %s\n"), g10_errstr(rc));
|
2000-02-17 13:41:58 +01:00
|
|
|
release_revocation_reason_info( reason );
|
1999-04-28 13:06:52 +02:00
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
changed = 1; /* we changed the keyblock */
|
|
|
|
|
|
|
|
pkt = m_alloc_clear( sizeof *pkt );
|
|
|
|
pkt->pkttype = PKT_SIGNATURE;
|
|
|
|
pkt->pkt.signature = sig;
|
1999-05-06 14:26:10 +02:00
|
|
|
insert_kbnode( node, new_kbnode(pkt), 0 );
|
1999-04-28 13:06:52 +02:00
|
|
|
goto reloop;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
commit_kbnode( &pub_keyblock );
|
|
|
|
/*commit_kbnode( &sec_keyblock );*/
|
|
|
|
|
2002-04-19 13:31:53 +02:00
|
|
|
/* No need to set update_trust here since signing keys no longer
|
|
|
|
are used to certify other keys, so there is no change in trust
|
|
|
|
when revoking/removing them */
|
1999-04-28 13:06:52 +02:00
|
|
|
|
2000-02-17 13:41:58 +01:00
|
|
|
release_revocation_reason_info( reason );
|
1999-04-28 13:06:52 +02:00
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
1999-04-26 17:53:01 +02:00
|
|
|
|
1999-06-29 21:50:54 +02:00
|
|
|
static int
|
|
|
|
enable_disable_key( KBNODE keyblock, int disable )
|
|
|
|
{
|
2001-09-24 18:03:14 +02:00
|
|
|
PKT_public_key *pk = find_kbnode( keyblock, PKT_PUBLIC_KEY )
|
|
|
|
->pkt->pkt.public_key;
|
1999-07-01 12:53:35 +02:00
|
|
|
unsigned int trust, newtrust;
|
|
|
|
|
2001-09-24 18:03:14 +02:00
|
|
|
trust = newtrust = get_ownertrust (pk);
|
1999-07-01 12:53:35 +02:00
|
|
|
newtrust &= ~TRUST_FLAG_DISABLED;
|
|
|
|
if( disable )
|
|
|
|
newtrust |= TRUST_FLAG_DISABLED;
|
|
|
|
if( trust == newtrust )
|
|
|
|
return 0; /* already in that state */
|
2001-09-24 18:03:14 +02:00
|
|
|
update_ownertrust(pk, newtrust );
|
1999-07-01 12:53:35 +02:00
|
|
|
return 0;
|
1999-06-29 21:50:54 +02:00
|
|
|
}
|
|
|
|
|
2001-12-22 00:06:02 +01:00
|
|
|
|
|
|
|
static void
|
|
|
|
menu_showphoto( KBNODE keyblock )
|
|
|
|
{
|
|
|
|
KBNODE node;
|
|
|
|
int select_all = !count_selected_uids(keyblock);
|
|
|
|
int count=0;
|
|
|
|
PKT_public_key *pk=NULL;
|
|
|
|
u32 keyid[2];
|
|
|
|
|
|
|
|
/* Look for the public key first. We have to be really, really,
|
|
|
|
explicit as to which photo this is, and what key it is a UID on
|
|
|
|
since people may want to sign it. */
|
|
|
|
|
|
|
|
for( node = keyblock; node; node = node->next )
|
|
|
|
{
|
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_KEY )
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 22:47:23 +02:00
|
|
|
{
|
|
|
|
pk = node->pkt->pkt.public_key;
|
|
|
|
keyid_from_pk(pk, keyid);
|
|
|
|
}
|
|
|
|
else if( node->pkt->pkttype == PKT_USER_ID )
|
|
|
|
{
|
|
|
|
PKT_user_id *uid = node->pkt->pkt.user_id;
|
|
|
|
count++;
|
2001-12-22 00:06:02 +01:00
|
|
|
|
* photoid.h, photoid.c (parse_image_header, image_type_to_string): Useful
functions to return data about an image.
* packet.h, parse-packet.c (make_attribute_uidname,
parse_attribute_subpkts, parse_attribute), photoid.h, photoid.c
(show_photos): Handle multiple images in a single attribute packet.
* main.h, misc.c (pct_expando), sign.c (mk_notation_and_policy), photoid.c
(show_photos): Simpler expando code that does not require using
compile-time string sizes. Call image_type_to_string to get image strings
(i.e. "jpg", "image/jpeg"). Change all callers.
* keyedit.c (menu_showphoto), keylist.c (list_keyblock_print): Allow
viewing multiple images within a single attribute packet.
* gpgv.c: Various stubs for link happiness.
2002-05-02 22:47:23 +02:00
|
|
|
if((select_all || (node->flag & NODFLG_SELUID)) &&
|
|
|
|
uid->attribs!=NULL)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for(i=0;i<uid->numattribs;i++)
|
|
|
|
{
|
|
|
|
byte type;
|
|
|
|
u32 size;
|
|
|
|
|
|
|
|
if(uid->attribs[i].type==ATTRIB_IMAGE &&
|
|
|
|
parse_image_header(&uid->attribs[i],&type,&size))
|
|
|
|
{
|
|
|
|
tty_printf(_("Displaying %s photo ID of size %ld for "
|
|
|
|
"key 0x%08lX (uid %d)\n"),
|
|
|
|
image_type_to_string(type,1),
|
|
|
|
(ulong)size,(ulong)keyid[1],count);
|
|
|
|
show_photos(&uid->attribs[i],1,pk);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2001-12-22 00:06:02 +01:00
|
|
|
}
|
|
|
|
}
|