1999-10-27 03:42:43 +00:00
|
|
|
/*
|
1999-11-24 13:26:21 +00:00
|
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
|
|
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
|
|
* All rights reserved
|
|
|
|
* Identity and host key generation and maintenance.
|
2000-09-16 02:29:08 +00:00
|
|
|
*
|
|
|
|
* As far as I am concerned, the code I have written for this software
|
|
|
|
* can be used freely for any purpose. Any derived versions of this
|
|
|
|
* software must be clearly marked as such, and if the derived work is
|
|
|
|
* incompatible with the protocol description in the RFC file, it must be
|
|
|
|
* called by a name other than "ssh" or "Secure Shell".
|
1999-11-24 13:26:21 +00:00
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "includes.h"
|
2001-12-06 18:00:18 +00:00
|
|
|
RCSID("$OpenBSD: ssh-keygen.c,v 1.85 2001/12/05 10:06:12 deraadt Exp $");
|
2000-04-29 13:57:08 +00:00
|
|
|
|
|
|
|
#include <openssl/evp.h>
|
|
|
|
#include <openssl/pem.h>
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "xmalloc.h"
|
2000-04-29 13:57:08 +00:00
|
|
|
#include "key.h"
|
2001-03-29 00:29:54 +00:00
|
|
|
#include "rsa.h"
|
2000-04-29 13:57:08 +00:00
|
|
|
#include "authfile.h"
|
|
|
|
#include "uuencode.h"
|
2000-10-14 05:23:11 +00:00
|
|
|
#include "buffer.h"
|
|
|
|
#include "bufaux.h"
|
2001-01-22 05:34:40 +00:00
|
|
|
#include "pathnames.h"
|
|
|
|
#include "log.h"
|
|
|
|
#include "readpass.h"
|
2000-10-14 05:23:11 +00:00
|
|
|
|
2001-08-06 21:44:05 +00:00
|
|
|
#ifdef SMARTCARD
|
|
|
|
#include <sectok.h>
|
|
|
|
#include <openssl/engine.h>
|
|
|
|
#include "scard.h"
|
2001-08-06 21:59:25 +00:00
|
|
|
#endif
|
2001-07-04 03:44:03 +00:00
|
|
|
|
2000-04-29 13:57:08 +00:00
|
|
|
/* Number of bits in the RSA/DSA key. This value can be changed on the command line. */
|
1999-10-27 03:42:43 +00:00
|
|
|
int bits = 1024;
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Flag indicating that we just want to change the passphrase. This can be
|
|
|
|
* set on the command line.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
int change_passphrase = 0;
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Flag indicating that we just want to change the comment. This can be set
|
|
|
|
* on the command line.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
int change_comment = 0;
|
|
|
|
|
|
|
|
int quiet = 0;
|
|
|
|
|
1999-11-17 06:29:08 +00:00
|
|
|
/* Flag indicating that we just want to see the key fingerprint */
|
|
|
|
int print_fingerprint = 0;
|
2001-03-12 03:02:17 +00:00
|
|
|
int print_bubblebabble = 0;
|
1999-11-17 06:29:08 +00:00
|
|
|
|
1999-11-21 07:31:57 +00:00
|
|
|
/* The identity file name, given on the command line or entered by the user. */
|
|
|
|
char identity_file[1024];
|
|
|
|
int have_identity = 0;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
/* This is set to the passphrase if given on the command line. */
|
|
|
|
char *identity_passphrase = NULL;
|
|
|
|
|
|
|
|
/* This is set to the new passphrase if given on the command line. */
|
|
|
|
char *identity_new_passphrase = NULL;
|
|
|
|
|
|
|
|
/* This is set to the new comment if given on the command line. */
|
|
|
|
char *identity_comment = NULL;
|
|
|
|
|
2000-04-29 13:57:08 +00:00
|
|
|
/* Dump public key file in format used by real and the original SSH 2 */
|
|
|
|
int convert_to_ssh2 = 0;
|
|
|
|
int convert_from_ssh2 = 0;
|
|
|
|
int print_public = 0;
|
2000-11-13 11:57:25 +00:00
|
|
|
|
2000-11-29 01:18:44 +00:00
|
|
|
/* default to RSA for SSH-1 */
|
|
|
|
char *key_type_name = "rsa1";
|
2000-04-29 13:57:08 +00:00
|
|
|
|
1999-11-21 07:31:57 +00:00
|
|
|
/* argv0 */
|
1999-11-24 13:26:21 +00:00
|
|
|
#ifdef HAVE___PROGNAME
|
1999-11-21 07:31:57 +00:00
|
|
|
extern char *__progname;
|
2000-11-17 03:47:20 +00:00
|
|
|
#else
|
|
|
|
char *__progname;
|
|
|
|
#endif
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-29 13:57:08 +00:00
|
|
|
char hostname[MAXHOSTNAMELEN];
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
1999-11-21 07:31:57 +00:00
|
|
|
ask_filename(struct passwd *pw, const char *prompt)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
char buf[1024];
|
2000-11-29 01:18:44 +00:00
|
|
|
char *name = NULL;
|
|
|
|
|
|
|
|
switch (key_type_from_name(key_type_name)) {
|
|
|
|
case KEY_RSA1:
|
2001-01-22 05:34:40 +00:00
|
|
|
name = _PATH_SSH_CLIENT_IDENTITY;
|
2000-11-29 01:18:44 +00:00
|
|
|
break;
|
|
|
|
case KEY_DSA:
|
2001-01-22 05:34:40 +00:00
|
|
|
name = _PATH_SSH_CLIENT_ID_DSA;
|
2000-11-29 01:18:44 +00:00
|
|
|
break;
|
|
|
|
case KEY_RSA:
|
2001-01-22 05:34:40 +00:00
|
|
|
name = _PATH_SSH_CLIENT_ID_RSA;
|
2000-11-29 01:18:44 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
fprintf(stderr, "bad key type");
|
|
|
|
exit(1);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name);
|
2000-12-22 20:27:43 +00:00
|
|
|
fprintf(stderr, "%s (%s): ", prompt, identity_file);
|
|
|
|
fflush(stderr);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (fgets(buf, sizeof(buf), stdin) == NULL)
|
|
|
|
exit(1);
|
|
|
|
if (strchr(buf, '\n'))
|
|
|
|
*strchr(buf, '\n') = 0;
|
|
|
|
if (strcmp(buf, "") != 0)
|
|
|
|
strlcpy(identity_file, buf, sizeof(identity_file));
|
|
|
|
have_identity = 1;
|
1999-11-17 06:29:08 +00:00
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static Key *
|
2001-06-05 20:35:09 +00:00
|
|
|
load_identity(char *filename)
|
2000-04-29 13:57:08 +00:00
|
|
|
{
|
2001-03-26 13:44:06 +00:00
|
|
|
char *pass;
|
|
|
|
Key *prv;
|
|
|
|
|
2001-04-05 23:26:32 +00:00
|
|
|
prv = key_load_private(filename, "", NULL);
|
2001-03-26 13:44:06 +00:00
|
|
|
if (prv == NULL) {
|
2001-06-05 20:35:09 +00:00
|
|
|
if (identity_passphrase)
|
|
|
|
pass = xstrdup(identity_passphrase);
|
|
|
|
else
|
2001-06-25 05:20:31 +00:00
|
|
|
pass = read_passphrase("Enter passphrase: ",
|
|
|
|
RP_ALLOW_STDIN);
|
2001-03-26 13:44:06 +00:00
|
|
|
prv = key_load_private(filename, pass, NULL);
|
2000-04-29 13:57:08 +00:00
|
|
|
memset(pass, 0, strlen(pass));
|
|
|
|
xfree(pass);
|
|
|
|
}
|
2001-03-26 13:44:06 +00:00
|
|
|
return prv;
|
2000-04-29 13:57:08 +00:00
|
|
|
}
|
|
|
|
|
2000-10-14 05:23:11 +00:00
|
|
|
#define SSH_COM_PUBLIC_BEGIN "---- BEGIN SSH2 PUBLIC KEY ----"
|
|
|
|
#define SSH_COM_PUBLIC_END "---- END SSH2 PUBLIC KEY ----"
|
|
|
|
#define SSH_COM_PRIVATE_BEGIN "---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----"
|
2001-02-05 12:42:17 +00:00
|
|
|
#define SSH_COM_PRIVATE_KEY_MAGIC 0x3f6ff9eb
|
2000-04-29 13:57:08 +00:00
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2000-04-29 13:57:08 +00:00
|
|
|
do_convert_to_ssh2(struct passwd *pw)
|
|
|
|
{
|
2001-04-24 16:56:58 +00:00
|
|
|
Key *k;
|
2000-04-29 13:57:08 +00:00
|
|
|
int len;
|
2000-12-22 01:43:59 +00:00
|
|
|
u_char *blob;
|
2000-04-29 13:57:08 +00:00
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
if (!have_identity)
|
|
|
|
ask_filename(pw, "Enter file in which the key is");
|
|
|
|
if (stat(identity_file, &st) < 0) {
|
|
|
|
perror(identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
2001-04-24 16:56:58 +00:00
|
|
|
if ((k = key_load_public(identity_file, NULL)) == NULL) {
|
2001-06-05 20:35:09 +00:00
|
|
|
if ((k = load_identity(identity_file)) == NULL) {
|
2001-04-24 16:56:58 +00:00
|
|
|
fprintf(stderr, "load failed\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2000-04-29 13:57:08 +00:00
|
|
|
}
|
2001-09-18 05:49:14 +00:00
|
|
|
if (key_to_blob(k, &blob, &len) <= 0) {
|
|
|
|
fprintf(stderr, "key_to_blob failed\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2000-10-14 05:23:11 +00:00
|
|
|
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN);
|
2000-04-29 13:57:08 +00:00
|
|
|
fprintf(stdout,
|
2000-10-14 05:23:11 +00:00
|
|
|
"Comment: \"%d-bit %s, converted from OpenSSH by %s@%s\"\n",
|
2001-04-24 16:56:58 +00:00
|
|
|
key_size(k), key_type(k),
|
2000-04-29 13:57:08 +00:00
|
|
|
pw->pw_name, hostname);
|
|
|
|
dump_base64(stdout, blob, len);
|
2000-10-14 05:23:11 +00:00
|
|
|
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_END);
|
2001-04-24 16:56:58 +00:00
|
|
|
key_free(k);
|
2000-04-29 13:57:08 +00:00
|
|
|
xfree(blob);
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2000-10-14 05:23:11 +00:00
|
|
|
buffer_get_bignum_bits(Buffer *b, BIGNUM *value)
|
|
|
|
{
|
|
|
|
int bits = buffer_get_int(b);
|
|
|
|
int bytes = (bits + 7) / 8;
|
2001-03-29 00:29:54 +00:00
|
|
|
|
2000-10-14 05:23:11 +00:00
|
|
|
if (buffer_len(b) < bytes)
|
2001-03-29 00:29:54 +00:00
|
|
|
fatal("buffer_get_bignum_bits: input buffer too small: "
|
|
|
|
"need %d have %d", bytes, buffer_len(b));
|
2000-12-22 01:43:59 +00:00
|
|
|
BN_bin2bn((u_char *)buffer_ptr(b), bytes, value);
|
2000-10-14 05:23:11 +00:00
|
|
|
buffer_consume(b, bytes);
|
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static Key *
|
2001-09-18 05:41:19 +00:00
|
|
|
do_convert_private_ssh2_from_blob(u_char *blob, int blen)
|
2000-10-14 05:23:11 +00:00
|
|
|
{
|
|
|
|
Buffer b;
|
|
|
|
Key *key = NULL;
|
2001-06-25 05:04:58 +00:00
|
|
|
char *type, *cipher;
|
2001-07-04 05:05:27 +00:00
|
|
|
u_char *sig, data[] = "abcde12345";
|
2001-06-25 04:47:54 +00:00
|
|
|
int magic, rlen, ktype, i1, i2, i3, i4;
|
2001-06-25 05:04:58 +00:00
|
|
|
u_int slen;
|
2001-06-25 04:47:54 +00:00
|
|
|
u_long e;
|
2000-10-14 05:23:11 +00:00
|
|
|
|
|
|
|
buffer_init(&b);
|
|
|
|
buffer_append(&b, blob, blen);
|
|
|
|
|
|
|
|
magic = buffer_get_int(&b);
|
|
|
|
if (magic != SSH_COM_PRIVATE_KEY_MAGIC) {
|
|
|
|
error("bad magic 0x%x != 0x%x", magic, SSH_COM_PRIVATE_KEY_MAGIC);
|
|
|
|
buffer_free(&b);
|
|
|
|
return NULL;
|
|
|
|
}
|
2001-06-25 04:47:54 +00:00
|
|
|
i1 = buffer_get_int(&b);
|
2000-10-14 05:23:11 +00:00
|
|
|
type = buffer_get_string(&b, NULL);
|
|
|
|
cipher = buffer_get_string(&b, NULL);
|
2001-06-25 04:47:54 +00:00
|
|
|
i2 = buffer_get_int(&b);
|
|
|
|
i3 = buffer_get_int(&b);
|
|
|
|
i4 = buffer_get_int(&b);
|
|
|
|
debug("ignore (%d %d %d %d)", i1,i2,i3,i4);
|
2000-10-14 05:23:11 +00:00
|
|
|
if (strcmp(cipher, "none") != 0) {
|
|
|
|
error("unsupported cipher %s", cipher);
|
|
|
|
xfree(cipher);
|
|
|
|
buffer_free(&b);
|
2001-03-29 00:29:54 +00:00
|
|
|
xfree(type);
|
2000-10-14 05:23:11 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
xfree(cipher);
|
|
|
|
|
2001-03-29 00:29:54 +00:00
|
|
|
if (strstr(type, "dsa")) {
|
|
|
|
ktype = KEY_DSA;
|
|
|
|
} else if (strstr(type, "rsa")) {
|
|
|
|
ktype = KEY_RSA;
|
|
|
|
} else {
|
|
|
|
xfree(type);
|
2000-10-14 05:23:11 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2001-03-29 00:29:54 +00:00
|
|
|
key = key_new_private(ktype);
|
|
|
|
xfree(type);
|
|
|
|
|
|
|
|
switch (key->type) {
|
|
|
|
case KEY_DSA:
|
|
|
|
buffer_get_bignum_bits(&b, key->dsa->p);
|
|
|
|
buffer_get_bignum_bits(&b, key->dsa->g);
|
|
|
|
buffer_get_bignum_bits(&b, key->dsa->q);
|
|
|
|
buffer_get_bignum_bits(&b, key->dsa->pub_key);
|
|
|
|
buffer_get_bignum_bits(&b, key->dsa->priv_key);
|
|
|
|
break;
|
|
|
|
case KEY_RSA:
|
2001-06-25 04:47:54 +00:00
|
|
|
e = buffer_get_char(&b);
|
|
|
|
debug("e %lx", e);
|
|
|
|
if (e < 30) {
|
|
|
|
e <<= 8;
|
|
|
|
e += buffer_get_char(&b);
|
|
|
|
debug("e %lx", e);
|
|
|
|
e <<= 8;
|
|
|
|
e += buffer_get_char(&b);
|
|
|
|
debug("e %lx", e);
|
|
|
|
}
|
|
|
|
if (!BN_set_word(key->rsa->e, e)) {
|
2001-03-29 00:29:54 +00:00
|
|
|
buffer_free(&b);
|
|
|
|
key_free(key);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
buffer_get_bignum_bits(&b, key->rsa->d);
|
|
|
|
buffer_get_bignum_bits(&b, key->rsa->n);
|
|
|
|
buffer_get_bignum_bits(&b, key->rsa->iqmp);
|
|
|
|
buffer_get_bignum_bits(&b, key->rsa->q);
|
|
|
|
buffer_get_bignum_bits(&b, key->rsa->p);
|
2001-07-04 05:02:23 +00:00
|
|
|
rsa_generate_additional_parameters(key->rsa);
|
2001-03-29 00:29:54 +00:00
|
|
|
break;
|
|
|
|
}
|
2000-10-14 05:23:11 +00:00
|
|
|
rlen = buffer_len(&b);
|
2001-12-06 18:00:18 +00:00
|
|
|
if (rlen != 0)
|
2001-03-29 00:29:54 +00:00
|
|
|
error("do_convert_private_ssh2_from_blob: "
|
|
|
|
"remaining bytes in key blob %d", rlen);
|
2000-10-14 05:23:11 +00:00
|
|
|
buffer_free(&b);
|
2001-06-25 05:04:58 +00:00
|
|
|
|
|
|
|
/* try the key */
|
|
|
|
key_sign(key, &sig, &slen, data, sizeof(data));
|
|
|
|
key_verify(key, sig, slen, data, sizeof(data));
|
|
|
|
xfree(sig);
|
2000-10-14 05:23:11 +00:00
|
|
|
return key;
|
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2000-04-29 13:57:08 +00:00
|
|
|
do_convert_from_ssh2(struct passwd *pw)
|
|
|
|
{
|
|
|
|
Key *k;
|
|
|
|
int blen;
|
|
|
|
char line[1024], *p;
|
2001-09-18 05:41:19 +00:00
|
|
|
u_char blob[8096];
|
2000-04-29 13:57:08 +00:00
|
|
|
char encoded[8096];
|
|
|
|
struct stat st;
|
2000-10-14 05:23:11 +00:00
|
|
|
int escaped = 0, private = 0, ok;
|
2000-04-29 13:57:08 +00:00
|
|
|
FILE *fp;
|
|
|
|
|
|
|
|
if (!have_identity)
|
|
|
|
ask_filename(pw, "Enter file in which the key is");
|
|
|
|
if (stat(identity_file, &st) < 0) {
|
|
|
|
perror(identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
fp = fopen(identity_file, "r");
|
|
|
|
if (fp == NULL) {
|
|
|
|
perror(identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
encoded[0] = '\0';
|
|
|
|
while (fgets(line, sizeof(line), fp)) {
|
2000-05-09 01:02:59 +00:00
|
|
|
if (!(p = strchr(line, '\n'))) {
|
|
|
|
fprintf(stderr, "input line too long.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (p > line && p[-1] == '\\')
|
|
|
|
escaped++;
|
2000-04-29 13:57:08 +00:00
|
|
|
if (strncmp(line, "----", 4) == 0 ||
|
|
|
|
strstr(line, ": ") != NULL) {
|
2000-10-14 05:23:11 +00:00
|
|
|
if (strstr(line, SSH_COM_PRIVATE_BEGIN) != NULL)
|
|
|
|
private = 1;
|
2001-06-25 05:04:58 +00:00
|
|
|
if (strstr(line, " END ") != NULL) {
|
|
|
|
break;
|
|
|
|
}
|
2001-04-24 16:59:28 +00:00
|
|
|
/* fprintf(stderr, "ignore: %s", line); */
|
2000-04-29 13:57:08 +00:00
|
|
|
continue;
|
|
|
|
}
|
2000-05-09 01:02:59 +00:00
|
|
|
if (escaped) {
|
|
|
|
escaped--;
|
2001-04-24 16:59:28 +00:00
|
|
|
/* fprintf(stderr, "escaped: %s", line); */
|
2000-05-09 01:02:59 +00:00
|
|
|
continue;
|
2000-04-29 13:57:08 +00:00
|
|
|
}
|
|
|
|
*p = '\0';
|
|
|
|
strlcat(encoded, line, sizeof(encoded));
|
|
|
|
}
|
2000-12-22 01:43:59 +00:00
|
|
|
blen = uudecode(encoded, (u_char *)blob, sizeof(blob));
|
2000-04-29 13:57:08 +00:00
|
|
|
if (blen < 0) {
|
|
|
|
fprintf(stderr, "uudecode failed.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2000-10-14 05:23:11 +00:00
|
|
|
k = private ?
|
|
|
|
do_convert_private_ssh2_from_blob(blob, blen) :
|
2000-11-13 11:57:25 +00:00
|
|
|
key_from_blob(blob, blen);
|
2000-10-14 05:23:11 +00:00
|
|
|
if (k == NULL) {
|
|
|
|
fprintf(stderr, "decode blob failed.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
ok = private ?
|
2001-03-29 00:29:54 +00:00
|
|
|
(k->type == KEY_DSA ?
|
|
|
|
PEM_write_DSAPrivateKey(stdout, k->dsa, NULL, NULL, 0, NULL, NULL) :
|
|
|
|
PEM_write_RSAPrivateKey(stdout, k->rsa, NULL, NULL, 0, NULL, NULL)) :
|
2000-10-14 05:23:11 +00:00
|
|
|
key_write(k, stdout);
|
|
|
|
if (!ok) {
|
|
|
|
fprintf(stderr, "key write failed");
|
|
|
|
exit(1);
|
|
|
|
}
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(k);
|
|
|
|
fprintf(stdout, "\n");
|
|
|
|
fclose(fp);
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2000-04-29 13:57:08 +00:00
|
|
|
do_print_public(struct passwd *pw)
|
|
|
|
{
|
2001-03-26 13:44:06 +00:00
|
|
|
Key *prv;
|
2000-04-29 13:57:08 +00:00
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
if (!have_identity)
|
|
|
|
ask_filename(pw, "Enter file in which the key is");
|
|
|
|
if (stat(identity_file, &st) < 0) {
|
|
|
|
perror(identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
2001-06-05 20:35:09 +00:00
|
|
|
prv = load_identity(identity_file);
|
2001-03-26 13:44:06 +00:00
|
|
|
if (prv == NULL) {
|
2000-04-29 13:57:08 +00:00
|
|
|
fprintf(stderr, "load failed\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2001-03-26 13:44:06 +00:00
|
|
|
if (!key_write(prv, stdout))
|
2000-04-29 13:57:08 +00:00
|
|
|
fprintf(stderr, "key_write failed");
|
2001-03-26 13:44:06 +00:00
|
|
|
key_free(prv);
|
2000-04-29 13:57:08 +00:00
|
|
|
fprintf(stdout, "\n");
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
2001-08-06 21:40:04 +00:00
|
|
|
#ifdef SMARTCARD
|
2001-07-04 03:44:03 +00:00
|
|
|
#define NUM_RSA_KEY_ELEMENTS 5+1
|
|
|
|
#define COPY_RSA_KEY(x, i) \
|
|
|
|
do { \
|
|
|
|
len = BN_num_bytes(prv->rsa->x); \
|
|
|
|
elements[i] = xmalloc(len); \
|
2001-07-04 05:06:59 +00:00
|
|
|
debug("#bytes %d", len); \
|
2001-07-04 03:44:03 +00:00
|
|
|
if (BN_bn2bin(prv->rsa->x, elements[i]) < 0) \
|
|
|
|
goto done; \
|
2001-12-06 18:00:18 +00:00
|
|
|
} while (0)
|
2001-07-04 03:44:03 +00:00
|
|
|
|
2001-08-06 21:40:04 +00:00
|
|
|
static int
|
|
|
|
get_AUT0(char *aut0)
|
|
|
|
{
|
|
|
|
EVP_MD *evp_md = EVP_sha1();
|
|
|
|
EVP_MD_CTX md;
|
|
|
|
char *pass;
|
|
|
|
|
|
|
|
pass = read_passphrase("Enter passphrase for smartcard: ", RP_ALLOW_STDIN);
|
|
|
|
if (pass == NULL)
|
|
|
|
return -1;
|
|
|
|
EVP_DigestInit(&md, evp_md);
|
|
|
|
EVP_DigestUpdate(&md, pass, strlen(pass));
|
|
|
|
EVP_DigestFinal(&md, aut0, NULL);
|
|
|
|
memset(pass, 0, strlen(pass));
|
|
|
|
xfree(pass);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-07-04 03:44:03 +00:00
|
|
|
static void
|
2001-08-06 21:44:05 +00:00
|
|
|
do_upload(struct passwd *pw, const char *sc_reader_id)
|
2001-07-04 03:44:03 +00:00
|
|
|
{
|
|
|
|
Key *prv = NULL;
|
|
|
|
struct stat st;
|
|
|
|
u_char *elements[NUM_RSA_KEY_ELEMENTS];
|
|
|
|
u_char key_fid[2];
|
2001-08-06 21:40:04 +00:00
|
|
|
u_char DEFAUT0[] = {0xad, 0x9f, 0x61, 0xfe, 0xfa, 0x20, 0xce, 0x63};
|
|
|
|
u_char AUT0[EVP_MAX_MD_SIZE];
|
2001-07-04 03:44:03 +00:00
|
|
|
int len, status = 1, i, fd = -1, ret;
|
2001-07-04 05:24:27 +00:00
|
|
|
int sw = 0, cla = 0x00;
|
2001-07-04 03:44:03 +00:00
|
|
|
|
2001-07-04 05:08:39 +00:00
|
|
|
for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++)
|
|
|
|
elements[i] = NULL;
|
2001-07-04 03:44:03 +00:00
|
|
|
if (!have_identity)
|
|
|
|
ask_filename(pw, "Enter file in which the key is");
|
|
|
|
if (stat(identity_file, &st) < 0) {
|
|
|
|
perror(identity_file);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
prv = load_identity(identity_file);
|
|
|
|
if (prv == NULL) {
|
|
|
|
error("load failed");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
COPY_RSA_KEY(q, 0);
|
|
|
|
COPY_RSA_KEY(p, 1);
|
|
|
|
COPY_RSA_KEY(iqmp, 2);
|
|
|
|
COPY_RSA_KEY(dmq1, 3);
|
|
|
|
COPY_RSA_KEY(dmp1, 4);
|
|
|
|
COPY_RSA_KEY(n, 5);
|
|
|
|
len = BN_num_bytes(prv->rsa->n);
|
2001-08-06 21:44:05 +00:00
|
|
|
fd = sectok_friendly_open(sc_reader_id, STONOWAIT, &sw);
|
2001-07-04 05:24:27 +00:00
|
|
|
if (fd < 0) {
|
2001-08-06 21:44:05 +00:00
|
|
|
error("sectok_open failed: %s", sectok_get_sw(sw));
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
if (! sectok_cardpresent(fd)) {
|
|
|
|
error("smartcard in reader %s not present",
|
|
|
|
sc_reader_id);
|
2001-07-04 03:44:03 +00:00
|
|
|
goto done;
|
2001-07-04 05:24:27 +00:00
|
|
|
}
|
2001-08-06 21:10:52 +00:00
|
|
|
ret = sectok_reset(fd, 0, NULL, &sw);
|
2001-07-04 05:24:27 +00:00
|
|
|
if (ret <= 0) {
|
2001-08-06 21:44:05 +00:00
|
|
|
error("sectok_reset failed: %s", sectok_get_sw(sw));
|
2001-07-04 03:44:03 +00:00
|
|
|
goto done;
|
2001-07-04 05:24:27 +00:00
|
|
|
}
|
2001-07-04 05:00:11 +00:00
|
|
|
if ((cla = cyberflex_inq_class(fd)) < 0) {
|
|
|
|
error("cyberflex_inq_class failed");
|
|
|
|
goto done;
|
|
|
|
}
|
2001-08-06 21:40:04 +00:00
|
|
|
memcpy(AUT0, DEFAUT0, sizeof(DEFAUT0));
|
|
|
|
if (cyberflex_verify_AUT0(fd, cla, AUT0, sizeof(DEFAUT0)) < 0) {
|
|
|
|
if (get_AUT0(AUT0) < 0 ||
|
|
|
|
cyberflex_verify_AUT0(fd, cla, AUT0, sizeof(DEFAUT0)) < 0) {
|
|
|
|
error("cyberflex_verify_AUT0 failed");
|
|
|
|
goto done;
|
|
|
|
}
|
2001-07-04 03:44:03 +00:00
|
|
|
}
|
|
|
|
key_fid[0] = 0x00;
|
|
|
|
key_fid[1] = 0x12;
|
2001-07-04 05:06:59 +00:00
|
|
|
if (cyberflex_load_rsa_priv(fd, cla, key_fid, 5, 8*len, elements,
|
2001-07-04 05:24:27 +00:00
|
|
|
&sw) < 0) {
|
|
|
|
error("cyberflex_load_rsa_priv failed: %s", sectok_get_sw(sw));
|
2001-07-04 05:06:59 +00:00
|
|
|
goto done;
|
|
|
|
}
|
2001-07-04 05:24:27 +00:00
|
|
|
if (!sectok_swOK(sw))
|
2001-07-04 03:44:03 +00:00
|
|
|
goto done;
|
|
|
|
log("cyberflex_load_rsa_priv done");
|
|
|
|
key_fid[0] = 0x73;
|
|
|
|
key_fid[1] = 0x68;
|
2001-07-04 05:06:59 +00:00
|
|
|
if (cyberflex_load_rsa_pub(fd, cla, key_fid, len, elements[5],
|
2001-07-04 05:24:27 +00:00
|
|
|
&sw) < 0) {
|
|
|
|
error("cyberflex_load_rsa_pub failed: %s", sectok_get_sw(sw));
|
2001-07-04 05:06:59 +00:00
|
|
|
goto done;
|
|
|
|
}
|
2001-07-04 05:24:27 +00:00
|
|
|
if (!sectok_swOK(sw))
|
2001-07-04 03:44:03 +00:00
|
|
|
goto done;
|
|
|
|
log("cyberflex_load_rsa_pub done");
|
|
|
|
status = 0;
|
|
|
|
log("loading key done");
|
|
|
|
done:
|
2001-10-03 17:18:37 +00:00
|
|
|
|
|
|
|
memset(elements[0], '\0', BN_num_bytes(prv->rsa->q));
|
|
|
|
memset(elements[1], '\0', BN_num_bytes(prv->rsa->p));
|
|
|
|
memset(elements[2], '\0', BN_num_bytes(prv->rsa->iqmp));
|
|
|
|
memset(elements[3], '\0', BN_num_bytes(prv->rsa->dmq1));
|
|
|
|
memset(elements[4], '\0', BN_num_bytes(prv->rsa->dmp1));
|
|
|
|
memset(elements[5], '\0', BN_num_bytes(prv->rsa->n));
|
|
|
|
|
2001-07-04 03:44:03 +00:00
|
|
|
if (prv)
|
|
|
|
key_free(prv);
|
|
|
|
for (i = 0; i < NUM_RSA_KEY_ELEMENTS; i++)
|
2001-07-04 05:24:27 +00:00
|
|
|
if (elements[i])
|
|
|
|
xfree(elements[i]);
|
2001-07-04 03:44:03 +00:00
|
|
|
if (fd != -1)
|
2001-07-04 05:24:27 +00:00
|
|
|
sectok_close(fd);
|
2001-07-04 03:44:03 +00:00
|
|
|
exit(status);
|
|
|
|
}
|
2001-08-06 21:44:05 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
do_download(struct passwd *pw, const char *sc_reader_id)
|
|
|
|
{
|
|
|
|
Key *pub = NULL;
|
|
|
|
|
|
|
|
pub = sc_get_key(sc_reader_id);
|
|
|
|
if (pub == NULL)
|
|
|
|
fatal("cannot read public key from smartcard");
|
|
|
|
key_write(pub, stdout);
|
|
|
|
key_free(pub);
|
|
|
|
fprintf(stdout, "\n");
|
|
|
|
exit(0);
|
|
|
|
}
|
2001-08-06 21:57:31 +00:00
|
|
|
#endif /* SMARTCARD */
|
2001-07-04 03:44:03 +00:00
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
1999-11-17 06:29:08 +00:00
|
|
|
do_fingerprint(struct passwd *pw)
|
|
|
|
{
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 10:27:49 +00:00
|
|
|
FILE *f;
|
2000-04-29 13:57:08 +00:00
|
|
|
Key *public;
|
2001-03-12 03:02:17 +00:00
|
|
|
char *comment = NULL, *cp, *ep, line[16*1024], *fp;
|
2001-12-06 16:32:47 +00:00
|
|
|
int i, skip = 0, num = 1, invalid = 1;
|
|
|
|
enum fp_rep rep;
|
|
|
|
enum fp_type fptype;
|
1999-11-24 13:26:21 +00:00
|
|
|
struct stat st;
|
|
|
|
|
2001-03-26 13:44:06 +00:00
|
|
|
fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;
|
|
|
|
rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
|
2001-03-12 03:02:17 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
if (!have_identity)
|
|
|
|
ask_filename(pw, "Enter file in which the key is");
|
|
|
|
if (stat(identity_file, &st) < 0) {
|
|
|
|
perror(identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
2001-03-26 13:44:06 +00:00
|
|
|
public = key_load_public(identity_file, &comment);
|
|
|
|
if (public != NULL) {
|
|
|
|
fp = key_fingerprint(public, fptype, rep);
|
|
|
|
printf("%d %s %s\n", key_size(public), fp, comment);
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(public);
|
2000-11-13 11:57:25 +00:00
|
|
|
xfree(comment);
|
2001-03-12 03:02:17 +00:00
|
|
|
xfree(fp);
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 10:27:49 +00:00
|
|
|
exit(0);
|
|
|
|
}
|
2001-03-26 13:44:06 +00:00
|
|
|
if (comment)
|
|
|
|
xfree(comment);
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 10:27:49 +00:00
|
|
|
|
|
|
|
f = fopen(identity_file, "r");
|
|
|
|
if (f != NULL) {
|
|
|
|
while (fgets(line, sizeof(line), f)) {
|
|
|
|
i = strlen(line) - 1;
|
|
|
|
if (line[i] != '\n') {
|
|
|
|
error("line %d too long: %.40s...", num, line);
|
|
|
|
skip = 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
num++;
|
|
|
|
if (skip) {
|
|
|
|
skip = 0;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
line[i] = '\0';
|
|
|
|
|
|
|
|
/* Skip leading whitespace, empty and comment lines. */
|
|
|
|
for (cp = line; *cp == ' ' || *cp == '\t'; cp++)
|
|
|
|
;
|
|
|
|
if (!*cp || *cp == '\n' || *cp == '#')
|
|
|
|
continue ;
|
|
|
|
i = strtol(cp, &ep, 10);
|
|
|
|
if (i == 0 || ep == NULL || (*ep != ' ' && *ep != '\t')) {
|
|
|
|
int quoted = 0;
|
|
|
|
comment = cp;
|
|
|
|
for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) {
|
|
|
|
if (*cp == '\\' && cp[1] == '"')
|
|
|
|
cp++; /* Skip both */
|
|
|
|
else if (*cp == '"')
|
|
|
|
quoted = !quoted;
|
|
|
|
}
|
|
|
|
if (!*cp)
|
|
|
|
continue;
|
|
|
|
*cp++ = '\0';
|
|
|
|
}
|
|
|
|
ep = cp;
|
2000-12-29 16:50:13 +00:00
|
|
|
public = key_new(KEY_RSA1);
|
|
|
|
if (key_read(public, &cp) != 1) {
|
|
|
|
cp = ep;
|
|
|
|
key_free(public);
|
|
|
|
public = key_new(KEY_UNSPEC);
|
|
|
|
if (key_read(public, &cp) != 1) {
|
|
|
|
key_free(public);
|
|
|
|
continue;
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
2000-12-29 16:50:13 +00:00
|
|
|
comment = *cp ? cp : comment;
|
2001-03-26 13:44:06 +00:00
|
|
|
fp = key_fingerprint(public, fptype, rep);
|
2001-03-12 03:02:17 +00:00
|
|
|
printf("%d %s %s\n", key_size(public), fp,
|
2000-12-29 16:50:13 +00:00
|
|
|
comment ? comment : "no comment");
|
2001-03-12 03:02:17 +00:00
|
|
|
xfree(fp);
|
2001-03-26 13:44:06 +00:00
|
|
|
key_free(public);
|
2000-12-29 16:50:13 +00:00
|
|
|
invalid = 0;
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 10:27:49 +00:00
|
|
|
fclose(f);
|
|
|
|
}
|
|
|
|
if (invalid) {
|
2001-11-11 23:52:44 +00:00
|
|
|
printf("%s is not a public key file.\n", identity_file);
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 10:27:49 +00:00
|
|
|
exit(1);
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
exit(0);
|
1999-11-17 06:29:08 +00:00
|
|
|
}
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/*
|
|
|
|
* Perform changing a passphrase. The argument is the passwd structure
|
|
|
|
* for the current user.
|
|
|
|
*/
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
1999-11-17 06:29:08 +00:00
|
|
|
do_change_passphrase(struct passwd *pw)
|
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
char *comment;
|
|
|
|
char *old_passphrase, *passphrase1, *passphrase2;
|
|
|
|
struct stat st;
|
2000-04-29 13:57:08 +00:00
|
|
|
Key *private;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
if (!have_identity)
|
|
|
|
ask_filename(pw, "Enter file in which the key is");
|
|
|
|
if (stat(identity_file, &st) < 0) {
|
|
|
|
perror(identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
/* Try to load the file with empty passphrase. */
|
2001-03-26 13:44:06 +00:00
|
|
|
private = key_load_private(identity_file, "", &comment);
|
|
|
|
if (private == NULL) {
|
1999-11-24 13:26:21 +00:00
|
|
|
if (identity_passphrase)
|
|
|
|
old_passphrase = xstrdup(identity_passphrase);
|
|
|
|
else
|
2001-06-25 05:20:31 +00:00
|
|
|
old_passphrase =
|
|
|
|
read_passphrase("Enter old passphrase: ",
|
|
|
|
RP_ALLOW_STDIN);
|
|
|
|
private = key_load_private(identity_file, old_passphrase,
|
|
|
|
&comment);
|
2001-03-26 13:44:06 +00:00
|
|
|
memset(old_passphrase, 0, strlen(old_passphrase));
|
|
|
|
xfree(old_passphrase);
|
|
|
|
if (private == NULL) {
|
1999-11-24 13:26:21 +00:00
|
|
|
printf("Bad passphrase.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
printf("Key has comment '%s'\n", comment);
|
|
|
|
|
|
|
|
/* Ask the new passphrase (twice). */
|
|
|
|
if (identity_new_passphrase) {
|
|
|
|
passphrase1 = xstrdup(identity_new_passphrase);
|
|
|
|
passphrase2 = NULL;
|
|
|
|
} else {
|
|
|
|
passphrase1 =
|
2001-06-25 05:20:31 +00:00
|
|
|
read_passphrase("Enter new passphrase (empty for no "
|
|
|
|
"passphrase): ", RP_ALLOW_STDIN);
|
|
|
|
passphrase2 = read_passphrase("Enter same passphrase again: ",
|
|
|
|
RP_ALLOW_STDIN);
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
/* Verify that they are the same. */
|
|
|
|
if (strcmp(passphrase1, passphrase2) != 0) {
|
|
|
|
memset(passphrase1, 0, strlen(passphrase1));
|
|
|
|
memset(passphrase2, 0, strlen(passphrase2));
|
|
|
|
xfree(passphrase1);
|
|
|
|
xfree(passphrase2);
|
|
|
|
printf("Pass phrases do not match. Try again.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
/* Destroy the other copy. */
|
|
|
|
memset(passphrase2, 0, strlen(passphrase2));
|
|
|
|
xfree(passphrase2);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Save the file using the new passphrase. */
|
2001-03-26 13:44:06 +00:00
|
|
|
if (!key_save_private(private, identity_file, passphrase1, comment)) {
|
2001-04-16 02:00:02 +00:00
|
|
|
printf("Saving the key failed: %s.\n", identity_file);
|
1999-11-24 13:26:21 +00:00
|
|
|
memset(passphrase1, 0, strlen(passphrase1));
|
|
|
|
xfree(passphrase1);
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(private);
|
1999-11-24 13:26:21 +00:00
|
|
|
xfree(comment);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
/* Destroy the passphrase and the copy of the key in memory. */
|
|
|
|
memset(passphrase1, 0, strlen(passphrase1));
|
|
|
|
xfree(passphrase1);
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(private); /* Destroys contents */
|
1999-11-24 13:26:21 +00:00
|
|
|
xfree(comment);
|
|
|
|
|
|
|
|
printf("Your identification has been saved with the new passphrase.\n");
|
|
|
|
exit(0);
|
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/*
|
|
|
|
* Change the comment of a private key file.
|
|
|
|
*/
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
1999-10-27 03:42:43 +00:00
|
|
|
do_change_comment(struct passwd *pw)
|
|
|
|
{
|
2001-03-09 18:19:24 +00:00
|
|
|
char new_comment[1024], *comment, *passphrase;
|
2001-03-26 13:44:06 +00:00
|
|
|
Key *private;
|
|
|
|
Key *public;
|
1999-11-24 13:26:21 +00:00
|
|
|
struct stat st;
|
|
|
|
FILE *f;
|
2001-03-09 18:19:24 +00:00
|
|
|
int fd;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
if (!have_identity)
|
|
|
|
ask_filename(pw, "Enter file in which the key is");
|
|
|
|
if (stat(identity_file, &st) < 0) {
|
|
|
|
perror(identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
2001-03-26 13:44:06 +00:00
|
|
|
private = key_load_private(identity_file, "", &comment);
|
|
|
|
if (private == NULL) {
|
1999-11-24 13:26:21 +00:00
|
|
|
if (identity_passphrase)
|
|
|
|
passphrase = xstrdup(identity_passphrase);
|
|
|
|
else if (identity_new_passphrase)
|
|
|
|
passphrase = xstrdup(identity_new_passphrase);
|
|
|
|
else
|
2001-06-25 05:20:31 +00:00
|
|
|
passphrase = read_passphrase("Enter passphrase: ",
|
|
|
|
RP_ALLOW_STDIN);
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Try to load using the passphrase. */
|
2001-03-26 13:44:06 +00:00
|
|
|
private = key_load_private(identity_file, passphrase, &comment);
|
|
|
|
if (private == NULL) {
|
1999-11-24 13:26:21 +00:00
|
|
|
memset(passphrase, 0, strlen(passphrase));
|
|
|
|
xfree(passphrase);
|
|
|
|
printf("Bad passphrase.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2001-03-26 13:44:06 +00:00
|
|
|
} else {
|
|
|
|
passphrase = xstrdup("");
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
2001-03-26 13:44:06 +00:00
|
|
|
if (private->type != KEY_RSA1) {
|
|
|
|
fprintf(stderr, "Comments are only supported for RSA1 keys.\n");
|
|
|
|
key_free(private);
|
|
|
|
exit(1);
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
printf("Key now has comment '%s'\n", comment);
|
|
|
|
|
|
|
|
if (identity_comment) {
|
|
|
|
strlcpy(new_comment, identity_comment, sizeof(new_comment));
|
|
|
|
} else {
|
|
|
|
printf("Enter new comment: ");
|
|
|
|
fflush(stdout);
|
|
|
|
if (!fgets(new_comment, sizeof(new_comment), stdin)) {
|
|
|
|
memset(passphrase, 0, strlen(passphrase));
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(private);
|
1999-11-24 13:26:21 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (strchr(new_comment, '\n'))
|
|
|
|
*strchr(new_comment, '\n') = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Save the file using the new passphrase. */
|
2001-03-26 13:44:06 +00:00
|
|
|
if (!key_save_private(private, identity_file, passphrase, new_comment)) {
|
2001-04-16 02:00:02 +00:00
|
|
|
printf("Saving the key failed: %s.\n", identity_file);
|
1999-11-24 13:26:21 +00:00
|
|
|
memset(passphrase, 0, strlen(passphrase));
|
|
|
|
xfree(passphrase);
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(private);
|
1999-11-24 13:26:21 +00:00
|
|
|
xfree(comment);
|
|
|
|
exit(1);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
memset(passphrase, 0, strlen(passphrase));
|
|
|
|
xfree(passphrase);
|
2001-03-26 13:44:06 +00:00
|
|
|
public = key_from_private(private);
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(private);
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
strlcat(identity_file, ".pub", sizeof(identity_file));
|
2001-03-09 18:19:24 +00:00
|
|
|
fd = open(identity_file, O_WRONLY | O_CREAT | O_TRUNC, 0644);
|
|
|
|
if (fd == -1) {
|
1999-11-24 13:26:21 +00:00
|
|
|
printf("Could not save your public key in %s\n", identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
2001-03-09 18:19:24 +00:00
|
|
|
f = fdopen(fd, "w");
|
|
|
|
if (f == NULL) {
|
|
|
|
printf("fdopen %s failed", identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
2000-04-29 13:57:08 +00:00
|
|
|
if (!key_write(public, f))
|
|
|
|
fprintf(stderr, "write key failed");
|
|
|
|
key_free(public);
|
|
|
|
fprintf(f, " %s\n", new_comment);
|
1999-11-24 13:26:21 +00:00
|
|
|
fclose(f);
|
|
|
|
|
|
|
|
xfree(comment);
|
|
|
|
|
|
|
|
printf("The comment in your key file has been changed.\n");
|
|
|
|
exit(0);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
1999-11-21 07:31:57 +00:00
|
|
|
usage(void)
|
|
|
|
{
|
2001-08-06 21:49:06 +00:00
|
|
|
fprintf(stderr, "Usage: %s [options]\n", __progname);
|
|
|
|
fprintf(stderr, "Options:\n");
|
|
|
|
fprintf(stderr, " -b bits Number of bits in the key to create.\n");
|
|
|
|
fprintf(stderr, " -c Change comment in private and public key files.\n");
|
|
|
|
fprintf(stderr, " -e Convert OpenSSH to IETF SECSH key file.\n");
|
|
|
|
fprintf(stderr, " -f filename Filename of the key file.\n");
|
|
|
|
fprintf(stderr, " -i Convert IETF SECSH to OpenSSH key file.\n");
|
|
|
|
fprintf(stderr, " -l Show fingerprint of key file.\n");
|
|
|
|
fprintf(stderr, " -p Change passphrase of private key file.\n");
|
|
|
|
fprintf(stderr, " -q Quiet.\n");
|
|
|
|
fprintf(stderr, " -y Read private key file and print public key.\n");
|
|
|
|
fprintf(stderr, " -t type Specify type of key to create.\n");
|
|
|
|
fprintf(stderr, " -B Show bubblebabble digest of key file.\n");
|
|
|
|
fprintf(stderr, " -C comment Provide new comment.\n");
|
|
|
|
fprintf(stderr, " -N phrase Provide new passphrase.\n");
|
|
|
|
fprintf(stderr, " -P phrase Provide old passphrase.\n");
|
|
|
|
#ifdef SMARTCARD
|
|
|
|
fprintf(stderr, " -D reader Download public key from smartcard.\n");
|
|
|
|
fprintf(stderr, " -U reader Upload private key to smartcard.\n");
|
|
|
|
#endif /* SMARTCARD */
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
exit(1);
|
1999-11-21 07:31:57 +00:00
|
|
|
}
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/*
|
|
|
|
* Main program for key management.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
int
|
|
|
|
main(int ac, char **av)
|
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
char dotsshdir[16 * 1024], comment[1024], *passphrase1, *passphrase2;
|
2001-08-06 21:44:05 +00:00
|
|
|
char *reader_id = NULL;
|
2001-03-09 18:19:24 +00:00
|
|
|
Key *private, *public;
|
1999-11-24 13:26:21 +00:00
|
|
|
struct passwd *pw;
|
|
|
|
struct stat st;
|
2001-08-06 21:44:05 +00:00
|
|
|
int opt, type, fd, download = 0;
|
1999-11-24 13:26:21 +00:00
|
|
|
FILE *f;
|
2000-11-13 11:57:25 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
extern int optind;
|
|
|
|
extern char *optarg;
|
|
|
|
|
2000-11-17 03:47:20 +00:00
|
|
|
__progname = get_progname(av[0]);
|
2000-07-09 12:42:32 +00:00
|
|
|
init_rng();
|
2001-03-18 22:38:15 +00:00
|
|
|
seed_rng();
|
2000-07-09 12:42:32 +00:00
|
|
|
|
2000-06-07 09:55:44 +00:00
|
|
|
SSLeay_add_all_algorithms();
|
2000-04-29 13:57:08 +00:00
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/* we need this for the home * directory. */
|
1999-11-24 13:26:21 +00:00
|
|
|
pw = getpwuid(getuid());
|
|
|
|
if (!pw) {
|
|
|
|
printf("You don't exist, go away!\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2000-04-29 13:57:08 +00:00
|
|
|
if (gethostname(hostname, sizeof(hostname)) < 0) {
|
|
|
|
perror("gethostname");
|
|
|
|
exit(1);
|
|
|
|
}
|
1999-11-25 00:54:57 +00:00
|
|
|
|
2001-08-06 21:46:54 +00:00
|
|
|
while ((opt = getopt(ac, av, "deiqpclBRxXyb:f:t:U:D:P:N:C:")) != -1) {
|
1999-11-24 13:26:21 +00:00
|
|
|
switch (opt) {
|
|
|
|
case 'b':
|
|
|
|
bits = atoi(optarg);
|
|
|
|
if (bits < 512 || bits > 32768) {
|
|
|
|
printf("Bits has bad value.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 'l':
|
|
|
|
print_fingerprint = 1;
|
|
|
|
break;
|
2001-03-12 03:02:17 +00:00
|
|
|
case 'B':
|
|
|
|
print_bubblebabble = 1;
|
|
|
|
break;
|
1999-11-24 13:26:21 +00:00
|
|
|
case 'p':
|
|
|
|
change_passphrase = 1;
|
|
|
|
break;
|
|
|
|
case 'c':
|
|
|
|
change_comment = 1;
|
|
|
|
break;
|
|
|
|
case 'f':
|
|
|
|
strlcpy(identity_file, optarg, sizeof(identity_file));
|
|
|
|
have_identity = 1;
|
|
|
|
break;
|
|
|
|
case 'P':
|
|
|
|
identity_passphrase = optarg;
|
|
|
|
break;
|
|
|
|
case 'N':
|
|
|
|
identity_new_passphrase = optarg;
|
|
|
|
break;
|
|
|
|
case 'C':
|
|
|
|
identity_comment = optarg;
|
|
|
|
break;
|
|
|
|
case 'q':
|
|
|
|
quiet = 1;
|
|
|
|
break;
|
2000-04-29 13:57:08 +00:00
|
|
|
case 'R':
|
2000-11-13 11:57:25 +00:00
|
|
|
/* unused */
|
|
|
|
exit(0);
|
2000-04-29 13:57:08 +00:00
|
|
|
break;
|
2001-04-22 17:15:46 +00:00
|
|
|
case 'e':
|
2000-04-29 13:57:08 +00:00
|
|
|
case 'x':
|
2001-04-22 17:15:46 +00:00
|
|
|
/* export key */
|
2000-04-29 13:57:08 +00:00
|
|
|
convert_to_ssh2 = 1;
|
|
|
|
break;
|
2001-04-22 17:15:46 +00:00
|
|
|
case 'i':
|
2000-04-29 13:57:08 +00:00
|
|
|
case 'X':
|
2001-04-22 17:15:46 +00:00
|
|
|
/* import key */
|
2000-04-29 13:57:08 +00:00
|
|
|
convert_from_ssh2 = 1;
|
|
|
|
break;
|
|
|
|
case 'y':
|
|
|
|
print_public = 1;
|
|
|
|
break;
|
|
|
|
case 'd':
|
2000-11-13 11:57:25 +00:00
|
|
|
key_type_name = "dsa";
|
2000-04-29 13:57:08 +00:00
|
|
|
break;
|
2000-11-13 11:57:25 +00:00
|
|
|
case 't':
|
|
|
|
key_type_name = optarg;
|
|
|
|
break;
|
2001-08-06 21:44:05 +00:00
|
|
|
case 'D':
|
|
|
|
download = 1;
|
2001-08-06 21:46:54 +00:00
|
|
|
case 'U':
|
2001-08-06 21:44:05 +00:00
|
|
|
reader_id = optarg;
|
2001-07-04 03:44:03 +00:00
|
|
|
break;
|
1999-11-24 13:26:21 +00:00
|
|
|
case '?':
|
|
|
|
default:
|
|
|
|
usage();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (optind < ac) {
|
|
|
|
printf("Too many arguments.\n");
|
|
|
|
usage();
|
|
|
|
}
|
|
|
|
if (change_passphrase && change_comment) {
|
|
|
|
printf("Can only have one of -p and -c.\n");
|
|
|
|
usage();
|
|
|
|
}
|
2001-03-12 03:02:17 +00:00
|
|
|
if (print_fingerprint || print_bubblebabble)
|
1999-11-24 13:26:21 +00:00
|
|
|
do_fingerprint(pw);
|
|
|
|
if (change_passphrase)
|
|
|
|
do_change_passphrase(pw);
|
|
|
|
if (change_comment)
|
|
|
|
do_change_comment(pw);
|
2000-04-29 13:57:08 +00:00
|
|
|
if (convert_to_ssh2)
|
|
|
|
do_convert_to_ssh2(pw);
|
|
|
|
if (convert_from_ssh2)
|
|
|
|
do_convert_from_ssh2(pw);
|
|
|
|
if (print_public)
|
|
|
|
do_print_public(pw);
|
2001-08-06 21:44:05 +00:00
|
|
|
if (reader_id != NULL) {
|
2001-08-06 21:40:04 +00:00
|
|
|
#ifdef SMARTCARD
|
2001-08-06 21:44:05 +00:00
|
|
|
if (download)
|
|
|
|
do_download(pw, reader_id);
|
|
|
|
else
|
|
|
|
do_upload(pw, reader_id);
|
2001-08-06 21:57:31 +00:00
|
|
|
#else /* SMARTCARD */
|
2001-08-06 21:40:04 +00:00
|
|
|
fatal("no support for smartcards.");
|
2001-08-06 21:57:31 +00:00
|
|
|
#endif /* SMARTCARD */
|
2001-08-06 21:44:05 +00:00
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
arc4random_stir();
|
|
|
|
|
2000-11-29 01:18:44 +00:00
|
|
|
type = key_type_from_name(key_type_name);
|
|
|
|
if (type == KEY_UNSPEC) {
|
|
|
|
fprintf(stderr, "unknown key type %s\n", key_type_name);
|
|
|
|
exit(1);
|
2000-04-29 13:57:08 +00:00
|
|
|
}
|
2000-11-13 11:57:25 +00:00
|
|
|
if (!quiet)
|
2000-11-29 01:18:44 +00:00
|
|
|
printf("Generating public/private %s key pair.\n", key_type_name);
|
2000-11-13 11:57:25 +00:00
|
|
|
private = key_generate(type, bits);
|
|
|
|
if (private == NULL) {
|
|
|
|
fprintf(stderr, "key_generate failed");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
public = key_from_private(private);
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
if (!have_identity)
|
|
|
|
ask_filename(pw, "Enter file in which to save the key");
|
|
|
|
|
|
|
|
/* Create ~/.ssh directory if it doesn\'t already exist. */
|
2001-01-22 05:34:40 +00:00
|
|
|
snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", pw->pw_dir, _PATH_SSH_USER_DIR);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (strstr(identity_file, dotsshdir) != NULL &&
|
|
|
|
stat(dotsshdir, &st) < 0) {
|
2000-07-15 04:14:16 +00:00
|
|
|
if (mkdir(dotsshdir, 0700) < 0)
|
1999-11-24 13:26:21 +00:00
|
|
|
error("Could not create directory '%s'.", dotsshdir);
|
|
|
|
else if (!quiet)
|
|
|
|
printf("Created directory '%s'.\n", dotsshdir);
|
|
|
|
}
|
|
|
|
/* If the file already exists, ask the user to confirm. */
|
|
|
|
if (stat(identity_file, &st) >= 0) {
|
|
|
|
char yesno[3];
|
|
|
|
printf("%s already exists.\n", identity_file);
|
|
|
|
printf("Overwrite (y/n)? ");
|
|
|
|
fflush(stdout);
|
|
|
|
if (fgets(yesno, sizeof(yesno), stdin) == NULL)
|
|
|
|
exit(1);
|
|
|
|
if (yesno[0] != 'y' && yesno[0] != 'Y')
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
/* Ask for a passphrase (twice). */
|
|
|
|
if (identity_passphrase)
|
|
|
|
passphrase1 = xstrdup(identity_passphrase);
|
|
|
|
else if (identity_new_passphrase)
|
|
|
|
passphrase1 = xstrdup(identity_new_passphrase);
|
|
|
|
else {
|
|
|
|
passphrase_again:
|
|
|
|
passphrase1 =
|
2001-06-25 05:20:31 +00:00
|
|
|
read_passphrase("Enter passphrase (empty for no "
|
|
|
|
"passphrase): ", RP_ALLOW_STDIN);
|
|
|
|
passphrase2 = read_passphrase("Enter same passphrase again: ",
|
|
|
|
RP_ALLOW_STDIN);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (strcmp(passphrase1, passphrase2) != 0) {
|
2001-06-25 05:20:31 +00:00
|
|
|
/*
|
|
|
|
* The passphrases do not match. Clear them and
|
|
|
|
* retry.
|
|
|
|
*/
|
1999-11-24 13:26:21 +00:00
|
|
|
memset(passphrase1, 0, strlen(passphrase1));
|
|
|
|
memset(passphrase2, 0, strlen(passphrase2));
|
|
|
|
xfree(passphrase1);
|
|
|
|
xfree(passphrase2);
|
|
|
|
printf("Passphrases do not match. Try again.\n");
|
|
|
|
goto passphrase_again;
|
|
|
|
}
|
|
|
|
/* Clear the other copy of the passphrase. */
|
|
|
|
memset(passphrase2, 0, strlen(passphrase2));
|
|
|
|
xfree(passphrase2);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (identity_comment) {
|
|
|
|
strlcpy(comment, identity_comment, sizeof(comment));
|
|
|
|
} else {
|
2000-04-16 01:18:38 +00:00
|
|
|
/* Create default commend field for the passphrase. */
|
1999-11-24 13:26:21 +00:00
|
|
|
snprintf(comment, sizeof comment, "%s@%s", pw->pw_name, hostname);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Save the key with the given passphrase and comment. */
|
2001-03-26 13:44:06 +00:00
|
|
|
if (!key_save_private(private, identity_file, passphrase1, comment)) {
|
2001-04-16 02:00:02 +00:00
|
|
|
printf("Saving the key failed: %s.\n", identity_file);
|
1999-11-24 13:26:21 +00:00
|
|
|
memset(passphrase1, 0, strlen(passphrase1));
|
|
|
|
xfree(passphrase1);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
/* Clear the passphrase. */
|
|
|
|
memset(passphrase1, 0, strlen(passphrase1));
|
|
|
|
xfree(passphrase1);
|
|
|
|
|
|
|
|
/* Clear the private key and the random number generator. */
|
2000-11-13 11:57:25 +00:00
|
|
|
key_free(private);
|
1999-11-24 13:26:21 +00:00
|
|
|
arc4random_stir();
|
|
|
|
|
|
|
|
if (!quiet)
|
|
|
|
printf("Your identification has been saved in %s.\n", identity_file);
|
|
|
|
|
|
|
|
strlcat(identity_file, ".pub", sizeof(identity_file));
|
2001-03-09 18:19:24 +00:00
|
|
|
fd = open(identity_file, O_WRONLY | O_CREAT | O_TRUNC, 0644);
|
|
|
|
if (fd == -1) {
|
1999-11-24 13:26:21 +00:00
|
|
|
printf("Could not save your public key in %s\n", identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
2001-03-09 18:19:24 +00:00
|
|
|
f = fdopen(fd, "w");
|
|
|
|
if (f == NULL) {
|
|
|
|
printf("fdopen %s failed", identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
2000-04-29 13:57:08 +00:00
|
|
|
if (!key_write(public, f))
|
|
|
|
fprintf(stderr, "write key failed");
|
|
|
|
fprintf(f, " %s\n", comment);
|
1999-11-24 13:26:21 +00:00
|
|
|
fclose(f);
|
|
|
|
|
|
|
|
if (!quiet) {
|
2001-03-13 04:57:58 +00:00
|
|
|
char *fp = key_fingerprint(public, SSH_FP_MD5, SSH_FP_HEX);
|
2000-04-29 13:57:08 +00:00
|
|
|
printf("Your public key has been saved in %s.\n",
|
|
|
|
identity_file);
|
1999-11-24 13:26:21 +00:00
|
|
|
printf("The key fingerprint is:\n");
|
2001-03-13 04:57:58 +00:00
|
|
|
printf("%s %s\n", fp, comment);
|
|
|
|
xfree(fp);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
2000-04-29 13:57:08 +00:00
|
|
|
|
|
|
|
key_free(public);
|
1999-11-24 13:26:21 +00:00
|
|
|
exit(0);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|