mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
469dc1043d
* query.c (agent_askpin): Use the callback to check for a correct PIN. Removed the start_err_text argument becuase it is not anymore needed; changed callers. * findkey.c (unprotect): Replace our own check loop by a callback. (try_unprotect_cb): New. * genkey.c (reenter_compare_cb): New. (agent_genkey): Use this callback here. Fixed setting of the pi2 variable and a segv in case of an empty PIN. * divert-scd.c (getpin_cb): Removed some unused stuff and explained what we still have to change.
201 lines
5.1 KiB
C
201 lines
5.1 KiB
C
/* pksign.c - Generate a keypair
|
|
* Copyright (C) 2002 Free Software Foundation, Inc.
|
|
*
|
|
* This file is part of GnuPG.
|
|
*
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
* 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.
|
|
*
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
* 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 <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <ctype.h>
|
|
#include <assert.h>
|
|
|
|
#include "agent.h"
|
|
|
|
|
|
static int
|
|
store_key (GCRY_SEXP private, const char *passphrase)
|
|
{
|
|
int rc;
|
|
char *buf;
|
|
size_t len;
|
|
unsigned char grip[20];
|
|
|
|
if ( !gcry_pk_get_keygrip (private, grip) )
|
|
{
|
|
log_error ("can't calculate keygrip\n");
|
|
return seterr (General_Error);
|
|
}
|
|
|
|
len = gcry_sexp_sprint (private, GCRYSEXP_FMT_CANON, NULL, 0);
|
|
assert (len);
|
|
buf = gcry_malloc_secure (len);
|
|
if (!buf)
|
|
return seterr (Out_Of_Core);
|
|
len = gcry_sexp_sprint (private, GCRYSEXP_FMT_CANON, buf, len);
|
|
assert (len);
|
|
|
|
if (passphrase)
|
|
{
|
|
unsigned char *p;
|
|
|
|
rc = agent_protect (buf, passphrase, &p, &len);
|
|
if (rc)
|
|
{
|
|
xfree (buf);
|
|
return rc;
|
|
}
|
|
xfree (buf);
|
|
buf = p;
|
|
}
|
|
|
|
rc = agent_write_private_key (grip, buf, len, 0);
|
|
xfree (buf);
|
|
return rc;
|
|
}
|
|
|
|
/* Callback function to compare the first entered PIN with the one
|
|
currently beeing entered. */
|
|
static int
|
|
reenter_compare_cb (struct pin_entry_info_s *pi)
|
|
{
|
|
const char *pin1 = pi->check_cb_arg;
|
|
|
|
if (!strcmp (pin1, pi->pin))
|
|
return 0; /* okay */
|
|
pi->cb_errtext = trans ("does not match - try again");
|
|
return -1;
|
|
}
|
|
|
|
|
|
|
|
/* Generate a new keypair according to the parameters given in
|
|
KEYPARAM */
|
|
int
|
|
agent_genkey (CTRL ctrl, const char *keyparam, size_t keyparamlen,
|
|
FILE *outfp)
|
|
{
|
|
GCRY_SEXP s_keyparam, s_key, s_private, s_public;
|
|
struct pin_entry_info_s *pi, *pi2;
|
|
int rc;
|
|
size_t len;
|
|
char *buf;
|
|
|
|
rc = gcry_sexp_sscan (&s_keyparam, NULL, keyparam, keyparamlen);
|
|
if (rc)
|
|
{
|
|
log_error ("failed to convert keyparam: %s\n", gcry_strerror (rc));
|
|
return seterr (Invalid_Data);
|
|
}
|
|
|
|
/* Get the passphrase now, cause key generation may take a while. */
|
|
{
|
|
const char *text1 = trans ("Please enter the passphrase to%0A"
|
|
"to protect your new key");
|
|
const char *text2 = trans ("Please re-enter this passphrase");
|
|
|
|
pi = gcry_calloc_secure (2, sizeof (*pi) + 100);
|
|
pi2 = pi + (sizeof *pi + 100);
|
|
pi->max_length = 100;
|
|
pi->max_tries = 3;
|
|
pi2->max_length = 100;
|
|
pi2->max_tries = 3;
|
|
pi2->check_cb = reenter_compare_cb;
|
|
pi2->check_cb_arg = pi->pin;
|
|
|
|
rc = agent_askpin (text1, pi);
|
|
if (!rc)
|
|
rc = agent_askpin (text2, pi2);
|
|
if (rc)
|
|
return rc;
|
|
if (!*pi->pin)
|
|
{
|
|
xfree (pi);
|
|
pi = NULL; /* User does not want a passphrase. */
|
|
}
|
|
}
|
|
|
|
rc = gcry_pk_genkey (&s_key, s_keyparam );
|
|
gcry_sexp_release (s_keyparam);
|
|
if (rc)
|
|
{
|
|
log_error ("key generation failed: %s\n", gcry_strerror (rc));
|
|
xfree (pi);
|
|
return map_gcry_err (rc);
|
|
}
|
|
|
|
/* break out the parts */
|
|
s_private = gcry_sexp_find_token (s_key, "private-key", 0);
|
|
if (!s_private)
|
|
{
|
|
log_error ("key generation failed: invalid return value\n");
|
|
gcry_sexp_release (s_key);
|
|
xfree (pi);
|
|
return seterr (Invalid_Data);
|
|
}
|
|
s_public = gcry_sexp_find_token (s_key, "public-key", 0);
|
|
if (!s_public)
|
|
{
|
|
log_error ("key generation failed: invalid return value\n");
|
|
gcry_sexp_release (s_private);
|
|
gcry_sexp_release (s_key);
|
|
xfree (pi);
|
|
return seterr (Invalid_Data);
|
|
}
|
|
gcry_sexp_release (s_key); s_key = NULL;
|
|
|
|
/* store the secret key */
|
|
log_debug ("storing private key\n");
|
|
rc = store_key (s_private, pi? pi->pin:NULL);
|
|
xfree (pi); pi = NULL;
|
|
gcry_sexp_release (s_private);
|
|
if (rc)
|
|
{
|
|
gcry_sexp_release (s_public);
|
|
return rc;
|
|
}
|
|
|
|
/* return the public key */
|
|
log_debug ("returning public key\n");
|
|
len = gcry_sexp_sprint (s_public, GCRYSEXP_FMT_CANON, NULL, 0);
|
|
assert (len);
|
|
buf = xmalloc (len);
|
|
if (!buf)
|
|
{
|
|
gcry_sexp_release (s_private);
|
|
gcry_sexp_release (s_public);
|
|
return seterr (Out_Of_Core);
|
|
}
|
|
len = gcry_sexp_sprint (s_public, GCRYSEXP_FMT_CANON, buf, len);
|
|
assert (len);
|
|
if (fwrite (buf, len, 1, outfp) != 1)
|
|
{
|
|
log_error ("error writing public key: %s\n", strerror (errno));
|
|
gcry_sexp_release (s_private);
|
|
gcry_sexp_release (s_public);
|
|
xfree (buf);
|
|
return seterr (File_Create_Error);
|
|
}
|
|
gcry_sexp_release (s_public);
|
|
xfree (buf);
|
|
|
|
return 0;
|
|
}
|
|
|