1997-11-18 14:06:00 +00:00
|
|
|
/* keygen.c - generate a key pair
|
2002-04-29 14:42:34 +00:00
|
|
|
* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
1997-11-18 14:06:00 +00:00
|
|
|
*
|
1998-12-23 12:41:40 +00:00
|
|
|
* This file is part of GnuPG.
|
1997-11-18 14:06:00 +00:00
|
|
|
*
|
1998-12-23 12:41:40 +00:00
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
1997-11-18 14:06:00 +00: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 12:41:40 +00:00
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
1997-11-18 14:06:00 +00: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>
|
1998-01-12 10:18:17 +00:00
|
|
|
#include <ctype.h>
|
1997-11-18 14:06:00 +00:00
|
|
|
#include <errno.h>
|
|
|
|
#include <assert.h>
|
|
|
|
#include "util.h"
|
|
|
|
#include "main.h"
|
|
|
|
#include "packet.h"
|
|
|
|
#include "cipher.h"
|
|
|
|
#include "ttyio.h"
|
|
|
|
#include "options.h"
|
1997-12-16 19:15:09 +00:00
|
|
|
#include "keydb.h"
|
2001-09-24 16:03:14 +00:00
|
|
|
#include "trustdb.h"
|
1998-08-05 16:51:59 +00:00
|
|
|
#include "status.h"
|
1998-01-28 16:09:43 +00:00
|
|
|
#include "i18n.h"
|
1997-11-18 14:06:00 +00:00
|
|
|
|
2001-08-09 13:11:51 +00:00
|
|
|
#define MAX_PREFS 30
|
|
|
|
|
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
enum para_name {
|
|
|
|
pKEYTYPE,
|
|
|
|
pKEYLENGTH,
|
2001-08-14 11:33:49 +00:00
|
|
|
pKEYUSAGE,
|
2000-03-08 17:42:19 +00:00
|
|
|
pSUBKEYTYPE,
|
|
|
|
pSUBKEYLENGTH,
|
2001-08-14 11:33:49 +00:00
|
|
|
pSUBKEYUSAGE,
|
2000-03-08 17:42:19 +00:00
|
|
|
pNAMEREAL,
|
|
|
|
pNAMEEMAIL,
|
|
|
|
pNAMECOMMENT,
|
2002-04-14 01:27:11 +00:00
|
|
|
pPREFERENCES,
|
2002-05-16 03:35:55 +00:00
|
|
|
pREVOKER,
|
2000-03-08 17:42:19 +00:00
|
|
|
pUSERID,
|
|
|
|
pEXPIREDATE,
|
|
|
|
pKEYEXPIRE, /* in n seconds */
|
|
|
|
pSUBKEYEXPIRE, /* in n seconds */
|
|
|
|
pPASSPHRASE,
|
|
|
|
pPASSPHRASE_DEK,
|
|
|
|
pPASSPHRASE_S2K
|
|
|
|
};
|
|
|
|
|
|
|
|
struct para_data_s {
|
|
|
|
struct para_data_s *next;
|
|
|
|
int lnr;
|
|
|
|
enum para_name key;
|
|
|
|
union {
|
2001-08-14 11:33:49 +00:00
|
|
|
DEK *dek;
|
|
|
|
STRING2KEY *s2k;
|
|
|
|
u32 expire;
|
2002-05-16 03:35:55 +00:00
|
|
|
unsigned int usage;
|
|
|
|
struct revocation_key revkey;
|
2001-08-14 11:33:49 +00:00
|
|
|
char value[1];
|
2000-03-08 17:42:19 +00:00
|
|
|
} u;
|
|
|
|
};
|
|
|
|
|
2000-03-09 14:23:16 +00:00
|
|
|
struct output_control_s {
|
|
|
|
int lnr;
|
|
|
|
int dryrun;
|
|
|
|
int use_files;
|
|
|
|
struct {
|
|
|
|
char *fname;
|
|
|
|
char *newfname;
|
|
|
|
IOBUF stream;
|
|
|
|
armor_filter_context_t afx;
|
|
|
|
} pub;
|
|
|
|
struct {
|
|
|
|
char *fname;
|
|
|
|
char *newfname;
|
|
|
|
IOBUF stream;
|
|
|
|
armor_filter_context_t afx;
|
|
|
|
} sec;
|
|
|
|
};
|
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
|
2001-08-14 11:33:49 +00:00
|
|
|
struct opaque_data_usage_and_pk {
|
|
|
|
unsigned int usage;
|
|
|
|
PKT_public_key *pk;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2001-08-09 13:11:51 +00:00
|
|
|
static int prefs_initialized = 0;
|
|
|
|
static byte sym_prefs[MAX_PREFS];
|
|
|
|
static int nsym_prefs;
|
|
|
|
static byte hash_prefs[MAX_PREFS];
|
|
|
|
static int nhash_prefs;
|
|
|
|
static byte zip_prefs[MAX_PREFS];
|
|
|
|
static int nzip_prefs;
|
|
|
|
|
|
|
|
|
2000-03-09 14:23:16 +00:00
|
|
|
static void do_generate_keypair( struct para_data_s *para,
|
|
|
|
struct output_control_s *outctrl );
|
|
|
|
static int write_keyblock( IOBUF out, KBNODE node );
|
2000-03-08 17:42:19 +00:00
|
|
|
|
1997-11-24 22:24:04 +00:00
|
|
|
|
1997-11-18 14:06:00 +00:00
|
|
|
static void
|
1997-12-16 19:15:09 +00:00
|
|
|
write_uid( KBNODE root, const char *s )
|
1997-11-18 14:06:00 +00:00
|
|
|
{
|
1997-12-16 19:15:09 +00:00
|
|
|
PACKET *pkt = m_alloc_clear(sizeof *pkt );
|
1997-11-18 14:06:00 +00:00
|
|
|
size_t n = strlen(s);
|
|
|
|
|
1997-12-16 19:15:09 +00:00
|
|
|
pkt->pkttype = PKT_USER_ID;
|
1999-12-04 11:33:45 +00:00
|
|
|
pkt->pkt.user_id = m_alloc_clear( sizeof *pkt->pkt.user_id + n - 1 );
|
1997-12-16 19:15:09 +00:00
|
|
|
pkt->pkt.user_id->len = n;
|
2001-08-14 11:33:49 +00:00
|
|
|
pkt->pkt.user_id->ref = 1;
|
1997-12-16 19:15:09 +00:00
|
|
|
strcpy(pkt->pkt.user_id->name, s);
|
|
|
|
add_kbnode( root, new_kbnode( pkt ) );
|
1997-11-18 14:06:00 +00:00
|
|
|
}
|
|
|
|
|
2001-08-14 11:33:49 +00:00
|
|
|
static void
|
2001-09-09 16:09:19 +00:00
|
|
|
do_add_key_flags (PKT_signature *sig, unsigned int use)
|
2001-08-14 11:33:49 +00:00
|
|
|
{
|
|
|
|
byte buf[1];
|
|
|
|
|
2001-09-09 16:09:19 +00:00
|
|
|
if (!use)
|
2001-08-14 11:33:49 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
buf[0] = 0;
|
2001-09-09 16:09:19 +00:00
|
|
|
if (use & PUBKEY_USAGE_SIG)
|
2001-08-14 11:33:49 +00:00
|
|
|
buf[0] |= 0x01 | 0x02;
|
2001-09-09 16:09:19 +00:00
|
|
|
if (use & PUBKEY_USAGE_ENC)
|
2001-08-14 11:33:49 +00:00
|
|
|
buf[0] |= 0x04 | 0x08;
|
|
|
|
build_sig_subpkt (sig, SIGSUBPKT_KEY_FLAGS, buf, 1);
|
|
|
|
}
|
1997-11-18 14:06:00 +00:00
|
|
|
|
1998-06-25 10:19:08 +00:00
|
|
|
|
1998-10-18 15:21:22 +00:00
|
|
|
int
|
|
|
|
keygen_add_key_expire( PKT_signature *sig, void *opaque )
|
1998-06-25 10:19:08 +00:00
|
|
|
{
|
1998-11-20 17:42:18 +00:00
|
|
|
PKT_public_key *pk = opaque;
|
1998-06-25 10:19:08 +00:00
|
|
|
byte buf[8];
|
|
|
|
u32 u;
|
|
|
|
|
1998-11-20 17:42:18 +00:00
|
|
|
if( pk->expiredate ) {
|
|
|
|
u = pk->expiredate > pk->timestamp? pk->expiredate - pk->timestamp
|
|
|
|
: pk->timestamp;
|
1998-06-25 10:19:08 +00:00
|
|
|
buf[0] = (u >> 24) & 0xff;
|
|
|
|
buf[1] = (u >> 16) & 0xff;
|
|
|
|
buf[2] = (u >> 8) & 0xff;
|
|
|
|
buf[3] = u & 0xff;
|
|
|
|
build_sig_subpkt( sig, SIGSUBPKT_KEY_EXPIRE, buf, 4 );
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-08-14 11:33:49 +00:00
|
|
|
static int
|
|
|
|
keygen_add_key_flags_and_expire (PKT_signature *sig, void *opaque)
|
|
|
|
{
|
|
|
|
struct opaque_data_usage_and_pk *oduap = opaque;
|
1998-06-25 10:19:08 +00:00
|
|
|
|
2001-08-14 11:33:49 +00:00
|
|
|
do_add_key_flags (sig, oduap->usage);
|
|
|
|
return keygen_add_key_expire (sig, oduap->pk);
|
|
|
|
}
|
2001-08-09 13:11:51 +00:00
|
|
|
|
|
|
|
static int
|
|
|
|
set_one_pref (ulong val, int type, int (*cf)(int), byte *buf, int *nbuf)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2001-12-07 00:57:50 +00:00
|
|
|
if (cf (val)) {
|
2001-08-09 13:11:51 +00:00
|
|
|
log_info (_("preference %c%lu is not valid\n"), type, val);
|
2001-12-17 21:45:40 +00:00
|
|
|
if(type=='S' && val==CIPHER_ALGO_IDEA)
|
2001-12-18 23:10:46 +00:00
|
|
|
idea_cipher_warn(1);
|
2001-08-09 13:11:51 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
for (i=0; i < *nbuf; i++ ) {
|
|
|
|
if (buf[i] == val) {
|
|
|
|
log_info (_("preference %c%lu duplicated\n"), type, val);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (*nbuf >= MAX_PREFS) {
|
|
|
|
log_info (_("too many `%c' preferences\n"), type);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
buf[(*nbuf)++] = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
check_zip_algo (int algo)
|
|
|
|
{
|
|
|
|
return algo < 0 || algo > 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parse the supplied string and use it to set the standard preferences.
|
|
|
|
* The String is expected to be in a forma like the one printed by "prefs",
|
|
|
|
* something like: "S10 S3 H3 H2 Z2 Z1". Use NULL to set the default
|
|
|
|
* preferences.
|
|
|
|
* Returns: 0 = okay
|
|
|
|
*/
|
|
|
|
int
|
* 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 14:07:12 +00:00
|
|
|
keygen_set_std_prefs (const char *string,int personal)
|
2001-08-09 13:11:51 +00:00
|
|
|
{
|
|
|
|
byte sym[MAX_PREFS], hash[MAX_PREFS], zip[MAX_PREFS];
|
|
|
|
int nsym=0, nhash=0, nzip=0;
|
|
|
|
ulong val;
|
|
|
|
const char *s, *s2;
|
|
|
|
int rc = 0;
|
|
|
|
|
2002-01-22 20:39:10 +00:00
|
|
|
if (!string || !ascii_strcasecmp (string, "default")) {
|
* 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 14:07:12 +00:00
|
|
|
if (opt.def_preference_list)
|
|
|
|
string=opt.def_preference_list;
|
|
|
|
else if ( !check_cipher_algo(CIPHER_ALGO_IDEA) )
|
2002-04-08 15:10:51 +00:00
|
|
|
string = "S7 S3 S2 S1 H2 H3 Z2 Z1";
|
2002-01-22 20:39:10 +00:00
|
|
|
else
|
2002-04-22 19:33:39 +00:00
|
|
|
string = "S7 S3 S2 H2 H3 Z2 Z1";
|
2002-01-22 20:39:10 +00:00
|
|
|
|
|
|
|
/* If we have it, IDEA goes *after* 3DES so it won't be used
|
2002-01-27 05:56:35 +00:00
|
|
|
unless we're encrypting along with a V3 key. Ideally, we
|
|
|
|
would only put the S1 preference in if the key was RSA and
|
|
|
|
<=2048 bits, as that is what won't break PGP2, but that is
|
|
|
|
difficult with the current code, and not really worth
|
|
|
|
checking as a non-RSA <=2048 bit key wouldn't be usable by
|
|
|
|
PGP2 anyway -dms */
|
2002-01-22 20:39:10 +00:00
|
|
|
}
|
2001-08-09 13:11:51 +00:00
|
|
|
else if (!ascii_strcasecmp (string, "none"))
|
|
|
|
string = "";
|
|
|
|
|
|
|
|
for (s=string; *s; s = s2) {
|
|
|
|
if ((*s=='s' || *s == 'S') && isdigit(s[1]) ) {
|
|
|
|
val = strtoul (++s, (char**)&s2, 10);
|
|
|
|
if (set_one_pref (val, 'S', check_cipher_algo, sym, &nsym))
|
|
|
|
rc = -1;
|
|
|
|
}
|
|
|
|
else if ((*s=='h' || *s == 'H') && isdigit(s[1]) ) {
|
|
|
|
val = strtoul (++s, (char**)&s2, 10);
|
|
|
|
if (set_one_pref (val, 'H', check_digest_algo, hash, &nhash))
|
|
|
|
rc = -1;
|
|
|
|
}
|
|
|
|
else if ((*s=='z' || *s == 'Z') && isdigit(s[1]) ) {
|
|
|
|
val = strtoul (++s, (char**)&s2, 10);
|
|
|
|
if (set_one_pref (val, 'Z', check_zip_algo, zip, &nzip))
|
|
|
|
rc = -1;
|
|
|
|
}
|
|
|
|
else if (isspace (*s))
|
|
|
|
s2 = s+1;
|
|
|
|
else {
|
2002-04-14 01:27:11 +00:00
|
|
|
log_info (_("invalid character in preference string\n"));
|
2001-08-09 13:11:51 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!rc) {
|
* 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 14:07:12 +00:00
|
|
|
if(personal) {
|
|
|
|
m_free(opt.personal_prefs);
|
|
|
|
|
|
|
|
if((nsym+nhash+nzip)==0)
|
|
|
|
opt.personal_prefs=NULL;
|
|
|
|
else {
|
|
|
|
int i,n=0;
|
|
|
|
|
|
|
|
opt.personal_prefs=m_alloc(sizeof(prefitem_t *)*(nsym+nhash+nzip+1));
|
|
|
|
|
|
|
|
for (i=0; i<nsym; i++, n++) {
|
|
|
|
opt.personal_prefs[n].type = PREFTYPE_SYM;
|
|
|
|
opt.personal_prefs[n].value = sym[i];
|
|
|
|
}
|
|
|
|
for (i=0; i<nhash; i++, n++) {
|
|
|
|
opt.personal_prefs[n].type = PREFTYPE_HASH;
|
|
|
|
opt.personal_prefs[n].value = hash[i];
|
|
|
|
}
|
|
|
|
for (i=0; i<nzip; i++, n++) {
|
|
|
|
opt.personal_prefs[n].type = PREFTYPE_ZIP;
|
|
|
|
opt.personal_prefs[n].value = zip[i];
|
|
|
|
}
|
|
|
|
opt.personal_prefs[n].type = PREFTYPE_NONE; /* end of list marker */
|
|
|
|
opt.personal_prefs[n].value = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2001-08-09 13:11:51 +00:00
|
|
|
memcpy (sym_prefs, sym, (nsym_prefs=nsym));
|
|
|
|
memcpy (hash_prefs, hash, (nhash_prefs=nhash));
|
|
|
|
memcpy (zip_prefs, zip, (nzip_prefs=nzip));
|
|
|
|
prefs_initialized = 1;
|
* 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 14:07:12 +00:00
|
|
|
}
|
2001-08-09 13:11:51 +00:00
|
|
|
}
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return a printable list of preferences. Caller must free.
|
|
|
|
*/
|
|
|
|
char *
|
|
|
|
keygen_get_std_prefs ()
|
|
|
|
{
|
|
|
|
char *buf;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!prefs_initialized)
|
* 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 14:07:12 +00:00
|
|
|
keygen_set_std_prefs (NULL,0);
|
2001-08-09 13:11:51 +00:00
|
|
|
|
|
|
|
buf = m_alloc ( MAX_PREFS*3*5 + 1);
|
|
|
|
*buf = 0;
|
|
|
|
for (i=0; i < nsym_prefs; i++ )
|
|
|
|
sprintf (buf+strlen(buf), "S%d ", sym_prefs[i]);
|
|
|
|
for (i=0; i < nhash_prefs; i++ )
|
|
|
|
sprintf (buf+strlen(buf), "H%d ", hash_prefs[i]);
|
|
|
|
for (i=0; i < nzip_prefs; i++ )
|
|
|
|
sprintf (buf+strlen(buf), "Z%d ", zip_prefs[i]);
|
|
|
|
|
|
|
|
if (*buf) /* trim the trailing space */
|
|
|
|
buf[strlen(buf)-1] = 0;
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-08-30 16:39:23 +00:00
|
|
|
static void
|
|
|
|
add_feature_mdc (PKT_signature *sig)
|
|
|
|
{
|
|
|
|
const byte *s;
|
2001-09-06 17:10:00 +00:00
|
|
|
size_t n;
|
2001-08-30 16:39:23 +00:00
|
|
|
char *buf;
|
|
|
|
|
|
|
|
s = parse_sig_subpkt (sig->hashed, SIGSUBPKT_FEATURES, &n );
|
2001-09-06 17:10:00 +00:00
|
|
|
if (s && n && (s[0] & 0x01))
|
|
|
|
return; /* already set */
|
|
|
|
if (!s || !n) { /* create a new one */
|
|
|
|
n = 1;
|
2001-09-09 16:09:19 +00:00
|
|
|
buf = m_alloc_clear (n);
|
2001-08-30 16:39:23 +00:00
|
|
|
}
|
2001-09-06 17:10:00 +00:00
|
|
|
else {
|
|
|
|
buf = m_alloc (n);
|
|
|
|
memcpy (buf, s, n);
|
|
|
|
}
|
|
|
|
buf[0] |= 0x01; /* MDC feature */
|
|
|
|
build_sig_subpkt (sig, SIGSUBPKT_FEATURES, buf, n);
|
2001-08-30 16:39:23 +00:00
|
|
|
m_free (buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-08-09 13:11:51 +00:00
|
|
|
int
|
|
|
|
keygen_upd_std_prefs( PKT_signature *sig, void *opaque )
|
|
|
|
{
|
|
|
|
if (!prefs_initialized)
|
* 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 14:07:12 +00:00
|
|
|
keygen_set_std_prefs (NULL, 0);
|
2001-08-09 13:11:51 +00:00
|
|
|
|
|
|
|
if (nsym_prefs)
|
|
|
|
build_sig_subpkt (sig, SIGSUBPKT_PREF_SYM, sym_prefs, nsym_prefs);
|
|
|
|
else
|
2002-04-12 04:07:26 +00:00
|
|
|
{
|
2001-08-09 13:11:51 +00:00
|
|
|
delete_sig_subpkt (sig->hashed, SIGSUBPKT_PREF_SYM);
|
2002-04-12 04:07:26 +00:00
|
|
|
delete_sig_subpkt (sig->unhashed, SIGSUBPKT_PREF_SYM);
|
|
|
|
}
|
|
|
|
|
2001-08-09 13:11:51 +00:00
|
|
|
if (nhash_prefs)
|
|
|
|
build_sig_subpkt (sig, SIGSUBPKT_PREF_HASH, hash_prefs, nhash_prefs);
|
|
|
|
else
|
2002-04-12 04:07:26 +00:00
|
|
|
{
|
|
|
|
delete_sig_subpkt (sig->hashed, SIGSUBPKT_PREF_HASH);
|
|
|
|
delete_sig_subpkt (sig->unhashed, SIGSUBPKT_PREF_HASH);
|
|
|
|
}
|
|
|
|
|
2001-08-09 13:11:51 +00:00
|
|
|
if (nzip_prefs)
|
|
|
|
build_sig_subpkt (sig, SIGSUBPKT_PREF_COMPR, zip_prefs, nzip_prefs);
|
|
|
|
else
|
2002-04-12 04:07:26 +00:00
|
|
|
{
|
2001-08-09 13:11:51 +00:00
|
|
|
delete_sig_subpkt (sig->hashed, SIGSUBPKT_PREF_COMPR);
|
2002-04-12 04:07:26 +00:00
|
|
|
delete_sig_subpkt (sig->unhashed, SIGSUBPKT_PREF_COMPR);
|
|
|
|
}
|
2001-08-30 16:39:23 +00:00
|
|
|
|
|
|
|
/* Make sure that the MDC feature flag is set */
|
|
|
|
add_feature_mdc (sig);
|
|
|
|
|
2001-08-09 13:11:51 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-06-25 10:19:08 +00:00
|
|
|
/****************
|
|
|
|
* Add preference to the self signature packet.
|
|
|
|
* This is only called for packets with version > 3.
|
2002-04-08 15:10:51 +00:00
|
|
|
|
1998-06-25 10:19:08 +00:00
|
|
|
*/
|
1998-07-29 19:35:05 +00:00
|
|
|
int
|
|
|
|
keygen_add_std_prefs( PKT_signature *sig, void *opaque )
|
1998-06-25 10:19:08 +00:00
|
|
|
{
|
2001-08-14 11:33:49 +00:00
|
|
|
PKT_public_key *pk = opaque;
|
1998-06-25 10:19:08 +00:00
|
|
|
byte buf[8];
|
2001-08-14 11:33:49 +00:00
|
|
|
|
|
|
|
do_add_key_flags (sig, pk->pubkey_usage);
|
1998-10-18 15:21:22 +00:00
|
|
|
keygen_add_key_expire( sig, opaque );
|
2001-08-09 13:11:51 +00:00
|
|
|
keygen_upd_std_prefs (sig, opaque);
|
1998-06-25 10:19:08 +00:00
|
|
|
|
|
|
|
buf[0] = 0x80; /* no modify - It is reasonable that a key holder
|
|
|
|
* has the possibility to reject signatures from users
|
|
|
|
* who are known to sign everything without any
|
|
|
|
* validation - so a signed key should be send
|
|
|
|
* to the holder who in turn can put it on a keyserver
|
|
|
|
*/
|
|
|
|
build_sig_subpkt( sig, SIGSUBPKT_KS_FLAGS, buf, 1 );
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-05-16 03:35:55 +00:00
|
|
|
int
|
|
|
|
keygen_add_revkey(PKT_signature *sig, void *opaque)
|
|
|
|
{
|
|
|
|
struct revocation_key *revkey=opaque;
|
|
|
|
byte buf[2+MAX_FINGERPRINT_LEN];
|
|
|
|
|
|
|
|
buf[0]=revkey->class;
|
|
|
|
buf[1]=revkey->algid;
|
|
|
|
memcpy(&buf[2],revkey->fpr,MAX_FINGERPRINT_LEN);
|
|
|
|
|
|
|
|
build_sig_subpkt(sig,SIGSUBPKT_REV_KEY,buf,2+MAX_FINGERPRINT_LEN);
|
|
|
|
|
|
|
|
sig->revkey=m_realloc(sig->revkey,
|
|
|
|
sizeof(struct revocation_key *)*(sig->numrevkeys+1));
|
|
|
|
|
|
|
|
/* All sigs with revocation keys set are nonrevocable */
|
|
|
|
sig->flags.revocable=0;
|
|
|
|
buf[0] = 0;
|
|
|
|
build_sig_subpkt( sig, SIGSUBPKT_REVOCABLE, buf, 1 );
|
|
|
|
|
|
|
|
parse_revkeys(sig);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
write_direct_sig( KBNODE root, KBNODE pub_root, PKT_secret_key *sk,
|
|
|
|
struct revocation_key *revkey )
|
|
|
|
{
|
|
|
|
PACKET *pkt;
|
|
|
|
PKT_signature *sig;
|
|
|
|
int rc=0;
|
|
|
|
KBNODE node;
|
|
|
|
PKT_public_key *pk;
|
|
|
|
|
|
|
|
if( opt.verbose )
|
|
|
|
log_info(_("writing direct signature\n"));
|
|
|
|
|
|
|
|
/* get the pk packet from the pub_tree */
|
|
|
|
node = find_kbnode( pub_root, PKT_PUBLIC_KEY );
|
|
|
|
if( !node )
|
|
|
|
BUG();
|
|
|
|
pk = node->pkt->pkt.public_key;
|
|
|
|
|
|
|
|
/* we have to cache the key, so that the verification of the signature
|
|
|
|
* creation is able to retrieve the public key */
|
|
|
|
cache_public_key (pk);
|
|
|
|
|
|
|
|
/* and make the signature */
|
|
|
|
rc = make_keysig_packet(&sig,pk,NULL,NULL,sk,0x1F,0,0,0,0,
|
|
|
|
keygen_add_revkey,revkey);
|
|
|
|
if( rc ) {
|
|
|
|
log_error("make_keysig_packet failed: %s\n", g10_errstr(rc) );
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
pkt = m_alloc_clear( sizeof *pkt );
|
|
|
|
pkt->pkttype = PKT_SIGNATURE;
|
|
|
|
pkt->pkt.signature = sig;
|
|
|
|
add_kbnode( root, new_kbnode( pkt ) );
|
|
|
|
return rc;
|
|
|
|
}
|
1998-06-25 10:19:08 +00:00
|
|
|
|
1997-12-09 12:46:23 +00:00
|
|
|
static int
|
2001-08-14 11:33:49 +00:00
|
|
|
write_selfsig( KBNODE root, KBNODE pub_root, PKT_secret_key *sk,
|
2001-09-09 16:09:19 +00:00
|
|
|
unsigned int use )
|
1997-12-09 12:46:23 +00:00
|
|
|
{
|
1997-12-16 19:15:09 +00:00
|
|
|
PACKET *pkt;
|
1997-12-09 12:46:23 +00:00
|
|
|
PKT_signature *sig;
|
1997-12-16 19:15:09 +00:00
|
|
|
PKT_user_id *uid;
|
1997-12-09 12:46:23 +00:00
|
|
|
int rc=0;
|
1998-02-11 03:25:44 +00:00
|
|
|
KBNODE node;
|
1998-06-29 12:30:57 +00:00
|
|
|
PKT_public_key *pk;
|
1997-12-09 12:46:23 +00:00
|
|
|
|
|
|
|
if( opt.verbose )
|
1998-01-28 16:09:43 +00:00
|
|
|
log_info(_("writing self signature\n"));
|
1997-12-09 12:46:23 +00:00
|
|
|
|
1998-02-11 03:25:44 +00:00
|
|
|
/* get the uid packet from the list */
|
|
|
|
node = find_kbnode( root, PKT_USER_ID );
|
1997-12-16 19:15:09 +00:00
|
|
|
if( !node )
|
1998-01-16 21:15:24 +00:00
|
|
|
BUG(); /* no user id packet in tree */
|
1997-12-16 19:15:09 +00:00
|
|
|
uid = node->pkt->pkt.user_id;
|
1998-06-29 12:30:57 +00:00
|
|
|
/* get the pk packet from the pub_tree */
|
|
|
|
node = find_kbnode( pub_root, PKT_PUBLIC_KEY );
|
1997-12-16 19:15:09 +00:00
|
|
|
if( !node )
|
1998-01-16 21:15:24 +00:00
|
|
|
BUG();
|
1998-06-29 12:30:57 +00:00
|
|
|
pk = node->pkt->pkt.public_key;
|
2001-09-09 16:09:19 +00:00
|
|
|
pk->pubkey_usage = use;
|
2001-03-27 11:14:22 +00:00
|
|
|
/* we have to cache the key, so that the verification of the signature
|
|
|
|
* creation is able to retrieve the public key */
|
|
|
|
cache_public_key (pk);
|
1997-12-16 19:15:09 +00:00
|
|
|
|
|
|
|
/* and make the signature */
|
2001-12-21 21:02:05 +00:00
|
|
|
rc = make_keysig_packet( &sig, pk, uid, NULL, sk, 0x13, 0, 0, 0, 0,
|
2001-08-14 11:33:49 +00:00
|
|
|
keygen_add_std_prefs, pk );
|
1998-05-26 13:38:00 +00:00
|
|
|
if( rc ) {
|
|
|
|
log_error("make_keysig_packet failed: %s\n", g10_errstr(rc) );
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
pkt = m_alloc_clear( sizeof *pkt );
|
|
|
|
pkt->pkttype = PKT_SIGNATURE;
|
|
|
|
pkt->pkt.signature = sig;
|
|
|
|
add_kbnode( root, new_kbnode( pkt ) );
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2001-08-14 11:33:49 +00:00
|
|
|
write_keybinding( KBNODE root, KBNODE pub_root, PKT_secret_key *sk,
|
2001-09-09 16:09:19 +00:00
|
|
|
unsigned int use )
|
1998-05-26 13:38:00 +00:00
|
|
|
{
|
|
|
|
PACKET *pkt;
|
|
|
|
PKT_signature *sig;
|
|
|
|
int rc=0;
|
|
|
|
KBNODE node;
|
1998-06-29 12:30:57 +00:00
|
|
|
PKT_public_key *pk, *subpk;
|
2001-08-14 11:33:49 +00:00
|
|
|
struct opaque_data_usage_and_pk oduap;
|
1998-05-26 13:38:00 +00:00
|
|
|
|
|
|
|
if( opt.verbose )
|
|
|
|
log_info(_("writing key binding signature\n"));
|
|
|
|
|
1998-06-29 12:30:57 +00:00
|
|
|
/* get the pk packet from the pub_tree */
|
|
|
|
node = find_kbnode( pub_root, PKT_PUBLIC_KEY );
|
1998-05-26 13:38:00 +00:00
|
|
|
if( !node )
|
|
|
|
BUG();
|
1998-06-29 12:30:57 +00:00
|
|
|
pk = node->pkt->pkt.public_key;
|
2001-03-27 11:14:22 +00:00
|
|
|
/* we have to cache the key, so that the verification of the signature
|
|
|
|
* creation is able to retrieve the public key */
|
|
|
|
cache_public_key (pk);
|
|
|
|
|
1998-05-26 13:38:00 +00:00
|
|
|
/* find the last subkey */
|
1998-06-29 12:30:57 +00:00
|
|
|
subpk = NULL;
|
1998-05-26 13:38:00 +00:00
|
|
|
for(node=pub_root; node; node = node->next ) {
|
1998-06-29 12:30:57 +00:00
|
|
|
if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY )
|
|
|
|
subpk = node->pkt->pkt.public_key;
|
1998-05-26 13:38:00 +00:00
|
|
|
}
|
1998-06-29 12:30:57 +00:00
|
|
|
if( !subpk )
|
1998-05-26 13:38:00 +00:00
|
|
|
BUG();
|
|
|
|
|
|
|
|
/* and make the signature */
|
2001-09-09 16:09:19 +00:00
|
|
|
oduap.usage = use;
|
2001-08-14 11:33:49 +00:00
|
|
|
oduap.pk = subpk;
|
2001-12-21 21:02:05 +00:00
|
|
|
rc = make_keysig_packet( &sig, pk, NULL, subpk, sk, 0x18, 0, 0, 0, 0,
|
2001-08-14 11:33:49 +00:00
|
|
|
keygen_add_key_flags_and_expire, &oduap );
|
1997-12-09 12:46:23 +00:00
|
|
|
if( rc ) {
|
|
|
|
log_error("make_keysig_packet failed: %s\n", g10_errstr(rc) );
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
1997-12-16 19:15:09 +00:00
|
|
|
pkt = m_alloc_clear( sizeof *pkt );
|
|
|
|
pkt->pkttype = PKT_SIGNATURE;
|
|
|
|
pkt->pkt.signature = sig;
|
|
|
|
add_kbnode( root, new_kbnode( pkt ) );
|
1997-12-09 12:46:23 +00:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1997-12-16 19:15:09 +00:00
|
|
|
static int
|
1998-06-25 10:19:08 +00:00
|
|
|
gen_elg(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
|
2000-03-08 17:42:19 +00:00
|
|
|
STRING2KEY *s2k, PKT_secret_key **ret_sk, u32 expireval )
|
1997-12-16 19:15:09 +00:00
|
|
|
{
|
|
|
|
int rc;
|
1998-02-09 17:43:42 +00:00
|
|
|
int i;
|
1997-12-16 19:15:09 +00:00
|
|
|
PACKET *pkt;
|
1998-06-29 12:30:57 +00:00
|
|
|
PKT_secret_key *sk;
|
|
|
|
PKT_public_key *pk;
|
1998-06-13 17:00:02 +00:00
|
|
|
MPI skey[4];
|
1998-02-09 17:43:42 +00:00
|
|
|
MPI *factors;
|
1997-12-16 19:15:09 +00:00
|
|
|
|
1998-06-25 10:19:08 +00:00
|
|
|
assert( is_ELGAMAL(algo) );
|
2000-03-08 17:42:19 +00:00
|
|
|
|
|
|
|
if( nbits < 512 ) {
|
|
|
|
nbits = 1024;
|
|
|
|
log_info(_("keysize invalid; using %u bits\n"), nbits );
|
|
|
|
}
|
|
|
|
|
|
|
|
if( (nbits % 32) ) {
|
|
|
|
nbits = ((nbits + 31) / 32) * 32;
|
|
|
|
log_info(_("keysize rounded up to %u bits\n"), nbits );
|
|
|
|
}
|
|
|
|
|
1998-06-25 10:19:08 +00:00
|
|
|
rc = pubkey_generate( algo, nbits, skey, &factors );
|
1998-06-13 17:00:02 +00:00
|
|
|
if( rc ) {
|
|
|
|
log_error("pubkey_generate failed: %s\n", g10_errstr(rc) );
|
|
|
|
return rc;
|
|
|
|
}
|
1997-12-16 19:15:09 +00:00
|
|
|
|
1998-06-29 12:30:57 +00:00
|
|
|
sk = m_alloc_clear( sizeof *sk );
|
|
|
|
pk = m_alloc_clear( sizeof *pk );
|
2000-03-16 15:51:35 +00:00
|
|
|
sk->timestamp = pk->timestamp = make_timestamp();
|
2000-03-08 17:42:19 +00:00
|
|
|
sk->version = pk->version = 4;
|
1998-11-20 17:42:18 +00:00
|
|
|
if( expireval ) {
|
|
|
|
sk->expiredate = pk->expiredate = sk->timestamp + expireval;
|
|
|
|
}
|
1998-06-29 12:30:57 +00:00
|
|
|
sk->pubkey_algo = pk->pubkey_algo = algo;
|
|
|
|
pk->pkey[0] = mpi_copy( skey[0] );
|
|
|
|
pk->pkey[1] = mpi_copy( skey[1] );
|
|
|
|
pk->pkey[2] = mpi_copy( skey[2] );
|
|
|
|
sk->skey[0] = skey[0];
|
|
|
|
sk->skey[1] = skey[1];
|
|
|
|
sk->skey[2] = skey[2];
|
|
|
|
sk->skey[3] = skey[3];
|
|
|
|
sk->is_protected = 0;
|
|
|
|
sk->protect.algo = 0;
|
|
|
|
|
|
|
|
sk->csum = checksum_mpi_counted_nbits( sk->skey[3] );
|
|
|
|
if( ret_sk ) /* not a subkey: return an unprotected version of the sk */
|
|
|
|
*ret_sk = copy_secret_key( NULL, sk );
|
1997-12-16 19:15:09 +00:00
|
|
|
|
1997-12-19 11:41:47 +00:00
|
|
|
if( dek ) {
|
1998-06-29 12:30:57 +00:00
|
|
|
sk->protect.algo = dek->algo;
|
|
|
|
sk->protect.s2k = *s2k;
|
|
|
|
rc = protect_secret_key( sk, dek );
|
1997-12-16 19:15:09 +00:00
|
|
|
if( rc ) {
|
|
|
|
log_error("protect_secret_key failed: %s\n", g10_errstr(rc) );
|
1998-06-29 12:30:57 +00:00
|
|
|
free_public_key(pk);
|
|
|
|
free_secret_key(sk);
|
1997-12-16 19:15:09 +00:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pkt = m_alloc_clear(sizeof *pkt);
|
1998-06-29 12:30:57 +00:00
|
|
|
pkt->pkttype = ret_sk ? PKT_PUBLIC_KEY : PKT_PUBLIC_SUBKEY;
|
|
|
|
pkt->pkt.public_key = pk;
|
1997-12-16 19:15:09 +00:00
|
|
|
add_kbnode(pub_root, new_kbnode( pkt ));
|
|
|
|
|
1998-04-14 17:51:16 +00:00
|
|
|
/* don't know whether it makes sense to have the factors, so for now
|
1998-05-03 15:42:08 +00:00
|
|
|
* we store them in the secret keyring (but they are not secret) */
|
1997-12-16 19:15:09 +00:00
|
|
|
pkt = m_alloc_clear(sizeof *pkt);
|
1998-06-29 12:30:57 +00:00
|
|
|
pkt->pkttype = ret_sk ? PKT_SECRET_KEY : PKT_SECRET_SUBKEY;
|
|
|
|
pkt->pkt.secret_key = sk;
|
1997-12-16 19:15:09 +00:00
|
|
|
add_kbnode(sec_root, new_kbnode( pkt ));
|
1998-02-09 17:43:42 +00:00
|
|
|
for(i=0; factors[i]; i++ )
|
|
|
|
add_kbnode( sec_root,
|
|
|
|
make_mpi_comment_node("#:ELG_factor:", factors[i] ));
|
1997-12-16 19:15:09 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-05-05 20:34:20 +00:00
|
|
|
/****************
|
|
|
|
* Generate a DSA key
|
|
|
|
*/
|
1997-11-24 22:24:04 +00:00
|
|
|
static int
|
2000-03-08 17:42:19 +00:00
|
|
|
gen_dsa(unsigned int nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
|
1998-11-20 17:42:18 +00:00
|
|
|
STRING2KEY *s2k, PKT_secret_key **ret_sk, u32 expireval )
|
1997-11-24 22:24:04 +00:00
|
|
|
{
|
1998-05-05 20:34:20 +00:00
|
|
|
int rc;
|
|
|
|
int i;
|
|
|
|
PACKET *pkt;
|
1998-06-29 12:30:57 +00:00
|
|
|
PKT_secret_key *sk;
|
|
|
|
PKT_public_key *pk;
|
1998-06-13 17:00:02 +00:00
|
|
|
MPI skey[5];
|
1998-05-05 20:34:20 +00:00
|
|
|
MPI *factors;
|
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
if( nbits > 1024 || nbits < 512 ) {
|
1998-05-05 20:34:20 +00:00
|
|
|
nbits = 1024;
|
2000-03-08 17:42:19 +00:00
|
|
|
log_info(_("keysize invalid; using %u bits\n"), nbits );
|
|
|
|
}
|
|
|
|
|
|
|
|
if( (nbits % 64) ) {
|
|
|
|
nbits = ((nbits + 63) / 64) * 64;
|
|
|
|
log_info(_("keysize rounded up to %u bits\n"), nbits );
|
|
|
|
}
|
1998-05-05 20:34:20 +00:00
|
|
|
|
1998-06-13 17:00:02 +00:00
|
|
|
rc = pubkey_generate( PUBKEY_ALGO_DSA, nbits, skey, &factors );
|
|
|
|
if( rc ) {
|
|
|
|
log_error("pubkey_generate failed: %s\n", g10_errstr(rc) );
|
|
|
|
return rc;
|
|
|
|
}
|
1998-05-05 20:34:20 +00:00
|
|
|
|
1998-06-29 12:30:57 +00:00
|
|
|
sk = m_alloc_clear( sizeof *sk );
|
|
|
|
pk = m_alloc_clear( sizeof *pk );
|
|
|
|
sk->timestamp = pk->timestamp = make_timestamp();
|
|
|
|
sk->version = pk->version = 4;
|
1998-11-20 17:42:18 +00:00
|
|
|
if( expireval ) {
|
|
|
|
sk->expiredate = pk->expiredate = sk->timestamp + expireval;
|
|
|
|
}
|
1998-06-29 12:30:57 +00:00
|
|
|
sk->pubkey_algo = pk->pubkey_algo = PUBKEY_ALGO_DSA;
|
|
|
|
pk->pkey[0] = mpi_copy( skey[0] );
|
|
|
|
pk->pkey[1] = mpi_copy( skey[1] );
|
|
|
|
pk->pkey[2] = mpi_copy( skey[2] );
|
|
|
|
pk->pkey[3] = mpi_copy( skey[3] );
|
|
|
|
sk->skey[0] = skey[0];
|
|
|
|
sk->skey[1] = skey[1];
|
|
|
|
sk->skey[2] = skey[2];
|
|
|
|
sk->skey[3] = skey[3];
|
|
|
|
sk->skey[4] = skey[4];
|
|
|
|
sk->is_protected = 0;
|
|
|
|
sk->protect.algo = 0;
|
|
|
|
|
|
|
|
sk->csum = checksum_mpi_counted_nbits( sk->skey[4] );
|
|
|
|
if( ret_sk ) /* not a subkey: return an unprotected version of the sk */
|
|
|
|
*ret_sk = copy_secret_key( NULL, sk );
|
1998-05-05 20:34:20 +00:00
|
|
|
|
|
|
|
if( dek ) {
|
1998-06-29 12:30:57 +00:00
|
|
|
sk->protect.algo = dek->algo;
|
|
|
|
sk->protect.s2k = *s2k;
|
|
|
|
rc = protect_secret_key( sk, dek );
|
1998-05-05 20:34:20 +00:00
|
|
|
if( rc ) {
|
|
|
|
log_error("protect_secret_key failed: %s\n", g10_errstr(rc) );
|
1998-06-29 12:30:57 +00:00
|
|
|
free_public_key(pk);
|
|
|
|
free_secret_key(sk);
|
1998-05-05 20:34:20 +00:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pkt = m_alloc_clear(sizeof *pkt);
|
1998-06-29 12:30:57 +00:00
|
|
|
pkt->pkttype = ret_sk ? PKT_PUBLIC_KEY : PKT_PUBLIC_SUBKEY;
|
|
|
|
pkt->pkt.public_key = pk;
|
1998-05-05 20:34:20 +00:00
|
|
|
add_kbnode(pub_root, new_kbnode( pkt ));
|
|
|
|
|
|
|
|
/* don't know whether it makes sense to have the factors, so for now
|
|
|
|
* we store them in the secret keyring (but they are not secret)
|
|
|
|
* p = 2 * q * f1 * f2 * ... * fn
|
1998-05-13 17:53:36 +00:00
|
|
|
* We store only f1 to f_n-1; fn can be calculated because p and q
|
1998-05-05 20:34:20 +00:00
|
|
|
* are known.
|
|
|
|
*/
|
|
|
|
pkt = m_alloc_clear(sizeof *pkt);
|
1998-06-29 12:30:57 +00:00
|
|
|
pkt->pkttype = ret_sk ? PKT_SECRET_KEY : PKT_SECRET_SUBKEY;
|
|
|
|
pkt->pkt.secret_key = sk;
|
1998-05-05 20:34:20 +00:00
|
|
|
add_kbnode(sec_root, new_kbnode( pkt ));
|
|
|
|
for(i=1; factors[i]; i++ ) /* the first one is q */
|
|
|
|
add_kbnode( sec_root,
|
|
|
|
make_mpi_comment_node("#:DSA_factor:", factors[i] ));
|
|
|
|
|
|
|
|
return 0;
|
1997-11-24 22:24:04 +00:00
|
|
|
}
|
|
|
|
|
2001-08-14 11:33:49 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Generate an RSA key.
|
|
|
|
*/
|
2000-06-28 09:56:18 +00:00
|
|
|
static int
|
|
|
|
gen_rsa(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
|
|
|
|
STRING2KEY *s2k, PKT_secret_key **ret_sk, u32 expireval )
|
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
PACKET *pkt;
|
|
|
|
PKT_secret_key *sk;
|
|
|
|
PKT_public_key *pk;
|
2001-08-14 11:33:49 +00:00
|
|
|
MPI skey[6];
|
2000-06-28 09:56:18 +00:00
|
|
|
MPI *factors;
|
|
|
|
|
|
|
|
assert( is_RSA(algo) );
|
|
|
|
|
|
|
|
if( nbits < 1024 ) {
|
|
|
|
nbits = 1024;
|
|
|
|
log_info(_("keysize invalid; using %u bits\n"), nbits );
|
|
|
|
}
|
|
|
|
|
|
|
|
if( (nbits % 32) ) {
|
|
|
|
nbits = ((nbits + 31) / 32) * 32;
|
|
|
|
log_info(_("keysize rounded up to %u bits\n"), nbits );
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = pubkey_generate( algo, nbits, skey, &factors );
|
|
|
|
if( rc ) {
|
|
|
|
log_error("pubkey_generate failed: %s\n", g10_errstr(rc) );
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
sk = m_alloc_clear( sizeof *sk );
|
|
|
|
pk = m_alloc_clear( sizeof *pk );
|
|
|
|
sk->timestamp = pk->timestamp = make_timestamp();
|
|
|
|
sk->version = pk->version = 4;
|
|
|
|
if( expireval ) {
|
|
|
|
sk->expiredate = pk->expiredate = sk->timestamp + expireval;
|
|
|
|
}
|
|
|
|
sk->pubkey_algo = pk->pubkey_algo = algo;
|
|
|
|
pk->pkey[0] = mpi_copy( skey[0] );
|
|
|
|
pk->pkey[1] = mpi_copy( skey[1] );
|
|
|
|
sk->skey[0] = skey[0];
|
|
|
|
sk->skey[1] = skey[1];
|
|
|
|
sk->skey[2] = skey[2];
|
|
|
|
sk->skey[3] = skey[3];
|
|
|
|
sk->skey[4] = skey[4];
|
|
|
|
sk->skey[5] = skey[5];
|
|
|
|
sk->is_protected = 0;
|
|
|
|
sk->protect.algo = 0;
|
|
|
|
|
|
|
|
sk->csum = checksum_mpi_counted_nbits( sk->skey[2] );
|
|
|
|
sk->csum += checksum_mpi_counted_nbits( sk->skey[3] );
|
|
|
|
sk->csum += checksum_mpi_counted_nbits( sk->skey[4] );
|
|
|
|
sk->csum += checksum_mpi_counted_nbits( sk->skey[5] );
|
|
|
|
if( ret_sk ) /* not a subkey: return an unprotected version of the sk */
|
|
|
|
*ret_sk = copy_secret_key( NULL, sk );
|
|
|
|
|
|
|
|
if( dek ) {
|
|
|
|
sk->protect.algo = dek->algo;
|
|
|
|
sk->protect.s2k = *s2k;
|
|
|
|
rc = protect_secret_key( sk, dek );
|
|
|
|
if( rc ) {
|
|
|
|
log_error("protect_secret_key failed: %s\n", g10_errstr(rc) );
|
|
|
|
free_public_key(pk);
|
|
|
|
free_secret_key(sk);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pkt = m_alloc_clear(sizeof *pkt);
|
|
|
|
pkt->pkttype = ret_sk ? PKT_PUBLIC_KEY : PKT_PUBLIC_SUBKEY;
|
|
|
|
pkt->pkt.public_key = pk;
|
|
|
|
add_kbnode(pub_root, new_kbnode( pkt ));
|
|
|
|
|
|
|
|
pkt = m_alloc_clear(sizeof *pkt);
|
|
|
|
pkt->pkttype = ret_sk ? PKT_SECRET_KEY : PKT_SECRET_SUBKEY;
|
|
|
|
pkt->pkt.secret_key = sk;
|
|
|
|
add_kbnode(sec_root, new_kbnode( pkt ));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
1997-11-18 14:06:00 +00:00
|
|
|
|
|
|
|
|
1998-04-02 10:30:03 +00:00
|
|
|
/****************
|
|
|
|
* check valid days:
|
|
|
|
* return 0 on error or the multiplier
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
check_valid_days( const char *s )
|
|
|
|
{
|
|
|
|
if( !isdigit(*s) )
|
|
|
|
return 0;
|
|
|
|
for( s++; *s; s++)
|
|
|
|
if( !isdigit(*s) )
|
|
|
|
break;
|
|
|
|
if( !*s )
|
|
|
|
return 1;
|
|
|
|
if( s[1] )
|
|
|
|
return 0; /* e.g. "2323wc" */
|
|
|
|
if( *s == 'd' || *s == 'D' )
|
|
|
|
return 1;
|
|
|
|
if( *s == 'w' || *s == 'W' )
|
|
|
|
return 7;
|
|
|
|
if( *s == 'm' || *s == 'M' )
|
|
|
|
return 30;
|
|
|
|
if( *s == 'y' || *s == 'Y' )
|
|
|
|
return 365;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-06-25 10:19:08 +00:00
|
|
|
/****************
|
1998-07-21 12:53:38 +00:00
|
|
|
* Returns: 0 to create both a DSA and a ElGamal key.
|
2001-08-14 11:33:49 +00:00
|
|
|
* and only if key flags are to be written the desired usage.
|
1998-06-25 10:19:08 +00:00
|
|
|
*/
|
1998-05-26 13:38:00 +00:00
|
|
|
static int
|
2001-08-14 11:33:49 +00:00
|
|
|
ask_algo (int addmode, unsigned int *r_usage)
|
1997-11-18 14:06:00 +00:00
|
|
|
{
|
|
|
|
char *answer;
|
1997-11-24 22:24:04 +00:00
|
|
|
int algo;
|
1998-01-28 16:09:43 +00:00
|
|
|
|
2001-08-14 11:33:49 +00:00
|
|
|
*r_usage = 0;
|
1998-06-25 10:19:08 +00:00
|
|
|
tty_printf(_("Please select what kind of key you want:\n"));
|
|
|
|
if( !addmode )
|
|
|
|
tty_printf(_(" (%d) DSA and ElGamal (default)\n"), 1 );
|
1998-12-10 19:20:47 +00:00
|
|
|
tty_printf( _(" (%d) DSA (sign only)\n"), 2 );
|
1998-10-06 12:10:02 +00:00
|
|
|
if( addmode )
|
|
|
|
tty_printf( _(" (%d) ElGamal (encrypt only)\n"), 3 );
|
2002-05-07 07:24:29 +00:00
|
|
|
if (opt.expert)
|
|
|
|
tty_printf( _(" (%d) ElGamal (sign and encrypt)\n"), 4 );
|
2001-08-14 11:33:49 +00:00
|
|
|
tty_printf( _(" (%d) RSA (sign only)\n"), 5 );
|
|
|
|
if (addmode)
|
|
|
|
tty_printf( _(" (%d) RSA (encrypt only)\n"), 6 );
|
2002-05-07 07:24:29 +00:00
|
|
|
if (opt.expert)
|
|
|
|
tty_printf( _(" (%d) RSA (sign and encrypt)\n"), 7 );
|
1997-11-24 22:24:04 +00:00
|
|
|
|
|
|
|
for(;;) {
|
1998-11-27 11:42:49 +00:00
|
|
|
answer = cpr_get("keygen.algo",_("Your selection? "));
|
1998-08-08 19:27:00 +00:00
|
|
|
cpr_kill_prompt();
|
1997-11-24 22:24:04 +00:00
|
|
|
algo = *answer? atoi(answer): 1;
|
|
|
|
m_free(answer);
|
1998-06-25 10:19:08 +00:00
|
|
|
if( algo == 1 && !addmode ) {
|
|
|
|
algo = 0; /* create both keys */
|
|
|
|
break;
|
|
|
|
}
|
2002-05-07 07:24:29 +00:00
|
|
|
else if( algo == 7 && opt.expert ) {
|
|
|
|
if (cpr_get_answer_is_yes ("keygen.algo.rsa_se",_(
|
|
|
|
"The use of this algorithm is deprecated - create anyway? "))){
|
|
|
|
algo = PUBKEY_ALGO_RSA;
|
|
|
|
*r_usage = PUBKEY_USAGE_ENC | PUBKEY_USAGE_SIG;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2001-08-14 11:33:49 +00:00
|
|
|
else if( algo == 6 && addmode ) {
|
|
|
|
algo = PUBKEY_ALGO_RSA;
|
|
|
|
*r_usage = PUBKEY_USAGE_ENC;
|
|
|
|
break;
|
|
|
|
}
|
2000-06-28 09:56:18 +00:00
|
|
|
else if( algo == 5 ) {
|
2001-08-14 11:33:49 +00:00
|
|
|
algo = PUBKEY_ALGO_RSA;
|
|
|
|
*r_usage = PUBKEY_USAGE_SIG;
|
|
|
|
break;
|
2000-06-28 09:56:18 +00:00
|
|
|
}
|
2002-05-07 07:24:29 +00:00
|
|
|
else if( algo == 4 && opt.expert) {
|
1998-12-10 19:20:47 +00:00
|
|
|
if( cpr_get_answer_is_yes("keygen.algo.elg_se",_(
|
2001-03-22 18:04:47 +00:00
|
|
|
"The use of this algorithm is deprecated - create anyway? "))){
|
1998-12-10 19:20:47 +00:00
|
|
|
algo = PUBKEY_ALGO_ELGAMAL;
|
|
|
|
break;
|
|
|
|
}
|
1997-11-24 22:24:04 +00:00
|
|
|
}
|
1998-10-06 12:10:02 +00:00
|
|
|
else if( algo == 3 && addmode ) {
|
1998-06-25 10:19:08 +00:00
|
|
|
algo = PUBKEY_ALGO_ELGAMAL_E;
|
1998-05-05 20:34:20 +00:00
|
|
|
break;
|
1997-12-23 17:30:18 +00:00
|
|
|
}
|
1998-12-10 19:20:47 +00:00
|
|
|
else if( algo == 2 ) {
|
1998-06-25 10:19:08 +00:00
|
|
|
algo = PUBKEY_ALGO_DSA;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
tty_printf(_("Invalid selection.\n"));
|
1997-11-24 22:24:04 +00:00
|
|
|
}
|
1998-05-26 13:38:00 +00:00
|
|
|
return algo;
|
|
|
|
}
|
1997-11-24 22:24:04 +00:00
|
|
|
|
|
|
|
|
1998-05-26 13:38:00 +00:00
|
|
|
static unsigned
|
|
|
|
ask_keysize( int algo )
|
|
|
|
{
|
|
|
|
char *answer;
|
|
|
|
unsigned nbits;
|
1997-11-24 22:24:04 +00:00
|
|
|
|
2002-01-23 22:17:45 +00:00
|
|
|
if (algo != PUBKEY_ALGO_DSA && algo != PUBKEY_ALGO_RSA) {
|
2001-08-08 12:34:00 +00:00
|
|
|
tty_printf (_("About to generate a new %s keypair.\n"
|
|
|
|
" minimum keysize is 768 bits\n"
|
|
|
|
" default keysize is 1024 bits\n"
|
|
|
|
" highest suggested keysize is 2048 bits\n"),
|
|
|
|
pubkey_algo_to_string(algo) );
|
|
|
|
}
|
|
|
|
|
1997-11-18 14:06:00 +00:00
|
|
|
for(;;) {
|
1998-11-27 11:42:49 +00:00
|
|
|
answer = cpr_get("keygen.size",
|
1998-08-08 19:27:00 +00:00
|
|
|
_("What keysize do you want? (1024) "));
|
|
|
|
cpr_kill_prompt();
|
1997-11-24 22:24:04 +00:00
|
|
|
nbits = *answer? atoi(answer): 1024;
|
1997-11-18 14:06:00 +00:00
|
|
|
m_free(answer);
|
1997-12-16 19:15:09 +00:00
|
|
|
if( algo == PUBKEY_ALGO_DSA && (nbits < 512 || nbits > 1024) )
|
1998-04-14 17:51:16 +00:00
|
|
|
tty_printf(_("DSA only allows keysizes from 512 to 1024\n"));
|
2000-06-28 09:56:18 +00:00
|
|
|
else if( algo == PUBKEY_ALGO_RSA && nbits < 1024 )
|
|
|
|
tty_printf(_("keysize too small;"
|
|
|
|
" 1024 is smallest value allowed for RSA.\n"));
|
2002-01-23 22:17:45 +00:00
|
|
|
else if( nbits < 768 )
|
|
|
|
tty_printf(_("keysize too small;"
|
|
|
|
" 768 is smallest value allowed.\n"));
|
1999-04-07 18:58:34 +00:00
|
|
|
else if( nbits > 4096 ) {
|
|
|
|
/* It is ridiculous and an annoyance to use larger key sizes!
|
|
|
|
* GnuPG can handle much larger sizes; but it takes an eternity
|
|
|
|
* to create such a key (but less than the time the Sirius
|
|
|
|
* Computer Corporation needs to process one of the usual
|
|
|
|
* complaints) and {de,en}cryption although needs some time.
|
|
|
|
* So, before you complain about this limitation, I suggest that
|
|
|
|
* you start a discussion with Marvin about this theme and then
|
|
|
|
* do whatever you want. */
|
|
|
|
tty_printf(_("keysize too large; %d is largest value allowed.\n"),
|
|
|
|
4096);
|
|
|
|
}
|
1998-08-05 16:51:59 +00:00
|
|
|
else if( nbits > 2048 && !cpr_enabled() ) {
|
1998-08-11 17:29:34 +00:00
|
|
|
tty_printf(
|
|
|
|
_("Keysizes larger than 2048 are not suggested because\n"
|
|
|
|
"computations take REALLY long!\n"));
|
1998-11-27 11:42:49 +00:00
|
|
|
if( cpr_get_answer_is_yes("keygen.size.huge.okay",_(
|
1998-07-29 19:35:05 +00:00
|
|
|
"Are you sure that you want this keysize? ")) ) {
|
1998-01-28 16:09:43 +00:00
|
|
|
tty_printf(_("Okay, but keep in mind that your monitor "
|
|
|
|
"and keyboard radiation is also very vulnerable "
|
|
|
|
"to attacks!\n"));
|
1997-11-18 14:06:00 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
1998-01-28 16:09:43 +00:00
|
|
|
tty_printf(_("Requested keysize is %u bits\n"), nbits );
|
1997-12-16 19:15:09 +00:00
|
|
|
if( algo == PUBKEY_ALGO_DSA && (nbits % 64) ) {
|
|
|
|
nbits = ((nbits + 63) / 64) * 64;
|
1998-01-28 16:09:43 +00:00
|
|
|
tty_printf(_("rounded up to %u bits\n"), nbits );
|
1997-12-16 19:15:09 +00:00
|
|
|
}
|
|
|
|
else if( (nbits % 32) ) {
|
1997-11-18 14:06:00 +00:00
|
|
|
nbits = ((nbits + 31) / 32) * 32;
|
1998-01-28 16:09:43 +00:00
|
|
|
tty_printf(_("rounded up to %u bits\n"), nbits );
|
1997-11-18 14:06:00 +00:00
|
|
|
}
|
1998-05-26 13:38:00 +00:00
|
|
|
return nbits;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-03-09 14:23:16 +00:00
|
|
|
/****************
|
|
|
|
* Parse an expire string and return it's value in days.
|
|
|
|
* Returns -1 on error.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
parse_expire_string( const char *string )
|
|
|
|
{
|
|
|
|
int mult;
|
|
|
|
u32 abs_date=0;
|
|
|
|
u32 curtime = make_timestamp();
|
|
|
|
int valid_days;
|
|
|
|
|
|
|
|
if( !*string )
|
|
|
|
valid_days = 0;
|
|
|
|
else if( (abs_date = scan_isodatestr(string)) && abs_date > curtime ) {
|
|
|
|
/* This calculation is not perfectly okay because we
|
|
|
|
* are later going to simply multiply by 86400 and don't
|
|
|
|
* correct for leapseconds. A solution would be to change
|
|
|
|
* the whole implemenation to work with dates and not intervals
|
|
|
|
* which are required for v3 keys.
|
|
|
|
*/
|
|
|
|
valid_days = abs_date/86400-curtime/86400+1;
|
|
|
|
}
|
|
|
|
else if( (mult=check_valid_days(string)) ) {
|
|
|
|
valid_days = atoi(string) * mult;
|
|
|
|
if( valid_days < 0 || valid_days > 39447 )
|
|
|
|
valid_days = 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
valid_days = -1;
|
|
|
|
}
|
|
|
|
return valid_days;
|
|
|
|
}
|
|
|
|
|
2001-12-07 01:14:15 +00:00
|
|
|
/* object == 0 for a key, and 1 for a sig */
|
|
|
|
u32
|
|
|
|
ask_expire_interval(int object)
|
1998-05-26 13:38:00 +00:00
|
|
|
{
|
|
|
|
char *answer;
|
|
|
|
int valid_days=0;
|
1998-11-20 17:42:18 +00:00
|
|
|
u32 interval = 0;
|
1997-11-24 22:24:04 +00:00
|
|
|
|
2001-12-07 01:14:15 +00:00
|
|
|
switch(object)
|
|
|
|
{
|
|
|
|
case 0:
|
|
|
|
tty_printf(_("Please specify how long the key should be valid.\n"
|
|
|
|
" 0 = key does not expire\n"
|
|
|
|
" <n> = key expires in n days\n"
|
|
|
|
" <n>w = key expires in n weeks\n"
|
|
|
|
" <n>m = key expires in n months\n"
|
|
|
|
" <n>y = key expires in n years\n"));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
tty_printf(_("Please specify how long the signature should be valid.\n"
|
|
|
|
" 0 = signature does not expire\n"
|
|
|
|
" <n> = signature expires in n days\n"
|
|
|
|
" <n>w = signature expires in n weeks\n"
|
|
|
|
" <n>m = signature expires in n months\n"
|
|
|
|
" <n>y = signature expires in n years\n"));
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
|
1998-11-20 17:42:18 +00:00
|
|
|
/* Note: The elgamal subkey for DSA has no expiration date because
|
1998-10-18 15:21:22 +00:00
|
|
|
* it must be signed with the DSA key and this one has the expiration
|
1998-05-05 20:34:20 +00:00
|
|
|
* date */
|
|
|
|
|
1998-04-02 10:30:03 +00:00
|
|
|
answer = NULL;
|
|
|
|
for(;;) {
|
2000-03-09 14:23:16 +00:00
|
|
|
u32 curtime=make_timestamp();
|
1998-04-02 10:30:03 +00:00
|
|
|
|
|
|
|
m_free(answer);
|
2001-12-07 01:14:15 +00:00
|
|
|
if(object==0)
|
|
|
|
answer = cpr_get("keygen.valid",_("Key is valid for? (0) "));
|
|
|
|
else
|
|
|
|
answer = cpr_get("siggen.valid",_("Signature is valid for? (0) "));
|
1998-08-08 19:27:00 +00:00
|
|
|
cpr_kill_prompt();
|
1998-04-02 10:30:03 +00:00
|
|
|
trim_spaces(answer);
|
2000-03-09 14:23:16 +00:00
|
|
|
valid_days = parse_expire_string( answer );
|
|
|
|
if( valid_days < 0 ) {
|
1998-04-02 10:30:03 +00:00
|
|
|
tty_printf(_("invalid value\n"));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
1998-10-16 16:00:17 +00:00
|
|
|
if( !valid_days ) {
|
2001-12-07 01:14:15 +00:00
|
|
|
tty_printf(_("%s does not expire at all\n"),
|
|
|
|
object==0?"Key":"Signature");
|
1998-11-20 17:42:18 +00:00
|
|
|
interval = 0;
|
1998-10-16 16:00:17 +00:00
|
|
|
}
|
1998-04-02 10:30:03 +00:00
|
|
|
else {
|
1998-11-20 17:42:18 +00:00
|
|
|
interval = valid_days * 86400L;
|
1998-06-26 09:45:36 +00:00
|
|
|
/* print the date when the key expires */
|
2001-12-07 01:14:15 +00:00
|
|
|
tty_printf(_("%s expires at %s\n"),
|
|
|
|
object==0?"Key":"Signature",
|
1999-10-28 14:09:52 +00:00
|
|
|
asctimestamp((ulong)(curtime + interval) ) );
|
2001-09-07 07:57:51 +00:00
|
|
|
/* FIXME: This check yields warning on alhas:
|
|
|
|
write a configure check and to this check here only for 32 bit machines */
|
1999-10-28 14:09:52 +00:00
|
|
|
if( (time_t)((ulong)(curtime+interval)) < 0 )
|
1999-12-04 11:33:45 +00:00
|
|
|
tty_printf(_("Your system can't display dates beyond 2038.\n"
|
1999-10-28 14:09:52 +00:00
|
|
|
"However, it will be correctly handled up to 2106.\n"));
|
1998-04-02 10:30:03 +00:00
|
|
|
}
|
|
|
|
|
1999-09-01 13:40:07 +00:00
|
|
|
if( cpr_enabled() || cpr_get_answer_is_yes("keygen.valid.okay",
|
|
|
|
_("Is this correct (y/n)? ")) )
|
1998-04-02 10:30:03 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
m_free(answer);
|
1998-11-20 17:42:18 +00:00
|
|
|
return interval;
|
1998-05-26 13:38:00 +00:00
|
|
|
}
|
1998-04-02 10:30:03 +00:00
|
|
|
|
1998-11-20 17:42:18 +00:00
|
|
|
u32
|
|
|
|
ask_expiredate()
|
|
|
|
{
|
2001-12-07 01:14:15 +00:00
|
|
|
u32 x = ask_expire_interval(0);
|
1998-11-20 17:42:18 +00:00
|
|
|
return x? make_timestamp() + x : 0;
|
|
|
|
}
|
1998-04-02 10:30:03 +00:00
|
|
|
|
1998-06-26 09:45:36 +00:00
|
|
|
static int
|
|
|
|
has_invalid_email_chars( const char *s )
|
|
|
|
{
|
1998-10-21 17:34:36 +00:00
|
|
|
int at_seen=0;
|
1999-02-28 18:14:18 +00:00
|
|
|
static char valid_chars[] = "01234567890_-."
|
|
|
|
"abcdefghijklmnopqrstuvwxyz"
|
|
|
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
1998-10-21 17:34:36 +00:00
|
|
|
|
1998-06-26 09:45:36 +00:00
|
|
|
for( ; *s; s++ ) {
|
|
|
|
if( *s & 0x80 )
|
|
|
|
return 1;
|
1998-10-21 17:34:36 +00:00
|
|
|
if( *s == '@' )
|
|
|
|
at_seen=1;
|
1999-02-28 18:14:18 +00:00
|
|
|
else if( !at_seen && !( !!strchr( valid_chars, *s ) || *s == '+' ) )
|
1998-10-21 17:34:36 +00:00
|
|
|
return 1;
|
1999-02-28 18:14:18 +00:00
|
|
|
else if( at_seen && !strchr( valid_chars, *s ) )
|
1998-06-26 09:45:36 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-05-26 13:38:00 +00:00
|
|
|
static char *
|
1998-07-29 19:35:05 +00:00
|
|
|
ask_user_id( int mode )
|
1998-05-26 13:38:00 +00:00
|
|
|
{
|
|
|
|
char *answer;
|
|
|
|
char *aname, *acomment, *amail, *uid;
|
1998-04-02 10:30:03 +00:00
|
|
|
|
1998-07-29 19:35:05 +00:00
|
|
|
if( !mode )
|
|
|
|
tty_printf( _("\n"
|
1998-01-07 20:47:46 +00:00
|
|
|
"You need a User-ID to identify your key; the software constructs the user id\n"
|
|
|
|
"from Real Name, Comment and Email Address in this form:\n"
|
1998-04-02 10:30:03 +00:00
|
|
|
" \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n\n") );
|
1998-05-26 13:38:00 +00:00
|
|
|
uid = aname = acomment = amail = NULL;
|
1997-11-18 14:06:00 +00:00
|
|
|
for(;;) {
|
1998-01-07 20:47:46 +00:00
|
|
|
char *p;
|
2000-04-14 17:34:30 +00:00
|
|
|
int fail=0;
|
1998-01-07 20:47:46 +00:00
|
|
|
|
|
|
|
if( !aname ) {
|
|
|
|
for(;;) {
|
|
|
|
m_free(aname);
|
1998-11-27 11:42:49 +00:00
|
|
|
aname = cpr_get("keygen.name",_("Real name: "));
|
1998-01-07 20:47:46 +00:00
|
|
|
trim_spaces(aname);
|
1998-08-08 19:27:00 +00:00
|
|
|
cpr_kill_prompt();
|
2000-08-23 17:47:49 +00:00
|
|
|
|
|
|
|
if( opt.allow_freeform_uid )
|
|
|
|
break;
|
|
|
|
|
|
|
|
if( strpbrk( aname, "<>" ) )
|
1998-01-28 16:09:43 +00:00
|
|
|
tty_printf(_("Invalid character in name\n"));
|
1998-01-12 10:18:17 +00:00
|
|
|
else if( isdigit(*aname) )
|
1998-01-28 16:09:43 +00:00
|
|
|
tty_printf(_("Name may not start with a digit\n"));
|
1998-01-07 20:47:46 +00:00
|
|
|
else if( strlen(aname) < 5 )
|
1998-01-28 16:09:43 +00:00
|
|
|
tty_printf(_("Name must be at least 5 characters long\n"));
|
1998-01-07 20:47:46 +00:00
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( !amail ) {
|
|
|
|
for(;;) {
|
|
|
|
m_free(amail);
|
1998-11-27 11:42:49 +00:00
|
|
|
amail = cpr_get("keygen.email",_("Email address: "));
|
1998-01-07 20:47:46 +00:00
|
|
|
trim_spaces(amail);
|
1998-08-08 19:27:00 +00:00
|
|
|
cpr_kill_prompt();
|
1998-01-07 20:47:46 +00:00
|
|
|
if( !*amail )
|
|
|
|
break; /* no email address is okay */
|
1998-06-26 09:45:36 +00:00
|
|
|
else if( has_invalid_email_chars(amail)
|
1998-01-07 20:47:46 +00:00
|
|
|
|| string_count_chr(amail,'@') != 1
|
|
|
|
|| *amail == '@'
|
|
|
|
|| amail[strlen(amail)-1] == '@'
|
|
|
|
|| amail[strlen(amail)-1] == '.'
|
|
|
|
|| strstr(amail, "..") )
|
1998-01-28 16:09:43 +00:00
|
|
|
tty_printf(_("Not a valid email address\n"));
|
1998-01-07 20:47:46 +00:00
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( !acomment ) {
|
|
|
|
for(;;) {
|
|
|
|
m_free(acomment);
|
1998-11-27 11:42:49 +00:00
|
|
|
acomment = cpr_get("keygen.comment",_("Comment: "));
|
1998-01-07 20:47:46 +00:00
|
|
|
trim_spaces(acomment);
|
1998-08-08 19:27:00 +00:00
|
|
|
cpr_kill_prompt();
|
1998-01-07 20:47:46 +00:00
|
|
|
if( !*acomment )
|
|
|
|
break; /* no comment is okay */
|
|
|
|
else if( strpbrk( acomment, "()" ) )
|
1998-01-28 16:09:43 +00:00
|
|
|
tty_printf(_("Invalid character in comment\n"));
|
1998-01-07 20:47:46 +00:00
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-04-14 17:34:30 +00:00
|
|
|
|
1997-11-18 14:06:00 +00:00
|
|
|
m_free(uid);
|
1998-01-12 10:18:17 +00:00
|
|
|
uid = p = m_alloc(strlen(aname)+strlen(amail)+strlen(acomment)+12+10);
|
1998-01-07 20:47:46 +00:00
|
|
|
p = stpcpy(p, aname );
|
|
|
|
if( *acomment )
|
|
|
|
p = stpcpy(stpcpy(stpcpy(p," ("), acomment),")");
|
|
|
|
if( *amail )
|
|
|
|
p = stpcpy(stpcpy(stpcpy(p," <"), amail),">");
|
1998-01-16 21:15:24 +00:00
|
|
|
|
|
|
|
/* append a warning if we do not have dev/random
|
|
|
|
* or it is switched into quick testmode */
|
|
|
|
if( quick_random_gen(-1) )
|
|
|
|
strcpy(p, " (INSECURE!)" );
|
|
|
|
|
1999-03-02 15:48:37 +00:00
|
|
|
/* print a note in case that UTF8 mapping has to be done */
|
|
|
|
for(p=uid; *p; p++ ) {
|
|
|
|
if( *p & 0x80 ) {
|
|
|
|
tty_printf(_("You are using the `%s' character set.\n"),
|
|
|
|
get_native_charset() );
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
1998-01-07 20:47:46 +00:00
|
|
|
|
1998-01-28 16:09:43 +00:00
|
|
|
tty_printf(_("You selected this USER-ID:\n \"%s\"\n\n"), uid);
|
1998-04-14 17:51:16 +00:00
|
|
|
/* fixme: add a warning if this user-id already exists */
|
2000-04-14 17:34:30 +00:00
|
|
|
if( !*amail && (strchr( aname, '@' ) || strchr( acomment, '@'))) {
|
|
|
|
fail = 1;
|
|
|
|
tty_printf(_("Please don't put the email address "
|
|
|
|
"into the real name or the comment\n") );
|
|
|
|
}
|
|
|
|
|
1998-01-07 20:47:46 +00:00
|
|
|
for(;;) {
|
2001-08-08 12:34:00 +00:00
|
|
|
const char *ansstr = _("NnCcEeOoQq");
|
1998-08-05 16:51:59 +00:00
|
|
|
|
1998-08-11 17:29:34 +00:00
|
|
|
if( strlen(ansstr) != 10 )
|
|
|
|
BUG();
|
1998-08-05 16:51:59 +00:00
|
|
|
if( cpr_enabled() ) {
|
|
|
|
answer = m_strdup(ansstr+6);
|
|
|
|
answer[1] = 0;
|
|
|
|
}
|
|
|
|
else {
|
2000-04-14 17:34:30 +00:00
|
|
|
answer = cpr_get("keygen.userid.cmd", fail?
|
|
|
|
_("Change (N)ame, (C)omment, (E)mail or (Q)uit? ") :
|
|
|
|
_("Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "));
|
1998-08-08 19:27:00 +00:00
|
|
|
cpr_kill_prompt();
|
1998-08-05 16:51:59 +00:00
|
|
|
}
|
1998-01-07 20:47:46 +00:00
|
|
|
if( strlen(answer) > 1 )
|
|
|
|
;
|
1998-07-29 19:35:05 +00:00
|
|
|
else if( *answer == ansstr[0] || *answer == ansstr[1] ) {
|
1998-01-07 20:47:46 +00:00
|
|
|
m_free(aname); aname = NULL;
|
|
|
|
break;
|
|
|
|
}
|
1998-07-29 19:35:05 +00:00
|
|
|
else if( *answer == ansstr[2] || *answer == ansstr[3] ) {
|
1998-01-07 20:47:46 +00:00
|
|
|
m_free(acomment); acomment = NULL;
|
|
|
|
break;
|
|
|
|
}
|
1998-07-29 19:35:05 +00:00
|
|
|
else if( *answer == ansstr[4] || *answer == ansstr[5] ) {
|
1998-01-07 20:47:46 +00:00
|
|
|
m_free(amail); amail = NULL;
|
|
|
|
break;
|
|
|
|
}
|
1998-07-29 19:35:05 +00:00
|
|
|
else if( *answer == ansstr[6] || *answer == ansstr[7] ) {
|
2000-04-14 17:34:30 +00:00
|
|
|
if( fail ) {
|
|
|
|
tty_printf(_("Please correct the error first\n"));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
m_free(aname); aname = NULL;
|
|
|
|
m_free(acomment); acomment = NULL;
|
|
|
|
m_free(amail); amail = NULL;
|
|
|
|
break;
|
|
|
|
}
|
1997-11-18 14:06:00 +00:00
|
|
|
}
|
1998-07-29 19:35:05 +00:00
|
|
|
else if( *answer == ansstr[8] || *answer == ansstr[9] ) {
|
|
|
|
m_free(aname); aname = NULL;
|
|
|
|
m_free(acomment); acomment = NULL;
|
|
|
|
m_free(amail); amail = NULL;
|
|
|
|
m_free(uid); uid = NULL;
|
|
|
|
break;
|
|
|
|
}
|
1997-11-18 14:06:00 +00:00
|
|
|
m_free(answer);
|
|
|
|
}
|
1998-01-07 20:47:46 +00:00
|
|
|
m_free(answer);
|
|
|
|
if( !amail && !acomment && !amail )
|
|
|
|
break;
|
|
|
|
m_free(uid); uid = NULL;
|
1997-11-18 14:06:00 +00:00
|
|
|
}
|
1998-11-03 19:38:58 +00:00
|
|
|
if( uid ) {
|
|
|
|
char *p = native_to_utf8( uid );
|
|
|
|
m_free( uid );
|
|
|
|
uid = p;
|
|
|
|
}
|
1998-05-26 13:38:00 +00:00
|
|
|
return uid;
|
|
|
|
}
|
|
|
|
|
1997-12-09 12:46:23 +00:00
|
|
|
|
1998-05-26 13:38:00 +00:00
|
|
|
static DEK *
|
|
|
|
ask_passphrase( STRING2KEY **ret_s2k )
|
|
|
|
{
|
|
|
|
DEK *dek = NULL;
|
|
|
|
STRING2KEY *s2k;
|
2002-01-20 18:33:04 +00:00
|
|
|
const char *errtext = NULL;
|
1997-12-09 12:46:23 +00:00
|
|
|
|
1998-01-28 16:09:43 +00:00
|
|
|
tty_printf(_("You need a Passphrase to protect your secret key.\n\n") );
|
1997-12-09 12:46:23 +00:00
|
|
|
|
1998-05-03 15:42:08 +00:00
|
|
|
s2k = m_alloc_secure( sizeof *s2k );
|
1997-12-20 17:23:29 +00:00
|
|
|
for(;;) {
|
1998-09-28 19:25:31 +00:00
|
|
|
s2k->mode = opt.s2k_mode;
|
|
|
|
s2k->hash_algo = opt.s2k_digest_algo;
|
2002-01-20 18:33:04 +00:00
|
|
|
dek = passphrase_to_dek( NULL, 0, opt.s2k_cipher_algo, s2k,2,errtext);
|
1998-05-04 18:49:26 +00:00
|
|
|
if( !dek ) {
|
2002-01-20 18:33:04 +00:00
|
|
|
errtext = _("passphrase not correctly repeated; try again");
|
|
|
|
tty_printf(_("%s.\n"), errtext);
|
1998-05-04 18:49:26 +00:00
|
|
|
}
|
|
|
|
else if( !dek->keylen ) {
|
1997-12-20 17:23:29 +00:00
|
|
|
m_free(dek); dek = NULL;
|
1998-05-03 15:42:08 +00:00
|
|
|
m_free(s2k); s2k = NULL;
|
1998-01-28 16:09:43 +00:00
|
|
|
tty_printf(_(
|
1998-04-14 17:51:16 +00:00
|
|
|
"You don't want a passphrase - this is probably a *bad* idea!\n"
|
|
|
|
"I will do it anyway. You can change your passphrase at any time,\n"
|
1998-07-29 19:35:05 +00:00
|
|
|
"using this program with the option \"--edit-key\".\n\n"));
|
1997-12-20 17:23:29 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
break; /* okay */
|
1997-12-09 12:46:23 +00:00
|
|
|
}
|
1998-05-26 13:38:00 +00:00
|
|
|
*ret_s2k = s2k;
|
|
|
|
return dek;
|
|
|
|
}
|
1997-12-09 12:46:23 +00:00
|
|
|
|
|
|
|
|
1998-05-26 13:38:00 +00:00
|
|
|
static int
|
2001-08-14 11:33:49 +00:00
|
|
|
do_create( int algo, unsigned int nbits, KBNODE pub_root, KBNODE sec_root,
|
2000-03-08 17:42:19 +00:00
|
|
|
DEK *dek, STRING2KEY *s2k, PKT_secret_key **sk, u32 expiredate )
|
1998-05-26 13:38:00 +00:00
|
|
|
{
|
|
|
|
int rc=0;
|
1997-11-18 14:06:00 +00:00
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
if( !opt.batch )
|
|
|
|
tty_printf(_(
|
1997-12-20 17:23:29 +00:00
|
|
|
"We need to generate a lot of random bytes. It is a good idea to perform\n"
|
1999-03-14 18:35:18 +00:00
|
|
|
"some other action (type on the keyboard, move the mouse, utilize the\n"
|
1999-04-07 18:58:34 +00:00
|
|
|
"disks) during the prime generation; this gives the random number\n"
|
|
|
|
"generator a better chance to gain enough entropy.\n") );
|
1997-12-20 17:23:29 +00:00
|
|
|
|
1998-06-25 10:19:08 +00:00
|
|
|
if( algo == PUBKEY_ALGO_ELGAMAL || algo == PUBKEY_ALGO_ELGAMAL_E )
|
2000-06-28 09:56:18 +00:00
|
|
|
rc = gen_elg(algo, nbits, pub_root, sec_root, dek, s2k, sk, expiredate);
|
1997-12-16 19:15:09 +00:00
|
|
|
else if( algo == PUBKEY_ALGO_DSA )
|
1998-10-16 16:00:17 +00:00
|
|
|
rc = gen_dsa(nbits, pub_root, sec_root, dek, s2k, sk, expiredate);
|
2000-06-28 09:56:18 +00:00
|
|
|
else if( algo == PUBKEY_ALGO_RSA )
|
|
|
|
rc = gen_rsa(algo, nbits, pub_root, sec_root, dek, s2k, sk, expiredate);
|
1997-11-24 22:24:04 +00:00
|
|
|
else
|
1998-01-16 21:15:24 +00:00
|
|
|
BUG();
|
1998-10-16 16:00:17 +00:00
|
|
|
|
|
|
|
#ifdef ENABLE_COMMENT_PACKETS
|
1998-02-13 20:58:50 +00:00
|
|
|
if( !rc ) {
|
|
|
|
add_kbnode( pub_root,
|
1998-02-24 18:50:46 +00:00
|
|
|
make_comment_node("#created by GNUPG v" VERSION " ("
|
1998-02-16 20:05:02 +00:00
|
|
|
PRINTABLE_OS_NAME ")"));
|
1998-02-13 20:58:50 +00:00
|
|
|
add_kbnode( sec_root,
|
1998-02-24 18:50:46 +00:00
|
|
|
make_comment_node("#created by GNUPG v" VERSION " ("
|
1998-02-16 20:05:02 +00:00
|
|
|
PRINTABLE_OS_NAME ")"));
|
1998-02-13 20:58:50 +00:00
|
|
|
}
|
1998-10-16 16:00:17 +00:00
|
|
|
#endif
|
1998-05-26 13:38:00 +00:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-07-29 19:35:05 +00:00
|
|
|
/****************
|
1999-06-16 18:25:37 +00:00
|
|
|
* Generate a new user id packet, or return NULL if canceled
|
1998-07-29 19:35:05 +00:00
|
|
|
*/
|
|
|
|
PKT_user_id *
|
|
|
|
generate_user_id()
|
|
|
|
{
|
|
|
|
PKT_user_id *uid;
|
|
|
|
char *p;
|
|
|
|
size_t n;
|
|
|
|
|
|
|
|
p = ask_user_id( 1 );
|
|
|
|
if( !p )
|
|
|
|
return NULL;
|
|
|
|
n = strlen(p);
|
1999-12-04 11:33:45 +00:00
|
|
|
uid = m_alloc_clear( sizeof *uid + n - 1 );
|
1998-07-29 19:35:05 +00:00
|
|
|
uid->len = n;
|
|
|
|
strcpy(uid->name, p);
|
2002-03-31 23:51:33 +00:00
|
|
|
uid->ref = 1;
|
1998-07-29 19:35:05 +00:00
|
|
|
return uid;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
static void
|
|
|
|
release_parameter_list( struct para_data_s *r )
|
|
|
|
{
|
|
|
|
struct para_data_s *r2;
|
|
|
|
|
|
|
|
for( ; r ; r = r2 ) {
|
|
|
|
r2 = r->next;
|
|
|
|
if( r->key == pPASSPHRASE_DEK )
|
|
|
|
m_free( r->u.dek );
|
|
|
|
else if( r->key == pPASSPHRASE_S2K )
|
|
|
|
m_free( r->u.s2k );
|
|
|
|
|
|
|
|
m_free(r);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct para_data_s *
|
|
|
|
get_parameter( struct para_data_s *para, enum para_name key )
|
|
|
|
{
|
|
|
|
struct para_data_s *r;
|
|
|
|
|
|
|
|
for( r = para; r && r->key != key; r = r->next )
|
|
|
|
;
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
get_parameter_value( struct para_data_s *para, enum para_name key )
|
|
|
|
{
|
|
|
|
struct para_data_s *r = get_parameter( para, key );
|
|
|
|
return (r && *r->u.value)? r->u.value : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
get_parameter_algo( struct para_data_s *para, enum para_name key )
|
|
|
|
{
|
2002-05-07 07:24:29 +00:00
|
|
|
int i;
|
2000-03-08 17:42:19 +00:00
|
|
|
struct para_data_s *r = get_parameter( para, key );
|
|
|
|
if( !r )
|
|
|
|
return -1;
|
|
|
|
if( isdigit( *r->u.value ) )
|
2002-05-07 07:24:29 +00:00
|
|
|
i = atoi( r->u.value );
|
|
|
|
else
|
|
|
|
i = string_to_pubkey_algo( r->u.value );
|
|
|
|
if (i == PUBKEY_ALGO_RSA_E || i == PUBKEY_ALGO_RSA_S)
|
|
|
|
i = 0; /* we don't want to allow generation of these algorithms */
|
|
|
|
return i;
|
2000-03-08 17:42:19 +00:00
|
|
|
}
|
|
|
|
|
2001-08-14 11:33:49 +00:00
|
|
|
/*
|
|
|
|
* parse the usage parameter and set the keyflags. Return true on error.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
parse_parameter_usage (const char *fname,
|
|
|
|
struct para_data_s *para, enum para_name key)
|
|
|
|
{
|
|
|
|
struct para_data_s *r = get_parameter( para, key );
|
|
|
|
char *p, *pn;
|
2001-09-09 16:09:19 +00:00
|
|
|
unsigned int use;
|
2001-08-14 11:33:49 +00:00
|
|
|
|
|
|
|
if( !r )
|
|
|
|
return 0; /* none (this is an optional parameter)*/
|
|
|
|
|
2001-09-09 16:09:19 +00:00
|
|
|
use = 0;
|
2001-08-14 11:33:49 +00:00
|
|
|
pn = r->u.value;
|
|
|
|
while ( (p = strsep (&pn, " \t,")) ) {
|
|
|
|
if ( !*p)
|
|
|
|
;
|
|
|
|
else if ( !ascii_strcasecmp (p, "sign") )
|
2001-09-09 16:09:19 +00:00
|
|
|
use |= PUBKEY_USAGE_SIG;
|
2001-08-14 11:33:49 +00:00
|
|
|
else if ( !ascii_strcasecmp (p, "encrypt") )
|
2001-09-09 16:09:19 +00:00
|
|
|
use |= PUBKEY_USAGE_ENC;
|
2001-08-14 11:33:49 +00:00
|
|
|
else {
|
|
|
|
log_error("%s:%d: invalid usage list\n", fname, r->lnr );
|
|
|
|
return -1; /* error */
|
|
|
|
}
|
|
|
|
}
|
2001-09-09 16:09:19 +00:00
|
|
|
r->u.usage = use;
|
2001-08-14 11:33:49 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-05-16 03:35:55 +00:00
|
|
|
static int
|
|
|
|
parse_revocation_key (const char *fname,
|
|
|
|
struct para_data_s *para, enum para_name key)
|
|
|
|
{
|
|
|
|
struct para_data_s *r = get_parameter( para, key );
|
|
|
|
struct revocation_key revkey;
|
|
|
|
char *pn;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if( !r )
|
|
|
|
return 0; /* none (this is an optional parameter) */
|
|
|
|
|
|
|
|
pn = r->u.value;
|
|
|
|
|
|
|
|
revkey.class=0x80;
|
|
|
|
revkey.algid=atoi(pn);
|
|
|
|
if(!revkey.algid)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
/* Skip to the fpr */
|
|
|
|
while(*pn && *pn!=':')
|
|
|
|
pn++;
|
|
|
|
|
|
|
|
if(*pn!=':')
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
pn++;
|
|
|
|
|
|
|
|
for(i=0;i<MAX_FINGERPRINT_LEN && *pn;i++,pn+=2)
|
|
|
|
{
|
|
|
|
int c=hextobyte(pn);
|
|
|
|
if(c==-1)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
revkey.fpr[i]=c;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* skip to the tag */
|
|
|
|
while(*pn && *pn!='s' && *pn!='S')
|
|
|
|
pn++;
|
|
|
|
|
|
|
|
if(ascii_strcasecmp(pn,"sensitive")==0)
|
|
|
|
revkey.class|=0x40;
|
|
|
|
|
|
|
|
memcpy(&r->u.revkey,&revkey,sizeof(struct revocation_key));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
log_error("%s:%d: invalid revocation key\n", fname, r->lnr );
|
|
|
|
return -1; /* error */
|
|
|
|
}
|
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
|
|
|
|
static u32
|
|
|
|
get_parameter_u32( struct para_data_s *para, enum para_name key )
|
|
|
|
{
|
|
|
|
struct para_data_s *r = get_parameter( para, key );
|
|
|
|
|
|
|
|
if( !r )
|
|
|
|
return 0;
|
2000-03-09 14:23:16 +00:00
|
|
|
if( r->key == pKEYEXPIRE || r->key == pSUBKEYEXPIRE )
|
|
|
|
return r->u.expire;
|
2001-08-14 11:33:49 +00:00
|
|
|
if( r->key == pKEYUSAGE || r->key == pSUBKEYUSAGE )
|
|
|
|
return r->u.usage;
|
2000-03-09 14:23:16 +00:00
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
return (unsigned int)strtoul( r->u.value, NULL, 10 );
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned int
|
|
|
|
get_parameter_uint( struct para_data_s *para, enum para_name key )
|
|
|
|
{
|
|
|
|
return get_parameter_u32( para, key );
|
|
|
|
}
|
|
|
|
|
|
|
|
static DEK *
|
|
|
|
get_parameter_dek( struct para_data_s *para, enum para_name key )
|
|
|
|
{
|
|
|
|
struct para_data_s *r = get_parameter( para, key );
|
|
|
|
return r? r->u.dek : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static STRING2KEY *
|
|
|
|
get_parameter_s2k( struct para_data_s *para, enum para_name key )
|
|
|
|
{
|
|
|
|
struct para_data_s *r = get_parameter( para, key );
|
|
|
|
return r? r->u.s2k : NULL;
|
|
|
|
}
|
|
|
|
|
2002-05-16 03:35:55 +00:00
|
|
|
static struct revocation_key *
|
|
|
|
get_parameter_revkey( struct para_data_s *para, enum para_name key )
|
|
|
|
{
|
|
|
|
struct para_data_s *r = get_parameter( para, key );
|
|
|
|
return r? &r->u.revkey : NULL;
|
|
|
|
}
|
2000-03-08 17:42:19 +00:00
|
|
|
|
|
|
|
static int
|
2000-03-09 14:23:16 +00:00
|
|
|
proc_parameter_file( struct para_data_s *para, const char *fname,
|
2001-08-14 11:33:49 +00:00
|
|
|
struct output_control_s *outctrl )
|
2000-03-08 17:42:19 +00:00
|
|
|
{
|
|
|
|
struct para_data_s *r;
|
|
|
|
const char *s1, *s2, *s3;
|
|
|
|
size_t n;
|
|
|
|
char *p;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* check that we have all required parameters */
|
|
|
|
assert( get_parameter( para, pKEYTYPE ) );
|
|
|
|
i = get_parameter_algo( para, pKEYTYPE );
|
|
|
|
if( i < 1 || check_pubkey_algo2( i, PUBKEY_USAGE_SIG ) ) {
|
|
|
|
r = get_parameter( para, pKEYTYPE );
|
|
|
|
log_error("%s:%d: invalid algorithm\n", fname, r->lnr );
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2001-08-14 11:33:49 +00:00
|
|
|
if (parse_parameter_usage (fname, para, pKEYUSAGE))
|
|
|
|
return -1;
|
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
i = get_parameter_algo( para, pSUBKEYTYPE );
|
2001-08-14 11:33:49 +00:00
|
|
|
if( i > 0 && check_pubkey_algo( i ) ) {
|
2000-03-08 17:42:19 +00:00
|
|
|
r = get_parameter( para, pSUBKEYTYPE );
|
|
|
|
log_error("%s:%d: invalid algorithm\n", fname, r->lnr );
|
|
|
|
return -1;
|
|
|
|
}
|
2001-08-14 11:33:49 +00:00
|
|
|
if (i > 0 && parse_parameter_usage (fname, para, pSUBKEYUSAGE))
|
|
|
|
return -1;
|
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
|
|
|
|
if( !get_parameter_value( para, pUSERID ) ) {
|
|
|
|
/* create the formatted user ID */
|
|
|
|
s1 = get_parameter_value( para, pNAMEREAL );
|
|
|
|
s2 = get_parameter_value( para, pNAMECOMMENT );
|
|
|
|
s3 = get_parameter_value( para, pNAMEEMAIL );
|
|
|
|
if( s1 || s2 || s3 ) {
|
|
|
|
n = (s1?strlen(s1):0) + (s2?strlen(s2):0) + (s3?strlen(s3):0);
|
|
|
|
r = m_alloc_clear( sizeof *r + n + 20 );
|
|
|
|
r->key = pUSERID;
|
|
|
|
p = r->u.value;
|
|
|
|
if( s1 )
|
|
|
|
p = stpcpy(p, s1 );
|
|
|
|
if( s2 )
|
|
|
|
p = stpcpy(stpcpy(stpcpy(p," ("), s2 ),")");
|
|
|
|
if( s3 )
|
|
|
|
p = stpcpy(stpcpy(stpcpy(p," <"), s3 ),">");
|
|
|
|
r->next = para;
|
|
|
|
para = r;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-04-14 01:27:11 +00:00
|
|
|
/* Set preferences, if any. */
|
* 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 14:07:12 +00:00
|
|
|
keygen_set_std_prefs(get_parameter_value( para, pPREFERENCES ), 0);
|
2002-04-14 01:27:11 +00:00
|
|
|
|
2002-05-16 03:35:55 +00:00
|
|
|
/* Set revoker, if any. */
|
|
|
|
if (parse_revocation_key (fname, para, pREVOKER))
|
|
|
|
return -1;
|
|
|
|
|
2000-03-09 14:23:16 +00:00
|
|
|
/* make DEK and S2K from the Passphrase */
|
2000-03-08 17:42:19 +00:00
|
|
|
r = get_parameter( para, pPASSPHRASE );
|
|
|
|
if( r && *r->u.value ) {
|
|
|
|
/* we have a plain text passphrase - create a DEK from it.
|
|
|
|
* It is a little bit ridiculous to keep it ih secure memory
|
|
|
|
* but becuase we do this alwasy, why not here */
|
|
|
|
STRING2KEY *s2k;
|
|
|
|
DEK *dek;
|
|
|
|
|
|
|
|
s2k = m_alloc_secure( sizeof *s2k );
|
|
|
|
s2k->mode = opt.s2k_mode;
|
|
|
|
s2k->hash_algo = opt.s2k_digest_algo;
|
|
|
|
set_next_passphrase( r->u.value );
|
2002-01-20 18:33:04 +00:00
|
|
|
dek = passphrase_to_dek( NULL, 0, opt.s2k_cipher_algo, s2k, 2, NULL );
|
2000-03-08 17:42:19 +00:00
|
|
|
set_next_passphrase( NULL );
|
|
|
|
assert( dek );
|
|
|
|
memset( r->u.value, 0, strlen(r->u.value) );
|
|
|
|
|
|
|
|
r = m_alloc_clear( sizeof *r );
|
|
|
|
r->key = pPASSPHRASE_S2K;
|
|
|
|
r->u.s2k = s2k;
|
|
|
|
r->next = para;
|
|
|
|
para = r;
|
|
|
|
r = m_alloc_clear( sizeof *r );
|
|
|
|
r->key = pPASSPHRASE_DEK;
|
|
|
|
r->u.dek = dek;
|
|
|
|
r->next = para;
|
|
|
|
para = r;
|
|
|
|
}
|
2000-03-09 14:23:16 +00:00
|
|
|
|
|
|
|
/* make KEYEXPIRE from Expire-Date */
|
|
|
|
r = get_parameter( para, pEXPIREDATE );
|
|
|
|
if( r && *r->u.value ) {
|
|
|
|
i = parse_expire_string( r->u.value );
|
|
|
|
if( i < 0 ) {
|
|
|
|
log_error("%s:%d: invalid expire date\n", fname, r->lnr );
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
r->u.expire = i * 86400L;
|
|
|
|
r->key = pKEYEXPIRE; /* change hat entry */
|
|
|
|
/* also set it for the subkey */
|
|
|
|
r = m_alloc_clear( sizeof *r + 20 );
|
|
|
|
r->key = pSUBKEYEXPIRE;
|
|
|
|
r->u.expire = i * 86400L;
|
|
|
|
r->next = para;
|
|
|
|
para = r;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( !!outctrl->pub.newfname ^ !!outctrl->sec.newfname ) {
|
|
|
|
log_error("%s:%d: only one ring name is set\n", fname, outctrl->lnr );
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
do_generate_keypair( para, outctrl );
|
2000-03-08 17:42:19 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/****************
|
|
|
|
* Kludge to allow non interactive key generation controlled
|
|
|
|
* by a parameter file (which currently is only stdin)
|
|
|
|
* Note, that string parameters are expected to be in UTF-8
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
read_parameter_file( const char *fname )
|
|
|
|
{
|
|
|
|
static struct { const char *name;
|
|
|
|
enum para_name key;
|
|
|
|
} keywords[] = {
|
|
|
|
{ "Key-Type", pKEYTYPE},
|
|
|
|
{ "Key-Length", pKEYLENGTH },
|
2001-08-14 11:33:49 +00:00
|
|
|
{ "Key-Usage", pKEYUSAGE },
|
2000-03-08 17:42:19 +00:00
|
|
|
{ "Subkey-Type", pSUBKEYTYPE },
|
|
|
|
{ "Subkey-Length", pSUBKEYLENGTH },
|
2001-08-14 11:33:49 +00:00
|
|
|
{ "Subkey-Usage", pSUBKEYUSAGE },
|
2000-03-08 17:42:19 +00:00
|
|
|
{ "Name-Real", pNAMEREAL },
|
|
|
|
{ "Name-Email", pNAMEEMAIL },
|
|
|
|
{ "Name-Comment", pNAMECOMMENT },
|
|
|
|
{ "Expire-Date", pEXPIREDATE },
|
|
|
|
{ "Passphrase", pPASSPHRASE },
|
2002-04-14 01:27:11 +00:00
|
|
|
{ "Preferences", pPREFERENCES },
|
2002-05-16 03:35:55 +00:00
|
|
|
{ "Revoker", pREVOKER },
|
2000-03-08 17:42:19 +00:00
|
|
|
{ NULL, 0 }
|
|
|
|
};
|
|
|
|
FILE *fp;
|
|
|
|
char line[1024], *p;
|
|
|
|
int lnr;
|
|
|
|
const char *err = NULL;
|
|
|
|
struct para_data_s *para, *r;
|
|
|
|
int i;
|
2000-03-09 14:23:16 +00:00
|
|
|
struct output_control_s outctrl;
|
|
|
|
|
|
|
|
memset( &outctrl, 0, sizeof( outctrl ) );
|
2000-03-08 17:42:19 +00:00
|
|
|
|
|
|
|
if( !fname || !*fname || !strcmp(fname,"-") ) {
|
|
|
|
fp = stdin;
|
|
|
|
fname = "-";
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
fp = fopen( fname, "r" );
|
|
|
|
if( !fp ) {
|
|
|
|
log_error(_("can't open `%s': %s\n"), fname, strerror(errno) );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
lnr = 0;
|
|
|
|
err = NULL;
|
|
|
|
para = NULL;
|
|
|
|
while( fgets( line, DIM(line)-1, fp ) ) {
|
|
|
|
char *keyword, *value;
|
|
|
|
|
|
|
|
lnr++;
|
|
|
|
if( *line && line[strlen(line)-1] != '\n' ) {
|
|
|
|
err = "line too long";
|
|
|
|
break;
|
|
|
|
}
|
2000-10-23 16:38:27 +00:00
|
|
|
for( p = line; isspace(*(byte*)p); p++ )
|
2000-03-08 17:42:19 +00:00
|
|
|
;
|
|
|
|
if( !*p || *p == '#' )
|
|
|
|
continue;
|
|
|
|
keyword = p;
|
|
|
|
if( *keyword == '%' ) {
|
2000-10-23 16:38:27 +00:00
|
|
|
for( ; !isspace(*(byte*)p); p++ )
|
2000-03-09 14:23:16 +00:00
|
|
|
;
|
|
|
|
if( *p )
|
|
|
|
*p++ = 0;
|
2000-10-23 16:38:27 +00:00
|
|
|
for( ; isspace(*(byte*)p); p++ )
|
2000-03-09 14:23:16 +00:00
|
|
|
;
|
|
|
|
value = p;
|
|
|
|
trim_trailing_ws( value, strlen(value) );
|
2001-06-12 18:42:40 +00:00
|
|
|
if( !ascii_strcasecmp( keyword, "%echo" ) )
|
2000-03-09 14:23:16 +00:00
|
|
|
log_info("%s\n", value );
|
2001-06-12 18:42:40 +00:00
|
|
|
else if( !ascii_strcasecmp( keyword, "%dry-run" ) )
|
2000-03-09 14:23:16 +00:00
|
|
|
outctrl.dryrun = 1;
|
2001-06-12 18:42:40 +00:00
|
|
|
else if( !ascii_strcasecmp( keyword, "%commit" ) ) {
|
2000-03-09 14:23:16 +00:00
|
|
|
outctrl.lnr = lnr;
|
|
|
|
proc_parameter_file( para, fname, &outctrl );
|
|
|
|
release_parameter_list( para );
|
|
|
|
para = NULL;
|
|
|
|
}
|
2001-06-12 18:42:40 +00:00
|
|
|
else if( !ascii_strcasecmp( keyword, "%pubring" ) ) {
|
2000-03-09 14:23:16 +00:00
|
|
|
if( outctrl.pub.fname && !strcmp( outctrl.pub.fname, value ) )
|
|
|
|
; /* still the same file - ignore it */
|
|
|
|
else {
|
|
|
|
m_free( outctrl.pub.newfname );
|
|
|
|
outctrl.pub.newfname = m_strdup( value );
|
|
|
|
outctrl.use_files = 1;
|
|
|
|
}
|
|
|
|
}
|
2001-06-12 18:42:40 +00:00
|
|
|
else if( !ascii_strcasecmp( keyword, "%secring" ) ) {
|
2000-03-09 14:23:16 +00:00
|
|
|
if( outctrl.sec.fname && !strcmp( outctrl.sec.fname, value ) )
|
|
|
|
; /* still the same file - ignore it */
|
|
|
|
else {
|
|
|
|
m_free( outctrl.sec.newfname );
|
|
|
|
outctrl.sec.newfname = m_strdup( value );
|
|
|
|
outctrl.use_files = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
log_info("skipping control `%s' (%s)\n", keyword, value );
|
|
|
|
|
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if( !(p = strchr( p, ':' )) || p == keyword ) {
|
|
|
|
err = "missing colon";
|
|
|
|
break;
|
|
|
|
}
|
2000-03-09 14:23:16 +00:00
|
|
|
if( *p )
|
|
|
|
*p++ = 0;
|
2000-10-23 16:38:27 +00:00
|
|
|
for( ; isspace(*(byte*)p); p++ )
|
2000-03-08 17:42:19 +00:00
|
|
|
;
|
|
|
|
if( !*p ) {
|
|
|
|
err = "missing argument";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
value = p;
|
|
|
|
trim_trailing_ws( value, strlen(value) );
|
|
|
|
|
|
|
|
for(i=0; keywords[i].name; i++ ) {
|
2001-06-12 18:42:40 +00:00
|
|
|
if( !ascii_strcasecmp( keywords[i].name, keyword ) )
|
2000-03-08 17:42:19 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if( !keywords[i].name ) {
|
|
|
|
err = "unknown keyword";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if( keywords[i].key != pKEYTYPE && !para ) {
|
|
|
|
err = "parameter block does not start with \"Key-Type\"";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if( keywords[i].key == pKEYTYPE && para ) {
|
2000-03-09 14:23:16 +00:00
|
|
|
outctrl.lnr = lnr;
|
|
|
|
proc_parameter_file( para, fname, &outctrl );
|
2000-03-08 17:42:19 +00:00
|
|
|
release_parameter_list( para );
|
|
|
|
para = NULL;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for( r = para; r; r = r->next ) {
|
|
|
|
if( r->key == keywords[i].key )
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if( r ) {
|
|
|
|
err = "duplicate keyword";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
r = m_alloc_clear( sizeof *r + strlen( value ) );
|
|
|
|
r->lnr = lnr;
|
|
|
|
r->key = keywords[i].key;
|
|
|
|
strcpy( r->u.value, value );
|
|
|
|
r->next = para;
|
|
|
|
para = r;
|
|
|
|
}
|
|
|
|
if( err )
|
|
|
|
log_error("%s:%d: %s\n", fname, lnr, err );
|
|
|
|
else if( ferror(fp) ) {
|
|
|
|
log_error("%s:%d: read error: %s\n", fname, lnr, strerror(errno) );
|
|
|
|
}
|
|
|
|
else if( para ) {
|
2000-03-09 14:23:16 +00:00
|
|
|
outctrl.lnr = lnr;
|
|
|
|
proc_parameter_file( para, fname, &outctrl );
|
2000-03-08 17:42:19 +00:00
|
|
|
}
|
2000-03-09 14:23:16 +00:00
|
|
|
|
|
|
|
if( outctrl.use_files ) { /* close open streams */
|
|
|
|
iobuf_close( outctrl.pub.stream );
|
|
|
|
iobuf_close( outctrl.sec.stream );
|
|
|
|
m_free( outctrl.pub.fname );
|
|
|
|
m_free( outctrl.pub.newfname );
|
|
|
|
m_free( outctrl.sec.fname );
|
|
|
|
m_free( outctrl.sec.newfname );
|
|
|
|
}
|
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
release_parameter_list( para );
|
|
|
|
if( strcmp( fname, "-" ) )
|
|
|
|
fclose(fp);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-05-26 13:38:00 +00:00
|
|
|
/****************
|
|
|
|
* Generate a keypair
|
2000-03-08 17:42:19 +00:00
|
|
|
* (fname is only used in batch mode)
|
1998-05-26 13:38:00 +00:00
|
|
|
*/
|
|
|
|
void
|
2000-03-08 17:42:19 +00:00
|
|
|
generate_keypair( const char *fname )
|
1998-05-26 13:38:00 +00:00
|
|
|
{
|
2000-03-08 17:42:19 +00:00
|
|
|
unsigned int nbits;
|
1998-05-26 13:38:00 +00:00
|
|
|
char *uid = NULL;
|
|
|
|
DEK *dek;
|
|
|
|
STRING2KEY *s2k;
|
|
|
|
int algo;
|
2001-09-09 16:09:19 +00:00
|
|
|
unsigned int use;
|
1998-06-25 10:19:08 +00:00
|
|
|
int both = 0;
|
2000-03-08 17:42:19 +00:00
|
|
|
u32 expire;
|
|
|
|
struct para_data_s *para = NULL;
|
|
|
|
struct para_data_s *r;
|
2000-03-09 14:23:16 +00:00
|
|
|
struct output_control_s outctrl;
|
|
|
|
|
|
|
|
memset( &outctrl, 0, sizeof( outctrl ) );
|
1998-05-26 13:38:00 +00:00
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
if( opt.batch ) {
|
|
|
|
read_parameter_file( fname );
|
1998-05-26 13:38:00 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2001-09-09 16:09:19 +00:00
|
|
|
algo = ask_algo( 0, &use );
|
2000-03-08 17:42:19 +00:00
|
|
|
if( !algo ) { /* default: DSA with ElG subkey of the specified size */
|
1998-06-25 10:19:08 +00:00
|
|
|
both = 1;
|
2000-03-08 17:42:19 +00:00
|
|
|
r = m_alloc_clear( sizeof *r + 20 );
|
|
|
|
r->key = pKEYTYPE;
|
|
|
|
sprintf( r->u.value, "%d", PUBKEY_ALGO_DSA );
|
|
|
|
r->next = para;
|
|
|
|
para = r;
|
1998-06-25 10:19:08 +00:00
|
|
|
tty_printf(_("DSA keypair will have 1024 bits.\n"));
|
2000-03-08 17:42:19 +00:00
|
|
|
r = m_alloc_clear( sizeof *r + 20 );
|
|
|
|
r->key = pKEYLENGTH;
|
|
|
|
strcpy( r->u.value, "1024" );
|
|
|
|
r->next = para;
|
|
|
|
para = r;
|
|
|
|
|
|
|
|
algo = PUBKEY_ALGO_ELGAMAL_E;
|
|
|
|
r = m_alloc_clear( sizeof *r + 20 );
|
|
|
|
r->key = pSUBKEYTYPE;
|
|
|
|
sprintf( r->u.value, "%d", algo );
|
|
|
|
r->next = para;
|
|
|
|
para = r;
|
1998-06-25 10:19:08 +00:00
|
|
|
}
|
2000-03-08 17:42:19 +00:00
|
|
|
else {
|
|
|
|
r = m_alloc_clear( sizeof *r + 20 );
|
|
|
|
r->key = pKEYTYPE;
|
|
|
|
sprintf( r->u.value, "%d", algo );
|
|
|
|
r->next = para;
|
|
|
|
para = r;
|
2001-08-14 11:33:49 +00:00
|
|
|
|
2001-09-09 16:09:19 +00:00
|
|
|
if (use) {
|
2001-08-14 11:33:49 +00:00
|
|
|
r = m_alloc_clear( sizeof *r + 20 );
|
|
|
|
r->key = pKEYUSAGE;
|
|
|
|
sprintf( r->u.value, "%s%s",
|
2001-09-09 16:09:19 +00:00
|
|
|
(use & PUBKEY_USAGE_SIG)? "sign ":"",
|
|
|
|
(use & PUBKEY_USAGE_ENC)? "encrypt ":"" );
|
2001-08-14 11:33:49 +00:00
|
|
|
r->next = para;
|
|
|
|
para = r;
|
|
|
|
}
|
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
}
|
|
|
|
|
1998-05-26 13:38:00 +00:00
|
|
|
nbits = ask_keysize( algo );
|
2000-03-08 17:42:19 +00:00
|
|
|
r = m_alloc_clear( sizeof *r + 20 );
|
|
|
|
r->key = both? pSUBKEYLENGTH : pKEYLENGTH;
|
|
|
|
sprintf( r->u.value, "%u", nbits);
|
|
|
|
r->next = para;
|
|
|
|
para = r;
|
|
|
|
|
2001-12-07 01:14:15 +00:00
|
|
|
expire = ask_expire_interval(0);
|
2000-03-08 17:42:19 +00:00
|
|
|
r = m_alloc_clear( sizeof *r + 20 );
|
|
|
|
r->key = pKEYEXPIRE;
|
2000-03-09 14:23:16 +00:00
|
|
|
r->u.expire = expire;
|
|
|
|
r->next = para;
|
|
|
|
para = r;
|
|
|
|
r = m_alloc_clear( sizeof *r + 20 );
|
|
|
|
r->key = pSUBKEYEXPIRE;
|
|
|
|
r->u.expire = expire;
|
2000-03-08 17:42:19 +00:00
|
|
|
r->next = para;
|
|
|
|
para = r;
|
|
|
|
|
1998-07-29 19:35:05 +00:00
|
|
|
uid = ask_user_id(0);
|
|
|
|
if( !uid ) {
|
1999-06-16 18:25:37 +00:00
|
|
|
log_error(_("Key generation canceled.\n"));
|
2000-03-08 17:42:19 +00:00
|
|
|
release_parameter_list( para );
|
1998-07-29 19:35:05 +00:00
|
|
|
return;
|
|
|
|
}
|
2000-03-08 17:42:19 +00:00
|
|
|
r = m_alloc_clear( sizeof *r + strlen(uid) );
|
|
|
|
r->key = pUSERID;
|
|
|
|
strcpy( r->u.value, uid );
|
|
|
|
r->next = para;
|
|
|
|
para = r;
|
|
|
|
|
1998-05-26 13:38:00 +00:00
|
|
|
dek = ask_passphrase( &s2k );
|
2000-03-08 17:42:19 +00:00
|
|
|
if( dek ) {
|
|
|
|
r = m_alloc_clear( sizeof *r );
|
|
|
|
r->key = pPASSPHRASE_DEK;
|
|
|
|
r->u.dek = dek;
|
|
|
|
r->next = para;
|
|
|
|
para = r;
|
|
|
|
r = m_alloc_clear( sizeof *r );
|
|
|
|
r->key = pPASSPHRASE_S2K;
|
|
|
|
r->u.s2k = s2k;
|
|
|
|
r->next = para;
|
|
|
|
para = r;
|
|
|
|
}
|
|
|
|
|
2000-03-09 14:23:16 +00:00
|
|
|
proc_parameter_file( para, "[internal]", &outctrl );
|
2000-03-08 17:42:19 +00:00
|
|
|
release_parameter_list( para );
|
|
|
|
}
|
|
|
|
|
1998-05-26 13:38:00 +00:00
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
static void
|
2000-03-09 14:23:16 +00:00
|
|
|
do_generate_keypair( struct para_data_s *para,
|
|
|
|
struct output_control_s *outctrl )
|
2000-03-08 17:42:19 +00:00
|
|
|
{
|
|
|
|
KBNODE pub_root = NULL;
|
|
|
|
KBNODE sec_root = NULL;
|
|
|
|
PKT_secret_key *sk = NULL;
|
|
|
|
const char *s;
|
2002-05-16 03:35:55 +00:00
|
|
|
struct revocation_key *revkey;
|
2000-03-08 17:42:19 +00:00
|
|
|
int rc;
|
2001-01-03 13:36:03 +00:00
|
|
|
int did_sub = 0;
|
1998-05-26 13:38:00 +00:00
|
|
|
|
2000-03-09 14:23:16 +00:00
|
|
|
if( outctrl->dryrun ) {
|
|
|
|
log_info("dry-run mode - key generation skipped\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if( outctrl->use_files ) {
|
|
|
|
if( outctrl->pub.newfname ) {
|
|
|
|
iobuf_close(outctrl->pub.stream);
|
|
|
|
outctrl->pub.stream = NULL;
|
|
|
|
m_free( outctrl->pub.fname );
|
|
|
|
outctrl->pub.fname = outctrl->pub.newfname;
|
|
|
|
outctrl->pub.newfname = NULL;
|
|
|
|
|
|
|
|
outctrl->pub.stream = iobuf_create( outctrl->pub.fname );
|
|
|
|
if( !outctrl->pub.stream ) {
|
|
|
|
log_error("can't create `%s': %s\n", outctrl->pub.newfname,
|
|
|
|
strerror(errno) );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if( opt.armor ) {
|
|
|
|
outctrl->pub.afx.what = 1;
|
|
|
|
iobuf_push_filter( outctrl->pub.stream, armor_filter,
|
|
|
|
&outctrl->pub.afx );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if( outctrl->sec.newfname ) {
|
|
|
|
iobuf_close(outctrl->sec.stream);
|
|
|
|
outctrl->sec.stream = NULL;
|
|
|
|
m_free( outctrl->sec.fname );
|
|
|
|
outctrl->sec.fname = outctrl->sec.newfname;
|
|
|
|
outctrl->sec.newfname = NULL;
|
|
|
|
|
|
|
|
outctrl->sec.stream = iobuf_create( outctrl->sec.fname );
|
|
|
|
if( !outctrl->sec.stream ) {
|
|
|
|
log_error("can't create `%s': %s\n", outctrl->sec.newfname,
|
|
|
|
strerror(errno) );
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if( opt.armor ) {
|
|
|
|
outctrl->sec.afx.what = 5;
|
|
|
|
iobuf_push_filter( outctrl->sec.stream, armor_filter,
|
|
|
|
&outctrl->sec.afx );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
assert( outctrl->pub.stream );
|
|
|
|
assert( outctrl->sec.stream );
|
2001-09-06 17:10:00 +00:00
|
|
|
if( opt.verbose ) {
|
|
|
|
log_info(_("writing public key to `%s'\n"), outctrl->pub.fname );
|
|
|
|
log_info(_("writing secret key to `%s'\n"), outctrl->sec.fname );
|
|
|
|
}
|
2000-03-09 14:23:16 +00:00
|
|
|
}
|
|
|
|
|
1998-05-26 13:38:00 +00:00
|
|
|
|
|
|
|
/* we create the packets as a tree of kbnodes. Because the structure
|
|
|
|
* we create is known in advance we simply generate a linked list
|
|
|
|
* The first packet is a dummy comment packet which we flag
|
1998-06-29 12:30:57 +00:00
|
|
|
* as deleted. The very first packet must always be a KEY packet.
|
1998-05-26 13:38:00 +00:00
|
|
|
*/
|
|
|
|
pub_root = make_comment_node("#"); delete_kbnode(pub_root);
|
|
|
|
sec_root = make_comment_node("#"); delete_kbnode(sec_root);
|
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
rc = do_create( get_parameter_algo( para, pKEYTYPE ),
|
|
|
|
get_parameter_uint( para, pKEYLENGTH ),
|
|
|
|
pub_root, sec_root,
|
|
|
|
get_parameter_dek( para, pPASSPHRASE_DEK ),
|
|
|
|
get_parameter_s2k( para, pPASSPHRASE_S2K ),
|
|
|
|
&sk,
|
|
|
|
get_parameter_u32( para, pKEYEXPIRE ) );
|
2002-05-16 03:35:55 +00:00
|
|
|
|
|
|
|
if(!rc && (revkey=get_parameter_revkey(para,pREVOKER)))
|
|
|
|
{
|
|
|
|
rc=write_direct_sig(pub_root,pub_root,sk,revkey);
|
|
|
|
if(!rc)
|
|
|
|
write_direct_sig(sec_root,pub_root,sk,revkey);
|
|
|
|
}
|
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
if( !rc && (s=get_parameter_value(para, pUSERID)) ) {
|
|
|
|
write_uid(pub_root, s );
|
|
|
|
if( !rc )
|
|
|
|
write_uid(sec_root, s );
|
|
|
|
if( !rc )
|
2001-08-14 11:33:49 +00:00
|
|
|
rc = write_selfsig(pub_root, pub_root, sk,
|
|
|
|
get_parameter_uint (para, pKEYUSAGE));
|
2000-03-08 17:42:19 +00:00
|
|
|
if( !rc )
|
2001-08-14 11:33:49 +00:00
|
|
|
rc = write_selfsig(sec_root, pub_root, sk,
|
|
|
|
get_parameter_uint (para, pKEYUSAGE));
|
2000-03-08 17:42:19 +00:00
|
|
|
}
|
1997-12-09 12:46:23 +00:00
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
if( get_parameter( para, pSUBKEYTYPE ) ) {
|
|
|
|
rc = do_create( get_parameter_algo( para, pSUBKEYTYPE ),
|
|
|
|
get_parameter_uint( para, pSUBKEYLENGTH ),
|
|
|
|
pub_root, sec_root,
|
|
|
|
get_parameter_dek( para, pPASSPHRASE_DEK ),
|
|
|
|
get_parameter_s2k( para, pPASSPHRASE_S2K ),
|
|
|
|
NULL,
|
|
|
|
get_parameter_u32( para, pSUBKEYEXPIRE ) );
|
1998-06-25 10:19:08 +00:00
|
|
|
if( !rc )
|
2001-08-14 11:33:49 +00:00
|
|
|
rc = write_keybinding(pub_root, pub_root, sk,
|
|
|
|
get_parameter_uint (para, pSUBKEYUSAGE));
|
1998-06-25 10:19:08 +00:00
|
|
|
if( !rc )
|
2001-08-14 11:33:49 +00:00
|
|
|
rc = write_keybinding(sec_root, pub_root, sk,
|
|
|
|
get_parameter_uint (para, pSUBKEYUSAGE));
|
2001-01-03 13:36:03 +00:00
|
|
|
did_sub = 1;
|
1998-06-25 10:19:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-03-09 14:23:16 +00:00
|
|
|
if( !rc && outctrl->use_files ) { /* direct write to specified files */
|
|
|
|
rc = write_keyblock( outctrl->pub.stream, pub_root );
|
|
|
|
if( rc )
|
|
|
|
log_error("can't write public key: %s\n", g10_errstr(rc) );
|
|
|
|
if( !rc ) {
|
|
|
|
rc = write_keyblock( outctrl->sec.stream, sec_root );
|
|
|
|
if( rc )
|
|
|
|
log_error("can't write secret key: %s\n", g10_errstr(rc) );
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
else if( !rc ) { /* write to the standard keyrings */
|
2001-09-06 17:10:00 +00:00
|
|
|
KEYDB_HANDLE pub_hd = keydb_new (0);
|
|
|
|
KEYDB_HANDLE sec_hd = keydb_new (1);
|
|
|
|
|
|
|
|
/* FIXME: we may have to create the keyring first */
|
|
|
|
rc = keydb_locate_writable (pub_hd, NULL);
|
|
|
|
if (rc)
|
|
|
|
log_error (_("no writable public keyring found: %s\n"),
|
|
|
|
g10_errstr (rc));
|
|
|
|
|
|
|
|
if (!rc) {
|
|
|
|
rc = keydb_locate_writable (sec_hd, NULL);
|
|
|
|
if (rc)
|
|
|
|
log_error (_("no writable secret keyring found: %s\n"),
|
|
|
|
g10_errstr (rc));
|
|
|
|
}
|
1997-12-16 19:15:09 +00:00
|
|
|
|
2001-09-06 17:10:00 +00:00
|
|
|
if (!rc && opt.verbose) {
|
|
|
|
log_info(_("writing public key to `%s'\n"),
|
|
|
|
keydb_get_resource_name (pub_hd));
|
|
|
|
log_info(_("writing secret key to `%s'\n"),
|
|
|
|
keydb_get_resource_name (sec_hd));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!rc) {
|
|
|
|
rc = keydb_insert_keyblock (pub_hd, pub_root);
|
|
|
|
if (rc)
|
|
|
|
log_error (_("error writing public keyring `%s': %s\n"),
|
|
|
|
keydb_get_resource_name (pub_hd), g10_errstr(rc));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!rc) {
|
|
|
|
rc = keydb_insert_keyblock (sec_hd, sec_root);
|
|
|
|
if (rc)
|
|
|
|
log_error (_("error writing secret keyring `%s': %s\n"),
|
|
|
|
keydb_get_resource_name (pub_hd), g10_errstr(rc));
|
|
|
|
}
|
|
|
|
|
|
|
|
keydb_release (pub_hd);
|
|
|
|
keydb_release (sec_hd);
|
|
|
|
|
|
|
|
if (!rc) {
|
2001-08-14 11:33:49 +00:00
|
|
|
int no_enc_rsa =
|
|
|
|
get_parameter_algo(para, pKEYTYPE) == PUBKEY_ALGO_RSA
|
|
|
|
&& get_parameter_uint( para, pKEYUSAGE )
|
|
|
|
&& !(get_parameter_uint( para,pKEYUSAGE) & PUBKEY_USAGE_ENC);
|
2001-09-24 16:03:14 +00:00
|
|
|
PKT_public_key *pk = find_kbnode (pub_root,
|
|
|
|
PKT_PUBLIC_KEY)->pkt->pkt.public_key;
|
|
|
|
|
|
|
|
update_ownertrust (pk,
|
|
|
|
((get_ownertrust (pk) & ~TRUST_MASK)
|
|
|
|
| TRUST_ULTIMATE ));
|
|
|
|
|
|
|
|
if (!opt.batch) {
|
|
|
|
tty_printf(_("public and secret key created and signed.\n") );
|
|
|
|
tty_printf(_("key marked as ultimately trusted.\n") );
|
2002-04-23 17:54:38 +00:00
|
|
|
tty_printf("\n");
|
|
|
|
list_keyblock(pub_root,0,1,NULL);
|
2001-09-24 16:03:14 +00:00
|
|
|
}
|
|
|
|
|
2001-08-14 11:33:49 +00:00
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
if( !opt.batch
|
2001-08-14 11:33:49 +00:00
|
|
|
&& ( get_parameter_algo( para, pKEYTYPE ) == PUBKEY_ALGO_DSA
|
|
|
|
|| no_enc_rsa )
|
2000-03-08 17:42:19 +00:00
|
|
|
&& !get_parameter( para, pSUBKEYTYPE ) )
|
|
|
|
{
|
1998-05-26 13:38:00 +00:00
|
|
|
tty_printf(_("Note that this key cannot be used for "
|
|
|
|
"encryption. You may want to use\n"
|
1999-01-19 18:37:41 +00:00
|
|
|
"the command \"--edit-key\" to generate a "
|
1998-05-26 13:38:00 +00:00
|
|
|
"secondary key for this purpose.\n") );
|
2000-03-08 17:42:19 +00:00
|
|
|
}
|
1997-12-16 19:15:09 +00:00
|
|
|
}
|
1997-12-09 12:46:23 +00:00
|
|
|
}
|
1997-12-16 19:15:09 +00:00
|
|
|
|
2000-03-08 17:42:19 +00:00
|
|
|
if( rc ) {
|
|
|
|
if( opt.batch )
|
2000-03-09 14:23:16 +00:00
|
|
|
log_error("key generation failed: %s\n", g10_errstr(rc) );
|
2000-03-08 17:42:19 +00:00
|
|
|
else
|
|
|
|
tty_printf(_("Key generation failed: %s\n"), g10_errstr(rc) );
|
|
|
|
}
|
2001-01-03 13:36:03 +00:00
|
|
|
else {
|
|
|
|
write_status_text (STATUS_KEY_CREATED, did_sub? "B":"P");
|
|
|
|
}
|
1997-12-16 19:15:09 +00:00
|
|
|
release_kbnode( pub_root );
|
|
|
|
release_kbnode( sec_root );
|
1998-06-29 12:30:57 +00:00
|
|
|
if( sk ) /* the unprotected secret key */
|
|
|
|
free_secret_key(sk);
|
1997-11-18 14:06:00 +00:00
|
|
|
}
|
|
|
|
|
1998-05-05 20:34:20 +00:00
|
|
|
|
|
|
|
/****************
|
|
|
|
* add a new subkey to an existing key.
|
1998-07-29 19:35:05 +00:00
|
|
|
* Returns true if a new key has been generated and put into the keyblocks.
|
1998-05-05 20:34:20 +00:00
|
|
|
*/
|
1998-07-29 19:35:05 +00:00
|
|
|
int
|
|
|
|
generate_subkeypair( KBNODE pub_keyblock, KBNODE sec_keyblock )
|
1998-05-05 20:34:20 +00:00
|
|
|
{
|
1998-07-29 19:35:05 +00:00
|
|
|
int okay=0, rc=0;
|
1998-05-26 13:38:00 +00:00
|
|
|
KBNODE node;
|
1998-06-29 12:30:57 +00:00
|
|
|
PKT_secret_key *sk = NULL; /* this is the primary sk */
|
2000-03-08 17:42:19 +00:00
|
|
|
int algo;
|
2001-09-09 16:09:19 +00:00
|
|
|
unsigned int use;
|
1998-11-20 17:42:18 +00:00
|
|
|
u32 expire;
|
1998-05-26 13:38:00 +00:00
|
|
|
unsigned nbits;
|
|
|
|
char *passphrase = NULL;
|
|
|
|
DEK *dek = NULL;
|
|
|
|
STRING2KEY *s2k = NULL;
|
1999-01-12 10:20:24 +00:00
|
|
|
u32 cur_time;
|
1998-05-26 13:38:00 +00:00
|
|
|
|
1998-07-29 19:35:05 +00:00
|
|
|
/* break out the primary secret key */
|
1998-06-29 12:30:57 +00:00
|
|
|
node = find_kbnode( sec_keyblock, PKT_SECRET_KEY );
|
1998-05-26 13:38:00 +00:00
|
|
|
if( !node ) {
|
|
|
|
log_error("Oops; secret key not found anymore!\n");
|
|
|
|
goto leave;
|
|
|
|
}
|
|
|
|
|
1998-06-29 12:30:57 +00:00
|
|
|
/* make a copy of the sk to keep the protected one in the keyblock */
|
|
|
|
sk = copy_secret_key( NULL, node->pkt->pkt.secret_key );
|
1999-01-12 10:20:24 +00:00
|
|
|
|
|
|
|
cur_time = make_timestamp();
|
|
|
|
if( sk->timestamp > cur_time ) {
|
|
|
|
ulong d = sk->timestamp - cur_time;
|
|
|
|
log_info( d==1 ? _("key has been created %lu second "
|
|
|
|
"in future (time warp or clock problem)\n")
|
|
|
|
: _("key has been created %lu seconds "
|
|
|
|
"in future (time warp or clock problem)\n"), d );
|
2000-02-09 14:35:37 +00:00
|
|
|
if( !opt.ignore_time_conflict ) {
|
|
|
|
rc = G10ERR_TIME_CONFLICT;
|
|
|
|
goto leave;
|
|
|
|
}
|
1999-01-12 10:20:24 +00:00
|
|
|
}
|
|
|
|
|
2002-04-20 11:57:35 +00:00
|
|
|
if (sk->version < 4) {
|
2001-05-29 06:58:58 +00:00
|
|
|
log_info (_("NOTE: creating subkeys for v3 keys "
|
|
|
|
"is not OpenPGP compliant\n"));
|
2002-04-20 11:57:35 +00:00
|
|
|
goto leave;
|
|
|
|
}
|
1999-01-12 10:20:24 +00:00
|
|
|
|
1998-05-26 13:38:00 +00:00
|
|
|
/* unprotect to get the passphrase */
|
1998-06-29 12:30:57 +00:00
|
|
|
switch( is_secret_key_protected( sk ) ) {
|
1998-05-26 13:38:00 +00:00
|
|
|
case -1:
|
|
|
|
rc = G10ERR_PUBKEY_ALGO;
|
|
|
|
break;
|
|
|
|
case 0:
|
|
|
|
tty_printf("This key is not protected.\n");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
tty_printf("Key is protected.\n");
|
1998-09-11 05:47:32 +00:00
|
|
|
rc = check_secret_key( sk, 0 );
|
1998-05-26 13:38:00 +00:00
|
|
|
if( !rc )
|
|
|
|
passphrase = get_last_passphrase();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if( rc )
|
|
|
|
goto leave;
|
|
|
|
|
|
|
|
|
2001-09-09 16:09:19 +00:00
|
|
|
algo = ask_algo( 1, &use );
|
1998-06-25 10:19:08 +00:00
|
|
|
assert(algo);
|
1998-05-26 13:38:00 +00:00
|
|
|
nbits = ask_keysize( algo );
|
2001-12-07 01:14:15 +00:00
|
|
|
expire = ask_expire_interval(0);
|
1998-11-27 11:42:49 +00:00
|
|
|
if( !cpr_enabled() && !cpr_get_answer_is_yes("keygen.sub.okay",
|
1998-08-08 19:27:00 +00:00
|
|
|
_("Really create? ") ) )
|
1998-07-29 19:35:05 +00:00
|
|
|
goto leave;
|
1998-05-26 13:38:00 +00:00
|
|
|
|
|
|
|
if( passphrase ) {
|
|
|
|
s2k = m_alloc_secure( sizeof *s2k );
|
1998-09-28 19:25:31 +00:00
|
|
|
s2k->mode = opt.s2k_mode;
|
|
|
|
s2k->hash_algo = opt.s2k_digest_algo;
|
1998-05-26 13:38:00 +00:00
|
|
|
set_next_passphrase( passphrase );
|
2002-01-20 18:33:04 +00:00
|
|
|
dek = passphrase_to_dek( NULL, 0, opt.s2k_cipher_algo, s2k, 2, NULL );
|
1998-05-26 13:38:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
rc = do_create( algo, nbits, pub_keyblock, sec_keyblock,
|
2000-03-08 17:42:19 +00:00
|
|
|
dek, s2k, NULL, expire );
|
1998-05-26 13:38:00 +00:00
|
|
|
if( !rc )
|
2001-09-09 16:09:19 +00:00
|
|
|
rc = write_keybinding(pub_keyblock, pub_keyblock, sk, use);
|
1998-05-26 13:38:00 +00:00
|
|
|
if( !rc )
|
2001-09-09 16:09:19 +00:00
|
|
|
rc = write_keybinding(sec_keyblock, pub_keyblock, sk, use);
|
2001-01-03 13:36:03 +00:00
|
|
|
if( !rc ) {
|
1998-07-29 19:35:05 +00:00
|
|
|
okay = 1;
|
2001-01-03 13:36:03 +00:00
|
|
|
write_status_text (STATUS_KEY_CREATED, "S");
|
|
|
|
}
|
1998-05-26 13:38:00 +00:00
|
|
|
|
|
|
|
leave:
|
|
|
|
if( rc )
|
1998-07-29 19:35:05 +00:00
|
|
|
log_error(_("Key generation failed: %s\n"), g10_errstr(rc) );
|
1998-05-26 13:38:00 +00:00
|
|
|
m_free( passphrase );
|
|
|
|
m_free( dek );
|
|
|
|
m_free( s2k );
|
1998-06-29 12:30:57 +00:00
|
|
|
if( sk ) /* release the copy of the (now unprotected) secret key */
|
|
|
|
free_secret_key(sk);
|
1998-05-26 13:38:00 +00:00
|
|
|
set_next_passphrase( NULL );
|
1998-07-29 19:35:05 +00:00
|
|
|
return okay;
|
1998-05-05 20:34:20 +00:00
|
|
|
}
|
|
|
|
|
2000-03-09 14:23:16 +00:00
|
|
|
/****************
|
|
|
|
* Write a keyblock to an output stream
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
write_keyblock( IOBUF out, KBNODE node )
|
|
|
|
{
|
|
|
|
for( ; node ; node = node->next ) {
|
|
|
|
int rc = build_packet( out, node->pkt );
|
|
|
|
if( rc ) {
|
|
|
|
log_error("build_packet(%d) failed: %s\n",
|
|
|
|
node->pkt->pkttype, g10_errstr(rc) );
|
|
|
|
return G10ERR_WRITE_FILE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|