- grunk@cvs.openbsd.org 2008/06/11 21:01:35
[ssh_config.5 key.h readconf.c readconf.h ssh-keygen.1 ssh-keygen.c key.c
sshconnect.c]
Introduce SSH Fingerprint ASCII Visualization, a technique inspired by the
graphical hash visualization schemes known as "random art", and by
Dan Kaminsky's musings on the subject during a BlackOp talk at the
23C3 in Berlin.
Scientific publication (original paper):
"Hash Visualization: a New Technique to improve Real-World Security",
Perrig A. and Song D., 1999, International Workshop on Cryptographic
Techniques and E-Commerce (CrypTEC '99)
http://sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf
The algorithm used here is a worm crawling over a discrete plane,
leaving a trace (augmenting the field) everywhere it goes.
Movement is taken from dgst_raw 2bit-wise. Bumping into walls
makes the respective movement vector be ignored for this turn,
thus switching to the other color of the chessboard.
Graphs are not unambiguous for now, because circles in graphs can be
walked in either direction.
discussions with several people,
help, corrections and ok markus@ djm@
2008-06-12 18:40:35 +00:00
|
|
|
/* $OpenBSD: ssh-keygen.c,v 1.167 2008/06/11 21:01:35 grunk Exp $ */
|
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"
|
2006-03-15 00:45:54 +00:00
|
|
|
|
|
|
|
#include <sys/types.h>
|
2006-07-10 11:08:03 +00:00
|
|
|
#include <sys/socket.h>
|
2006-03-15 00:45:54 +00:00
|
|
|
#include <sys/stat.h>
|
2006-08-05 01:02:17 +00:00
|
|
|
#include <sys/param.h>
|
2000-04-29 13:57:08 +00:00
|
|
|
|
|
|
|
#include <openssl/evp.h>
|
|
|
|
#include <openssl/pem.h>
|
2008-02-28 08:13:52 +00:00
|
|
|
#include "openbsd-compat/openssl-compat.h"
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2006-07-12 12:22:46 +00:00
|
|
|
#include <errno.h>
|
2006-07-10 11:13:46 +00:00
|
|
|
#include <fcntl.h>
|
2006-07-24 04:51:00 +00:00
|
|
|
#include <netdb.h>
|
2006-07-11 08:55:05 +00:00
|
|
|
#ifdef HAVE_PATHS_H
|
|
|
|
# include <paths.h>
|
|
|
|
#endif
|
2006-07-10 10:53:08 +00:00
|
|
|
#include <pwd.h>
|
2006-09-01 05:38:36 +00:00
|
|
|
#include <stdarg.h>
|
2006-08-05 01:37:59 +00:00
|
|
|
#include <stdio.h>
|
2006-08-05 01:34:19 +00:00
|
|
|
#include <stdlib.h>
|
2006-07-24 04:13:33 +00:00
|
|
|
#include <string.h>
|
2006-07-24 04:01:23 +00:00
|
|
|
#include <unistd.h>
|
2006-07-10 10:53:08 +00:00
|
|
|
|
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"
|
2001-01-22 05:34:40 +00:00
|
|
|
#include "pathnames.h"
|
|
|
|
#include "log.h"
|
2004-05-13 06:15:47 +00:00
|
|
|
#include "misc.h"
|
2005-03-01 10:48:35 +00:00
|
|
|
#include "match.h"
|
|
|
|
#include "hostfile.h"
|
2006-07-10 10:53:31 +00:00
|
|
|
#include "dns.h"
|
2000-10-14 05:23:11 +00:00
|
|
|
|
2001-08-06 21:44:05 +00:00
|
|
|
#ifdef SMARTCARD
|
|
|
|
#include "scard.h"
|
2001-08-06 21:59:25 +00:00
|
|
|
#endif
|
2001-07-04 03:44:03 +00:00
|
|
|
|
2005-11-05 03:52:18 +00:00
|
|
|
/* Number of bits in the RSA/DSA key. This value can be set on the command line. */
|
|
|
|
#define DEFAULT_BITS 2048
|
|
|
|
#define DEFAULT_BITS_DSA 1024
|
|
|
|
u_int32_t bits = 0;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
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;
|
|
|
|
|
2005-03-01 10:48:35 +00:00
|
|
|
/* Flag indicating that we want to hash a known_hosts file */
|
|
|
|
int hash_hosts = 0;
|
|
|
|
/* Flag indicating that we want lookup a host in known_hosts file */
|
|
|
|
int find_host = 0;
|
|
|
|
/* Flag indicating that we want to delete a host from a known_hosts file */
|
|
|
|
int delete_host = 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;
|
2003-05-15 00:19:46 +00:00
|
|
|
int print_generic = 0;
|
2000-11-13 11:57:25 +00:00
|
|
|
|
2002-01-22 12:05:08 +00:00
|
|
|
char *key_type_name = NULL;
|
2000-04-29 13:57:08 +00:00
|
|
|
|
1999-11-21 07:31:57 +00:00
|
|
|
/* argv0 */
|
|
|
|
extern char *__progname;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-29 13:57:08 +00:00
|
|
|
char hostname[MAXHOSTNAMELEN];
|
|
|
|
|
2004-05-13 06:24:32 +00:00
|
|
|
/* moduli.c */
|
2005-05-26 02:16:18 +00:00
|
|
|
int gen_candidates(FILE *, u_int32_t, u_int32_t, BIGNUM *);
|
2004-05-13 06:24:32 +00:00
|
|
|
int prime_test(FILE *, FILE *, u_int32_t, u_int32_t);
|
|
|
|
|
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;
|
|
|
|
|
2002-02-19 04:22:47 +00:00
|
|
|
if (key_type_name == NULL)
|
2001-01-22 05:34:40 +00:00
|
|
|
name = _PATH_SSH_CLIENT_ID_RSA;
|
2006-03-26 03:07:26 +00:00
|
|
|
else {
|
2002-02-19 04:22:47 +00:00
|
|
|
switch (key_type_from_name(key_type_name)) {
|
|
|
|
case KEY_RSA1:
|
|
|
|
name = _PATH_SSH_CLIENT_IDENTITY;
|
|
|
|
break;
|
|
|
|
case KEY_DSA:
|
|
|
|
name = _PATH_SSH_CLIENT_ID_DSA;
|
|
|
|
break;
|
|
|
|
case KEY_RSA:
|
|
|
|
name = _PATH_SSH_CLIENT_ID_RSA;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
fprintf(stderr, "bad key type");
|
|
|
|
exit(1);
|
|
|
|
break;
|
|
|
|
}
|
2006-03-26 03:07:26 +00:00
|
|
|
}
|
2000-11-29 01:18:44 +00:00
|
|
|
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);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (fgets(buf, sizeof(buf), stdin) == NULL)
|
|
|
|
exit(1);
|
2007-09-17 06:09:15 +00:00
|
|
|
buf[strcspn(buf, "\n")] = '\0';
|
1999-11-24 13:26:21 +00:00
|
|
|
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 ----"
|
2002-06-21 00:41:51 +00:00
|
|
|
#define SSH_COM_PUBLIC_END "---- END SSH2 PUBLIC KEY ----"
|
2000-10-14 05:23:11 +00:00
|
|
|
#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;
|
2002-02-26 18:15:09 +00:00
|
|
|
u_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
|
|
|
}
|
2003-05-14 03:45:22 +00:00
|
|
|
if (k->type == KEY_RSA1) {
|
|
|
|
fprintf(stderr, "version 1 keys are not supported\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
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,
|
2002-06-23 21:28:13 +00:00
|
|
|
"Comment: \"%u-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)
|
|
|
|
{
|
2004-06-22 02:56:01 +00:00
|
|
|
u_int bignum_bits = buffer_get_int(b);
|
|
|
|
u_int bytes = (bignum_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));
|
2006-11-07 12:14:41 +00:00
|
|
|
if (BN_bin2bn(buffer_ptr(b), bytes, value) == NULL)
|
|
|
|
fatal("buffer_get_bignum_bits: BN_bin2bn failed");
|
2000-10-14 05:23:11 +00:00
|
|
|
buffer_consume(b, bytes);
|
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static Key *
|
2002-02-26 18:09:42 +00:00
|
|
|
do_convert_private_ssh2_from_blob(u_char *blob, u_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);
|
|
|
|
|
2007-02-19 11:10:25 +00:00
|
|
|
magic = buffer_get_int(&b);
|
2000-10-14 05:23:11 +00:00
|
|
|
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);
|
2007-01-05 05:30:16 +00:00
|
|
|
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 {
|
2005-01-19 23:56:31 +00:00
|
|
|
buffer_free(&b);
|
2001-03-29 00:29:54 +00:00
|
|
|
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:
|
2007-02-19 11:10:25 +00:00
|
|
|
e = buffer_get_char(&b);
|
2001-06-25 04:47:54 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2006-03-15 01:05:40 +00:00
|
|
|
static int
|
|
|
|
get_line(FILE *fp, char *line, size_t len)
|
|
|
|
{
|
|
|
|
int c;
|
|
|
|
size_t pos = 0;
|
|
|
|
|
|
|
|
line[0] = '\0';
|
|
|
|
while ((c = fgetc(fp)) != EOF) {
|
|
|
|
if (pos >= len - 1) {
|
|
|
|
fprintf(stderr, "input line too long.\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
2006-03-26 03:07:26 +00:00
|
|
|
switch (c) {
|
2006-03-15 01:05:40 +00:00
|
|
|
case '\r':
|
|
|
|
c = fgetc(fp);
|
|
|
|
if (c != EOF && c != '\n' && ungetc(c, fp) == EOF) {
|
|
|
|
fprintf(stderr, "unget: %s\n", strerror(errno));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
return pos;
|
|
|
|
case '\n':
|
|
|
|
return pos;
|
|
|
|
}
|
|
|
|
line[pos++] = c;
|
|
|
|
line[pos] = '\0';
|
|
|
|
}
|
2007-01-05 05:29:55 +00:00
|
|
|
/* We reached EOF */
|
|
|
|
return -1;
|
2006-03-15 01:05:40 +00:00
|
|
|
}
|
|
|
|
|
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;
|
2002-04-02 20:26:26 +00:00
|
|
|
u_int len;
|
2006-03-15 01:05:40 +00:00
|
|
|
char line[1024];
|
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';
|
2006-03-15 01:05:40 +00:00
|
|
|
while ((blen = get_line(fp, line, sizeof(line))) != -1) {
|
|
|
|
if (line[blen - 1] == '\\')
|
2000-05-09 01:02:59 +00:00
|
|
|
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
|
|
|
}
|
|
|
|
strlcat(encoded, line, sizeof(encoded));
|
|
|
|
}
|
2002-04-02 20:26:26 +00:00
|
|
|
len = strlen(encoded);
|
|
|
|
if (((len % 4) == 3) &&
|
|
|
|
(encoded[len-1] == '=') &&
|
|
|
|
(encoded[len-2] == '=') &&
|
|
|
|
(encoded[len-3] == '='))
|
|
|
|
encoded[len-3] = '\0';
|
2002-01-22 12:33:31 +00:00
|
|
|
blen = uudecode(encoded, 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);
|
2002-01-22 12:20:15 +00:00
|
|
|
if (!private)
|
|
|
|
fprintf(stdout, "\n");
|
2000-04-29 13:57:08 +00:00
|
|
|
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
|
|
|
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;
|
2002-03-22 03:33:43 +00:00
|
|
|
int ret;
|
|
|
|
|
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);
|
2002-03-22 03:33:43 +00:00
|
|
|
exit(1);
|
2001-07-04 03:44:03 +00:00
|
|
|
}
|
|
|
|
prv = load_identity(identity_file);
|
|
|
|
if (prv == NULL) {
|
|
|
|
error("load failed");
|
2002-03-22 03:33:43 +00:00
|
|
|
exit(1);
|
2001-07-04 05:06:59 +00:00
|
|
|
}
|
2002-03-22 03:33:43 +00:00
|
|
|
ret = sc_put_key(prv, sc_reader_id);
|
|
|
|
key_free(prv);
|
|
|
|
if (ret < 0)
|
|
|
|
exit(1);
|
2003-04-09 10:59:48 +00:00
|
|
|
logit("loading key done");
|
2002-03-22 03:33:43 +00:00
|
|
|
exit(0);
|
2001-07-04 03:44:03 +00:00
|
|
|
}
|
2001-08-06 21:44:05 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
do_download(struct passwd *pw, const char *sc_reader_id)
|
|
|
|
{
|
2002-03-26 03:17:42 +00:00
|
|
|
Key **keys = NULL;
|
|
|
|
int i;
|
2001-08-06 21:44:05 +00:00
|
|
|
|
2002-03-26 03:17:42 +00:00
|
|
|
keys = sc_get_keys(sc_reader_id, NULL);
|
|
|
|
if (keys == NULL)
|
2001-08-06 21:44:05 +00:00
|
|
|
fatal("cannot read public key from smartcard");
|
2002-03-26 03:17:42 +00:00
|
|
|
for (i = 0; keys[i]; i++) {
|
|
|
|
key_write(keys[i], stdout);
|
|
|
|
key_free(keys[i]);
|
|
|
|
fprintf(stdout, "\n");
|
|
|
|
}
|
|
|
|
xfree(keys);
|
2001-08-06 21:44:05 +00:00
|
|
|
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;
|
- grunk@cvs.openbsd.org 2008/06/11 21:01:35
[ssh_config.5 key.h readconf.c readconf.h ssh-keygen.1 ssh-keygen.c key.c
sshconnect.c]
Introduce SSH Fingerprint ASCII Visualization, a technique inspired by the
graphical hash visualization schemes known as "random art", and by
Dan Kaminsky's musings on the subject during a BlackOp talk at the
23C3 in Berlin.
Scientific publication (original paper):
"Hash Visualization: a New Technique to improve Real-World Security",
Perrig A. and Song D., 1999, International Workshop on Cryptographic
Techniques and E-Commerce (CrypTEC '99)
http://sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf
The algorithm used here is a worm crawling over a discrete plane,
leaving a trace (augmenting the field) everywhere it goes.
Movement is taken from dgst_raw 2bit-wise. Bumping into walls
makes the respective movement vector be ignored for this turn,
thus switching to the other color of the chessboard.
Graphs are not unambiguous for now, because circles in graphs can be
walked in either direction.
discussions with several people,
help, corrections and ok markus@ djm@
2008-06-12 18:40:35 +00:00
|
|
|
char *comment = NULL, *cp, *ep, line[16*1024], *fp, *ra;
|
2008-02-10 11:24:55 +00:00
|
|
|
int i, skip = 0, num = 0, invalid = 1;
|
2001-12-06 16:32:47 +00:00
|
|
|
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);
|
- grunk@cvs.openbsd.org 2008/06/11 21:01:35
[ssh_config.5 key.h readconf.c readconf.h ssh-keygen.1 ssh-keygen.c key.c
sshconnect.c]
Introduce SSH Fingerprint ASCII Visualization, a technique inspired by the
graphical hash visualization schemes known as "random art", and by
Dan Kaminsky's musings on the subject during a BlackOp talk at the
23C3 in Berlin.
Scientific publication (original paper):
"Hash Visualization: a New Technique to improve Real-World Security",
Perrig A. and Song D., 1999, International Workshop on Cryptographic
Techniques and E-Commerce (CrypTEC '99)
http://sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf
The algorithm used here is a worm crawling over a discrete plane,
leaving a trace (augmenting the field) everywhere it goes.
Movement is taken from dgst_raw 2bit-wise. Bumping into walls
makes the respective movement vector be ignored for this turn,
thus switching to the other color of the chessboard.
Graphs are not unambiguous for now, because circles in graphs can be
walked in either direction.
discussions with several people,
help, corrections and ok markus@ djm@
2008-06-12 18:40:35 +00:00
|
|
|
ra = key_fingerprint(public, fptype, rep);
|
2002-06-23 21:28:13 +00:00
|
|
|
printf("%u %s %s\n", key_size(public), fp, comment);
|
- grunk@cvs.openbsd.org 2008/06/11 21:01:35
[ssh_config.5 key.h readconf.c readconf.h ssh-keygen.1 ssh-keygen.c key.c
sshconnect.c]
Introduce SSH Fingerprint ASCII Visualization, a technique inspired by the
graphical hash visualization schemes known as "random art", and by
Dan Kaminsky's musings on the subject during a BlackOp talk at the
23C3 in Berlin.
Scientific publication (original paper):
"Hash Visualization: a New Technique to improve Real-World Security",
Perrig A. and Song D., 1999, International Workshop on Cryptographic
Techniques and E-Commerce (CrypTEC '99)
http://sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf
The algorithm used here is a worm crawling over a discrete plane,
leaving a trace (augmenting the field) everywhere it goes.
Movement is taken from dgst_raw 2bit-wise. Bumping into walls
makes the respective movement vector be ignored for this turn,
thus switching to the other color of the chessboard.
Graphs are not unambiguous for now, because circles in graphs can be
walked in either direction.
discussions with several people,
help, corrections and ok markus@ djm@
2008-06-12 18:40:35 +00:00
|
|
|
verbose("%s\n", ra);
|
2000-04-29 13:57:08 +00:00
|
|
|
key_free(public);
|
2000-11-13 11:57:25 +00:00
|
|
|
xfree(comment);
|
- grunk@cvs.openbsd.org 2008/06/11 21:01:35
[ssh_config.5 key.h readconf.c readconf.h ssh-keygen.1 ssh-keygen.c key.c
sshconnect.c]
Introduce SSH Fingerprint ASCII Visualization, a technique inspired by the
graphical hash visualization schemes known as "random art", and by
Dan Kaminsky's musings on the subject during a BlackOp talk at the
23C3 in Berlin.
Scientific publication (original paper):
"Hash Visualization: a New Technique to improve Real-World Security",
Perrig A. and Song D., 1999, International Workshop on Cryptographic
Techniques and E-Commerce (CrypTEC '99)
http://sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf
The algorithm used here is a worm crawling over a discrete plane,
leaving a trace (augmenting the field) everywhere it goes.
Movement is taken from dgst_raw 2bit-wise. Bumping into walls
makes the respective movement vector be ignored for this turn,
thus switching to the other color of the chessboard.
Graphs are not unambiguous for now, because circles in graphs can be
walked in either direction.
discussions with several people,
help, corrections and ok markus@ djm@
2008-06-12 18:40:35 +00:00
|
|
|
xfree(ra);
|
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);
|
|
|
|
}
|
2006-06-13 03:00:25 +00:00
|
|
|
if (comment) {
|
2001-03-26 13:44:06 +00:00
|
|
|
xfree(comment);
|
2006-06-13 03:00:25 +00:00
|
|
|
comment = NULL;
|
|
|
|
}
|
- 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)) {
|
2007-10-26 04:26:32 +00:00
|
|
|
if ((cp = strchr(line, '\n')) == NULL) {
|
2008-02-10 11:24:55 +00:00
|
|
|
error("line %d too long: %.40s...",
|
|
|
|
num + 1, line);
|
- 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
|
|
|
skip = 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
num++;
|
|
|
|
if (skip) {
|
|
|
|
skip = 0;
|
|
|
|
continue;
|
|
|
|
}
|
2007-10-26 04:26:32 +00:00
|
|
|
*cp = '\0';
|
- 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
|
|
|
|
|
|
|
/* Skip leading whitespace, empty and comment lines. */
|
|
|
|
for (cp = line; *cp == ' ' || *cp == '\t'; cp++)
|
|
|
|
;
|
|
|
|
if (!*cp || *cp == '\n' || *cp == '#')
|
2007-01-05 05:30:16 +00:00
|
|
|
continue;
|
- 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
|
|
|
i = strtol(cp, &ep, 10);
|
|
|
|
if (i == 0 || ep == NULL || (*ep != ' ' && *ep != '\t')) {
|
|
|
|
int quoted = 0;
|
|
|
|
comment = cp;
|
2002-06-23 21:28:13 +00:00
|
|
|
for (; *cp && (quoted || (*cp != ' ' &&
|
|
|
|
*cp != '\t')); cp++) {
|
- 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
|
|
|
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);
|
- grunk@cvs.openbsd.org 2008/06/11 21:01:35
[ssh_config.5 key.h readconf.c readconf.h ssh-keygen.1 ssh-keygen.c key.c
sshconnect.c]
Introduce SSH Fingerprint ASCII Visualization, a technique inspired by the
graphical hash visualization schemes known as "random art", and by
Dan Kaminsky's musings on the subject during a BlackOp talk at the
23C3 in Berlin.
Scientific publication (original paper):
"Hash Visualization: a New Technique to improve Real-World Security",
Perrig A. and Song D., 1999, International Workshop on Cryptographic
Techniques and E-Commerce (CrypTEC '99)
http://sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf
The algorithm used here is a worm crawling over a discrete plane,
leaving a trace (augmenting the field) everywhere it goes.
Movement is taken from dgst_raw 2bit-wise. Bumping into walls
makes the respective movement vector be ignored for this turn,
thus switching to the other color of the chessboard.
Graphs are not unambiguous for now, because circles in graphs can be
walked in either direction.
discussions with several people,
help, corrections and ok markus@ djm@
2008-06-12 18:40:35 +00:00
|
|
|
ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);
|
2002-06-23 21:28:13 +00:00
|
|
|
printf("%u %s %s\n", key_size(public), fp,
|
2000-12-29 16:50:13 +00:00
|
|
|
comment ? comment : "no comment");
|
- grunk@cvs.openbsd.org 2008/06/11 21:01:35
[ssh_config.5 key.h readconf.c readconf.h ssh-keygen.1 ssh-keygen.c key.c
sshconnect.c]
Introduce SSH Fingerprint ASCII Visualization, a technique inspired by the
graphical hash visualization schemes known as "random art", and by
Dan Kaminsky's musings on the subject during a BlackOp talk at the
23C3 in Berlin.
Scientific publication (original paper):
"Hash Visualization: a New Technique to improve Real-World Security",
Perrig A. and Song D., 1999, International Workshop on Cryptographic
Techniques and E-Commerce (CrypTEC '99)
http://sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf
The algorithm used here is a worm crawling over a discrete plane,
leaving a trace (augmenting the field) everywhere it goes.
Movement is taken from dgst_raw 2bit-wise. Bumping into walls
makes the respective movement vector be ignored for this turn,
thus switching to the other color of the chessboard.
Graphs are not unambiguous for now, because circles in graphs can be
walked in either direction.
discussions with several people,
help, corrections and ok markus@ djm@
2008-06-12 18:40:35 +00:00
|
|
|
verbose("%s\n", ra);
|
|
|
|
xfree(ra);
|
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
|
|
|
}
|
|
|
|
|
2005-03-01 10:48:35 +00:00
|
|
|
static void
|
2008-02-10 11:24:30 +00:00
|
|
|
print_host(FILE *f, const char *name, Key *public, int hash)
|
2005-03-01 10:48:35 +00:00
|
|
|
{
|
2008-06-08 02:54:29 +00:00
|
|
|
if (print_fingerprint) {
|
|
|
|
enum fp_rep rep;
|
|
|
|
enum fp_type fptype;
|
- grunk@cvs.openbsd.org 2008/06/11 21:01:35
[ssh_config.5 key.h readconf.c readconf.h ssh-keygen.1 ssh-keygen.c key.c
sshconnect.c]
Introduce SSH Fingerprint ASCII Visualization, a technique inspired by the
graphical hash visualization schemes known as "random art", and by
Dan Kaminsky's musings on the subject during a BlackOp talk at the
23C3 in Berlin.
Scientific publication (original paper):
"Hash Visualization: a New Technique to improve Real-World Security",
Perrig A. and Song D., 1999, International Workshop on Cryptographic
Techniques and E-Commerce (CrypTEC '99)
http://sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf
The algorithm used here is a worm crawling over a discrete plane,
leaving a trace (augmenting the field) everywhere it goes.
Movement is taken from dgst_raw 2bit-wise. Bumping into walls
makes the respective movement vector be ignored for this turn,
thus switching to the other color of the chessboard.
Graphs are not unambiguous for now, because circles in graphs can be
walked in either direction.
discussions with several people,
help, corrections and ok markus@ djm@
2008-06-12 18:40:35 +00:00
|
|
|
char *fp, *ra;
|
2008-06-08 02:54:29 +00:00
|
|
|
|
|
|
|
fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;
|
|
|
|
rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
|
|
|
|
fp = key_fingerprint(public, fptype, rep);
|
- grunk@cvs.openbsd.org 2008/06/11 21:01:35
[ssh_config.5 key.h readconf.c readconf.h ssh-keygen.1 ssh-keygen.c key.c
sshconnect.c]
Introduce SSH Fingerprint ASCII Visualization, a technique inspired by the
graphical hash visualization schemes known as "random art", and by
Dan Kaminsky's musings on the subject during a BlackOp talk at the
23C3 in Berlin.
Scientific publication (original paper):
"Hash Visualization: a New Technique to improve Real-World Security",
Perrig A. and Song D., 1999, International Workshop on Cryptographic
Techniques and E-Commerce (CrypTEC '99)
http://sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf
The algorithm used here is a worm crawling over a discrete plane,
leaving a trace (augmenting the field) everywhere it goes.
Movement is taken from dgst_raw 2bit-wise. Bumping into walls
makes the respective movement vector be ignored for this turn,
thus switching to the other color of the chessboard.
Graphs are not unambiguous for now, because circles in graphs can be
walked in either direction.
discussions with several people,
help, corrections and ok markus@ djm@
2008-06-12 18:40:35 +00:00
|
|
|
ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);
|
|
|
|
printf("%u %s %s\n%s\n", key_size(public), fp, name, ra);
|
|
|
|
xfree(ra);
|
2008-06-08 02:54:29 +00:00
|
|
|
xfree(fp);
|
|
|
|
} else {
|
|
|
|
if (hash && (name = host_hash(name, NULL, 0)) == NULL)
|
|
|
|
fatal("hash_host failed");
|
|
|
|
fprintf(f, "%s ", name);
|
|
|
|
if (!key_write(public, f))
|
|
|
|
fatal("key_write failed");
|
|
|
|
fprintf(f, "\n");
|
|
|
|
}
|
2005-03-01 10:48:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
do_known_hosts(struct passwd *pw, const char *name)
|
|
|
|
{
|
|
|
|
FILE *in, *out = stdout;
|
|
|
|
Key *public;
|
|
|
|
char *cp, *cp2, *kp, *kp2;
|
|
|
|
char line[16*1024], tmp[MAXPATHLEN], old[MAXPATHLEN];
|
2008-02-10 11:24:55 +00:00
|
|
|
int c, skip = 0, inplace = 0, num = 0, invalid = 0, has_unhashed = 0;
|
2005-03-01 10:48:35 +00:00
|
|
|
|
|
|
|
if (!have_identity) {
|
|
|
|
cp = tilde_expand_filename(_PATH_SSH_USER_HOSTFILE, pw->pw_uid);
|
|
|
|
if (strlcpy(identity_file, cp, sizeof(identity_file)) >=
|
|
|
|
sizeof(identity_file))
|
|
|
|
fatal("Specified known hosts path too long");
|
|
|
|
xfree(cp);
|
|
|
|
have_identity = 1;
|
|
|
|
}
|
|
|
|
if ((in = fopen(identity_file, "r")) == NULL)
|
|
|
|
fatal("fopen: %s", strerror(errno));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Find hosts goes to stdout, hash and deletions happen in-place
|
|
|
|
* A corner case is ssh-keygen -HF foo, which should go to stdout
|
|
|
|
*/
|
|
|
|
if (!find_host && (hash_hosts || delete_host)) {
|
|
|
|
if (strlcpy(tmp, identity_file, sizeof(tmp)) >= sizeof(tmp) ||
|
|
|
|
strlcat(tmp, ".XXXXXXXXXX", sizeof(tmp)) >= sizeof(tmp) ||
|
|
|
|
strlcpy(old, identity_file, sizeof(old)) >= sizeof(old) ||
|
|
|
|
strlcat(old, ".old", sizeof(old)) >= sizeof(old))
|
|
|
|
fatal("known_hosts path too long");
|
|
|
|
umask(077);
|
|
|
|
if ((c = mkstemp(tmp)) == -1)
|
|
|
|
fatal("mkstemp: %s", strerror(errno));
|
|
|
|
if ((out = fdopen(c, "w")) == NULL) {
|
|
|
|
c = errno;
|
|
|
|
unlink(tmp);
|
|
|
|
fatal("fdopen: %s", strerror(c));
|
|
|
|
}
|
|
|
|
inplace = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (fgets(line, sizeof(line), in)) {
|
2007-10-26 04:26:32 +00:00
|
|
|
if ((cp = strchr(line, '\n')) == NULL) {
|
2008-02-10 11:24:55 +00:00
|
|
|
error("line %d too long: %.40s...", num + 1, line);
|
2005-03-01 10:48:35 +00:00
|
|
|
skip = 1;
|
|
|
|
invalid = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2007-10-26 04:26:32 +00:00
|
|
|
num++;
|
2005-03-01 10:48:35 +00:00
|
|
|
if (skip) {
|
|
|
|
skip = 0;
|
|
|
|
continue;
|
|
|
|
}
|
2007-10-26 04:26:32 +00:00
|
|
|
*cp = '\0';
|
2005-03-01 10:48:35 +00:00
|
|
|
|
|
|
|
/* Skip leading whitespace, empty and comment lines. */
|
|
|
|
for (cp = line; *cp == ' ' || *cp == '\t'; cp++)
|
|
|
|
;
|
|
|
|
if (!*cp || *cp == '\n' || *cp == '#') {
|
|
|
|
if (inplace)
|
|
|
|
fprintf(out, "%s\n", cp);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/* Find the end of the host name portion. */
|
|
|
|
for (kp = cp; *kp && *kp != ' ' && *kp != '\t'; kp++)
|
|
|
|
;
|
|
|
|
if (*kp == '\0' || *(kp + 1) == '\0') {
|
|
|
|
error("line %d missing key: %.40s...",
|
|
|
|
num, line);
|
|
|
|
invalid = 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
*kp++ = '\0';
|
|
|
|
kp2 = kp;
|
|
|
|
|
|
|
|
public = key_new(KEY_RSA1);
|
|
|
|
if (key_read(public, &kp) != 1) {
|
|
|
|
kp = kp2;
|
|
|
|
key_free(public);
|
|
|
|
public = key_new(KEY_UNSPEC);
|
|
|
|
if (key_read(public, &kp) != 1) {
|
|
|
|
error("line %d invalid key: %.40s...",
|
|
|
|
num, line);
|
|
|
|
key_free(public);
|
|
|
|
invalid = 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*cp == HASH_DELIM) {
|
|
|
|
if (find_host || delete_host) {
|
|
|
|
cp2 = host_hash(name, cp, strlen(cp));
|
|
|
|
if (cp2 == NULL) {
|
|
|
|
error("line %d: invalid hashed "
|
|
|
|
"name: %.64s...", num, line);
|
|
|
|
invalid = 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
c = (strcmp(cp2, cp) == 0);
|
|
|
|
if (find_host && c) {
|
|
|
|
printf("# Host %s found: "
|
|
|
|
"line %d type %s\n", name,
|
|
|
|
num, key_type(public));
|
|
|
|
print_host(out, cp, public, 0);
|
|
|
|
}
|
|
|
|
if (delete_host && !c)
|
|
|
|
print_host(out, cp, public, 0);
|
|
|
|
} else if (hash_hosts)
|
|
|
|
print_host(out, cp, public, 0);
|
|
|
|
} else {
|
|
|
|
if (find_host || delete_host) {
|
|
|
|
c = (match_hostname(name, cp,
|
|
|
|
strlen(cp)) == 1);
|
|
|
|
if (find_host && c) {
|
|
|
|
printf("# Host %s found: "
|
|
|
|
"line %d type %s\n", name,
|
|
|
|
num, key_type(public));
|
2008-02-10 11:24:30 +00:00
|
|
|
print_host(out, name, public,
|
|
|
|
hash_hosts);
|
2005-03-01 10:48:35 +00:00
|
|
|
}
|
|
|
|
if (delete_host && !c)
|
|
|
|
print_host(out, cp, public, 0);
|
|
|
|
} else if (hash_hosts) {
|
2005-03-14 12:08:12 +00:00
|
|
|
for (cp2 = strsep(&cp, ",");
|
2005-03-01 10:48:35 +00:00
|
|
|
cp2 != NULL && *cp2 != '\0';
|
2005-03-02 01:33:04 +00:00
|
|
|
cp2 = strsep(&cp, ",")) {
|
|
|
|
if (strcspn(cp2, "*?!") != strlen(cp2))
|
|
|
|
fprintf(stderr, "Warning: "
|
|
|
|
"ignoring host name with "
|
|
|
|
"metacharacters: %.64s\n",
|
|
|
|
cp2);
|
|
|
|
else
|
|
|
|
print_host(out, cp2, public, 1);
|
|
|
|
}
|
2005-03-01 10:48:35 +00:00
|
|
|
has_unhashed = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
key_free(public);
|
|
|
|
}
|
|
|
|
fclose(in);
|
|
|
|
|
|
|
|
if (invalid) {
|
2008-02-10 11:24:55 +00:00
|
|
|
fprintf(stderr, "%s is not a valid known_hosts file.\n",
|
2005-03-01 10:48:35 +00:00
|
|
|
identity_file);
|
|
|
|
if (inplace) {
|
|
|
|
fprintf(stderr, "Not replacing existing known_hosts "
|
2005-03-14 12:09:18 +00:00
|
|
|
"file because of errors\n");
|
2005-03-01 10:48:35 +00:00
|
|
|
fclose(out);
|
|
|
|
unlink(tmp);
|
|
|
|
}
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (inplace) {
|
|
|
|
fclose(out);
|
|
|
|
|
|
|
|
/* Backup existing file */
|
|
|
|
if (unlink(old) == -1 && errno != ENOENT)
|
|
|
|
fatal("unlink %.100s: %s", old, strerror(errno));
|
|
|
|
if (link(identity_file, old) == -1)
|
|
|
|
fatal("link %.100s to %.100s: %s", identity_file, old,
|
|
|
|
strerror(errno));
|
|
|
|
/* Move new one into place */
|
|
|
|
if (rename(tmp, identity_file) == -1) {
|
|
|
|
error("rename\"%s\" to \"%s\": %s", tmp, identity_file,
|
|
|
|
strerror(errno));
|
|
|
|
unlink(tmp);
|
|
|
|
unlink(old);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
fprintf(stderr, "%s updated.\n", identity_file);
|
|
|
|
fprintf(stderr, "Original contents retained as %s\n", old);
|
|
|
|
if (has_unhashed) {
|
|
|
|
fprintf(stderr, "WARNING: %s contains unhashed "
|
|
|
|
"entries\n", old);
|
|
|
|
fprintf(stderr, "Delete this file to ensure privacy "
|
2005-07-17 07:22:45 +00:00
|
|
|
"of hostnames\n");
|
2005-03-01 10:48:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
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: ",
|
2001-12-21 03:45:46 +00:00
|
|
|
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
|
|
|
|
2003-05-15 00:19:46 +00:00
|
|
|
/*
|
|
|
|
* Print the SSHFP RR.
|
|
|
|
*/
|
2006-03-26 02:48:01 +00:00
|
|
|
static int
|
|
|
|
do_print_resource_record(struct passwd *pw, char *fname, char *hname)
|
2003-05-15 00:19:46 +00:00
|
|
|
{
|
|
|
|
Key *public;
|
|
|
|
char *comment = NULL;
|
|
|
|
struct stat st;
|
|
|
|
|
2006-03-26 02:48:01 +00:00
|
|
|
if (fname == NULL)
|
2003-05-15 00:19:46 +00:00
|
|
|
ask_filename(pw, "Enter file in which the key is");
|
2006-03-26 02:48:01 +00:00
|
|
|
if (stat(fname, &st) < 0) {
|
|
|
|
if (errno == ENOENT)
|
|
|
|
return 0;
|
|
|
|
perror(fname);
|
2003-05-15 00:19:46 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
2006-03-26 02:48:01 +00:00
|
|
|
public = key_load_public(fname, &comment);
|
2003-05-15 00:19:46 +00:00
|
|
|
if (public != NULL) {
|
2004-06-22 02:56:01 +00:00
|
|
|
export_dns_rr(hname, public, stdout, print_generic);
|
2003-05-15 00:19:46 +00:00
|
|
|
key_free(public);
|
|
|
|
xfree(comment);
|
2006-03-26 02:48:01 +00:00
|
|
|
return 1;
|
2003-05-15 00:19:46 +00:00
|
|
|
}
|
|
|
|
if (comment)
|
|
|
|
xfree(comment);
|
|
|
|
|
2006-03-26 02:48:01 +00:00
|
|
|
printf("failed to read v2 public key from %s.\n", fname);
|
2003-05-15 00:19:46 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
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);
|
2001-12-21 03:45:46 +00:00
|
|
|
}
|
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);
|
|
|
|
}
|
2007-09-17 06:09:15 +00:00
|
|
|
new_comment[strcspn(new_comment, "\n")] = '\0';
|
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, 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)
|
|
|
|
{
|
2007-09-17 06:05:50 +00:00
|
|
|
fprintf(stderr, "usage: %s [options]\n", __progname);
|
2001-08-06 21:49:06 +00:00
|
|
|
fprintf(stderr, "Options:\n");
|
2005-05-26 01:59:06 +00:00
|
|
|
fprintf(stderr, " -a trials Number of trials for screening DH-GEX moduli.\n");
|
|
|
|
fprintf(stderr, " -B Show bubblebabble digest of key file.\n");
|
2001-08-06 21:49:06 +00:00
|
|
|
fprintf(stderr, " -b bits Number of bits in the key to create.\n");
|
2005-05-26 01:59:06 +00:00
|
|
|
fprintf(stderr, " -C comment Provide new comment.\n");
|
2001-08-06 21:49:06 +00:00
|
|
|
fprintf(stderr, " -c Change comment in private and public key files.\n");
|
2005-05-26 01:59:06 +00:00
|
|
|
#ifdef SMARTCARD
|
|
|
|
fprintf(stderr, " -D reader Download public key from smartcard.\n");
|
|
|
|
#endif /* SMARTCARD */
|
2007-02-19 11:09:06 +00:00
|
|
|
fprintf(stderr, " -e Convert OpenSSH to RFC 4716 key file.\n");
|
2005-05-26 01:59:06 +00:00
|
|
|
fprintf(stderr, " -F hostname Find hostname in known hosts file.\n");
|
2001-08-06 21:49:06 +00:00
|
|
|
fprintf(stderr, " -f filename Filename of the key file.\n");
|
2005-05-26 01:59:06 +00:00
|
|
|
fprintf(stderr, " -G file Generate candidates for DH-GEX moduli.\n");
|
2003-05-15 00:19:46 +00:00
|
|
|
fprintf(stderr, " -g Use generic DNS resource record format.\n");
|
2005-05-26 01:59:06 +00:00
|
|
|
fprintf(stderr, " -H Hash names in known_hosts file.\n");
|
2007-02-19 11:09:06 +00:00
|
|
|
fprintf(stderr, " -i Convert RFC 4716 to OpenSSH key file.\n");
|
2001-08-06 21:49:06 +00:00
|
|
|
fprintf(stderr, " -l Show fingerprint of key file.\n");
|
2005-05-26 01:59:06 +00:00
|
|
|
fprintf(stderr, " -M memory Amount of memory (MB) to use for generating DH-GEX moduli.\n");
|
2001-08-06 21:49:06 +00:00
|
|
|
fprintf(stderr, " -N phrase Provide new passphrase.\n");
|
|
|
|
fprintf(stderr, " -P phrase Provide old passphrase.\n");
|
2005-05-26 01:59:06 +00:00
|
|
|
fprintf(stderr, " -p Change passphrase of private key file.\n");
|
|
|
|
fprintf(stderr, " -q Quiet.\n");
|
|
|
|
fprintf(stderr, " -R hostname Remove host from known_hosts file.\n");
|
2003-05-15 00:19:46 +00:00
|
|
|
fprintf(stderr, " -r hostname Print DNS resource record.\n");
|
2005-05-26 01:59:06 +00:00
|
|
|
fprintf(stderr, " -S start Start point (hex) for generating DH-GEX moduli.\n");
|
|
|
|
fprintf(stderr, " -T file Screen candidates for DH-GEX moduli.\n");
|
|
|
|
fprintf(stderr, " -t type Specify type of key to create.\n");
|
2001-08-06 21:49:06 +00:00
|
|
|
#ifdef SMARTCARD
|
|
|
|
fprintf(stderr, " -U reader Upload private key to smartcard.\n");
|
|
|
|
#endif /* SMARTCARD */
|
2005-05-26 01:59:06 +00:00
|
|
|
fprintf(stderr, " -v Verbose.\n");
|
|
|
|
fprintf(stderr, " -W gen Generator to use for generating DH-GEX moduli.\n");
|
|
|
|
fprintf(stderr, " -y Read private key file and print public key.\n");
|
2003-08-02 12:40:07 +00:00
|
|
|
|
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
|
2007-01-05 05:22:57 +00:00
|
|
|
main(int argc, char **argv)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2002-01-22 12:05:08 +00:00
|
|
|
char dotsshdir[MAXPATHLEN], comment[1024], *passphrase1, *passphrase2;
|
2003-09-08 23:11:33 +00:00
|
|
|
char out_file[MAXPATHLEN], *reader_id = NULL;
|
2005-03-01 10:48:35 +00:00
|
|
|
char *rr_hostname = 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;
|
2005-05-26 02:16:18 +00:00
|
|
|
int opt, type, fd, download = 0;
|
2005-06-01 13:02:25 +00:00
|
|
|
u_int32_t memory = 0, generator_wanted = 0, trials = 100;
|
2003-08-02 12:40:07 +00:00
|
|
|
int do_gen_candidates = 0, do_screen_candidates = 0;
|
2003-12-31 00:34:51 +00:00
|
|
|
int log_level = SYSLOG_LEVEL_INFO;
|
2003-08-02 12:40:07 +00:00
|
|
|
BIGNUM *start = NULL;
|
1999-11-24 13:26:21 +00:00
|
|
|
FILE *f;
|
2005-05-26 02:19:39 +00:00
|
|
|
const char *errstr;
|
2000-11-13 11:57:25 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
extern int optind;
|
|
|
|
extern char *optarg;
|
|
|
|
|
2005-10-03 08:11:24 +00:00
|
|
|
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
|
|
|
|
sanitise_stdfd();
|
|
|
|
|
2007-01-13 23:19:59 +00:00
|
|
|
__progname = ssh_get_progname(argv[0]);
|
2000-07-09 12:42:32 +00:00
|
|
|
|
2000-06-07 09:55:44 +00:00
|
|
|
SSLeay_add_all_algorithms();
|
2007-01-05 05:22:57 +00:00
|
|
|
log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
|
2003-08-02 12:40:07 +00:00
|
|
|
|
2002-07-20 19:05:40 +00:00
|
|
|
init_rng();
|
|
|
|
seed_rng();
|
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
|
|
|
|
2007-01-05 05:22:57 +00:00
|
|
|
while ((opt = getopt(argc, argv,
|
2005-03-01 10:48:35 +00:00
|
|
|
"degiqpclBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) {
|
1999-11-24 13:26:21 +00:00
|
|
|
switch (opt) {
|
|
|
|
case 'b':
|
2006-03-26 03:27:57 +00:00
|
|
|
bits = (u_int32_t)strtonum(optarg, 768, 32768, &errstr);
|
2005-05-26 02:19:39 +00:00
|
|
|
if (errstr)
|
|
|
|
fatal("Bits has bad value %s (%s)",
|
|
|
|
optarg, errstr);
|
1999-11-24 13:26:21 +00:00
|
|
|
break;
|
2005-03-01 10:48:35 +00:00
|
|
|
case 'F':
|
|
|
|
find_host = 1;
|
|
|
|
rr_hostname = optarg;
|
|
|
|
break;
|
|
|
|
case 'H':
|
|
|
|
hash_hosts = 1;
|
|
|
|
break;
|
|
|
|
case 'R':
|
|
|
|
delete_host = 1;
|
|
|
|
rr_hostname = optarg;
|
|
|
|
break;
|
1999-11-24 13:26:21 +00:00
|
|
|
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':
|
2005-05-26 02:16:18 +00:00
|
|
|
if (strlcpy(identity_file, optarg, sizeof(identity_file)) >=
|
|
|
|
sizeof(identity_file))
|
|
|
|
fatal("Identity filename too long");
|
1999-11-24 13:26:21 +00:00
|
|
|
have_identity = 1;
|
|
|
|
break;
|
2003-05-15 00:19:46 +00:00
|
|
|
case 'g':
|
|
|
|
print_generic = 1;
|
|
|
|
break;
|
1999-11-24 13:26:21 +00:00
|
|
|
case 'P':
|
|
|
|
identity_passphrase = optarg;
|
|
|
|
break;
|
|
|
|
case 'N':
|
|
|
|
identity_new_passphrase = optarg;
|
|
|
|
break;
|
|
|
|
case 'C':
|
|
|
|
identity_comment = optarg;
|
|
|
|
break;
|
|
|
|
case 'q':
|
|
|
|
quiet = 1;
|
|
|
|
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;
|
2006-03-26 03:07:26 +00:00
|
|
|
/*FALLTHROUGH*/
|
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;
|
2003-12-31 00:34:51 +00:00
|
|
|
case 'v':
|
|
|
|
if (log_level == SYSLOG_LEVEL_INFO)
|
|
|
|
log_level = SYSLOG_LEVEL_DEBUG1;
|
|
|
|
else {
|
2004-07-17 06:12:08 +00:00
|
|
|
if (log_level >= SYSLOG_LEVEL_DEBUG1 &&
|
2003-12-31 00:34:51 +00:00
|
|
|
log_level < SYSLOG_LEVEL_DEBUG3)
|
|
|
|
log_level++;
|
|
|
|
}
|
|
|
|
break;
|
2003-05-15 00:19:46 +00:00
|
|
|
case 'r':
|
2005-03-01 10:48:35 +00:00
|
|
|
rr_hostname = optarg;
|
2003-05-15 00:19:46 +00:00
|
|
|
break;
|
2003-08-02 12:40:07 +00:00
|
|
|
case 'W':
|
2006-03-26 03:27:57 +00:00
|
|
|
generator_wanted = (u_int32_t)strtonum(optarg, 1,
|
|
|
|
UINT_MAX, &errstr);
|
2005-05-26 02:16:18 +00:00
|
|
|
if (errstr)
|
|
|
|
fatal("Desired generator has bad value: %s (%s)",
|
|
|
|
optarg, errstr);
|
2003-08-02 12:40:07 +00:00
|
|
|
break;
|
|
|
|
case 'a':
|
2006-03-26 03:27:57 +00:00
|
|
|
trials = (u_int32_t)strtonum(optarg, 1, UINT_MAX, &errstr);
|
2005-05-26 02:16:18 +00:00
|
|
|
if (errstr)
|
|
|
|
fatal("Invalid number of trials: %s (%s)",
|
|
|
|
optarg, errstr);
|
2003-08-02 12:40:07 +00:00
|
|
|
break;
|
|
|
|
case 'M':
|
2006-03-26 03:27:57 +00:00
|
|
|
memory = (u_int32_t)strtonum(optarg, 1, UINT_MAX, &errstr);
|
2005-05-26 02:16:18 +00:00
|
|
|
if (errstr) {
|
|
|
|
fatal("Memory limit is %s: %s", errstr, optarg);
|
|
|
|
}
|
2003-08-02 12:40:07 +00:00
|
|
|
break;
|
|
|
|
case 'G':
|
|
|
|
do_gen_candidates = 1;
|
2005-05-26 02:16:18 +00:00
|
|
|
if (strlcpy(out_file, optarg, sizeof(out_file)) >=
|
|
|
|
sizeof(out_file))
|
|
|
|
fatal("Output filename too long");
|
2003-08-02 12:40:07 +00:00
|
|
|
break;
|
|
|
|
case 'T':
|
|
|
|
do_screen_candidates = 1;
|
2005-05-26 02:16:18 +00:00
|
|
|
if (strlcpy(out_file, optarg, sizeof(out_file)) >=
|
|
|
|
sizeof(out_file))
|
|
|
|
fatal("Output filename too long");
|
2003-08-02 12:40:07 +00:00
|
|
|
break;
|
|
|
|
case 'S':
|
|
|
|
/* XXX - also compare length against bits */
|
|
|
|
if (BN_hex2bn(&start, optarg) == 0)
|
|
|
|
fatal("Invalid start point.");
|
|
|
|
break;
|
1999-11-24 13:26:21 +00:00
|
|
|
case '?':
|
|
|
|
default:
|
|
|
|
usage();
|
|
|
|
}
|
|
|
|
}
|
2003-12-31 00:34:51 +00:00
|
|
|
|
|
|
|
/* reinit */
|
2007-01-05 05:22:57 +00:00
|
|
|
log_init(argv[0], log_level, SYSLOG_FACILITY_USER, 1);
|
2003-12-31 00:34:51 +00:00
|
|
|
|
2007-01-05 05:22:57 +00:00
|
|
|
if (optind < argc) {
|
1999-11-24 13:26:21 +00:00
|
|
|
printf("Too many arguments.\n");
|
|
|
|
usage();
|
|
|
|
}
|
|
|
|
if (change_passphrase && change_comment) {
|
|
|
|
printf("Can only have one of -p and -c.\n");
|
|
|
|
usage();
|
|
|
|
}
|
2008-06-08 02:54:29 +00:00
|
|
|
if (print_fingerprint && (delete_host || hash_hosts)) {
|
|
|
|
printf("Cannot use -l with -D or -R.\n");
|
|
|
|
usage();
|
|
|
|
}
|
2005-03-01 10:48:35 +00:00
|
|
|
if (delete_host || hash_hosts || find_host)
|
|
|
|
do_known_hosts(pw, rr_hostname);
|
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);
|
2002-03-11 11:53:29 +00:00
|
|
|
if (change_comment)
|
|
|
|
do_change_comment(pw);
|
2002-07-20 19:05:40 +00:00
|
|
|
if (convert_to_ssh2)
|
|
|
|
do_convert_to_ssh2(pw);
|
|
|
|
if (convert_from_ssh2)
|
|
|
|
do_convert_from_ssh2(pw);
|
2000-04-29 13:57:08 +00:00
|
|
|
if (print_public)
|
|
|
|
do_print_public(pw);
|
2005-03-01 10:48:35 +00:00
|
|
|
if (rr_hostname != NULL) {
|
2006-03-26 02:48:01 +00:00
|
|
|
unsigned int n = 0;
|
|
|
|
|
|
|
|
if (have_identity) {
|
|
|
|
n = do_print_resource_record(pw,
|
|
|
|
identity_file, rr_hostname);
|
|
|
|
if (n == 0) {
|
|
|
|
perror(identity_file);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
exit(0);
|
|
|
|
} else {
|
|
|
|
|
|
|
|
n += do_print_resource_record(pw,
|
|
|
|
_PATH_HOST_RSA_KEY_FILE, rr_hostname);
|
|
|
|
n += do_print_resource_record(pw,
|
|
|
|
_PATH_HOST_DSA_KEY_FILE, rr_hostname);
|
|
|
|
|
|
|
|
if (n == 0)
|
|
|
|
fatal("no keys found.");
|
|
|
|
exit(0);
|
|
|
|
}
|
2003-05-15 00:19:46 +00:00
|
|
|
}
|
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
|
|
|
|
2003-08-02 12:40:07 +00:00
|
|
|
if (do_gen_candidates) {
|
|
|
|
FILE *out = fopen(out_file, "w");
|
2003-11-21 12:56:47 +00:00
|
|
|
|
2003-08-02 12:40:07 +00:00
|
|
|
if (out == NULL) {
|
|
|
|
error("Couldn't open modulus candidate file \"%s\": %s",
|
|
|
|
out_file, strerror(errno));
|
|
|
|
return (1);
|
|
|
|
}
|
2005-11-05 03:52:18 +00:00
|
|
|
if (bits == 0)
|
|
|
|
bits = DEFAULT_BITS;
|
2003-08-02 12:40:07 +00:00
|
|
|
if (gen_candidates(out, memory, bits, start) != 0)
|
2005-11-05 04:07:33 +00:00
|
|
|
fatal("modulus candidate generation failed");
|
2003-08-02 12:40:07 +00:00
|
|
|
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (do_screen_candidates) {
|
|
|
|
FILE *in;
|
|
|
|
FILE *out = fopen(out_file, "w");
|
|
|
|
|
|
|
|
if (have_identity && strcmp(identity_file, "-") != 0) {
|
|
|
|
if ((in = fopen(identity_file, "r")) == NULL) {
|
|
|
|
fatal("Couldn't open modulus candidate "
|
2003-11-21 12:48:55 +00:00
|
|
|
"file \"%s\": %s", identity_file,
|
2003-08-02 12:40:07 +00:00
|
|
|
strerror(errno));
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
in = stdin;
|
|
|
|
|
|
|
|
if (out == NULL) {
|
|
|
|
fatal("Couldn't open moduli file \"%s\": %s",
|
|
|
|
out_file, strerror(errno));
|
|
|
|
}
|
|
|
|
if (prime_test(in, out, trials, generator_wanted) != 0)
|
2005-11-05 04:07:33 +00:00
|
|
|
fatal("modulus screening failed");
|
2003-08-21 06:44:07 +00:00
|
|
|
return (0);
|
2003-08-02 12:40:07 +00:00
|
|
|
}
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
arc4random_stir();
|
|
|
|
|
2005-11-05 04:15:49 +00:00
|
|
|
if (key_type_name == NULL)
|
|
|
|
key_type_name = "rsa";
|
|
|
|
|
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
|
|
|
}
|
2005-11-05 03:52:18 +00:00
|
|
|
if (bits == 0)
|
|
|
|
bits = (type == KEY_DSA) ? DEFAULT_BITS_DSA : DEFAULT_BITS;
|
2005-11-29 01:45:32 +00:00
|
|
|
if (type == KEY_DSA && bits != 1024)
|
|
|
|
fatal("DSA keys must be 1024 bits");
|
2005-11-29 02:10:24 +00:00
|
|
|
if (!quiet)
|
|
|
|
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");
|
|
|
|
|
2005-11-05 04:14:59 +00:00
|
|
|
/* 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);
|
- grunk@cvs.openbsd.org 2008/06/11 21:01:35
[ssh_config.5 key.h readconf.c readconf.h ssh-keygen.1 ssh-keygen.c key.c
sshconnect.c]
Introduce SSH Fingerprint ASCII Visualization, a technique inspired by the
graphical hash visualization schemes known as "random art", and by
Dan Kaminsky's musings on the subject during a BlackOp talk at the
23C3 in Berlin.
Scientific publication (original paper):
"Hash Visualization: a New Technique to improve Real-World Security",
Perrig A. and Song D., 1999, International Workshop on Cryptographic
Techniques and E-Commerce (CrypTEC '99)
http://sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf
The algorithm used here is a worm crawling over a discrete plane,
leaving a trace (augmenting the field) everywhere it goes.
Movement is taken from dgst_raw 2bit-wise. Bumping into walls
makes the respective movement vector be ignored for this turn,
thus switching to the other color of the chessboard.
Graphs are not unambiguous for now, because circles in graphs can be
walked in either direction.
discussions with several people,
help, corrections and ok markus@ djm@
2008-06-12 18:40:35 +00:00
|
|
|
char *ra = key_fingerprint(public, SSH_FP_MD5,
|
|
|
|
SSH_FP_RANDOMART);
|
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);
|
- grunk@cvs.openbsd.org 2008/06/11 21:01:35
[ssh_config.5 key.h readconf.c readconf.h ssh-keygen.1 ssh-keygen.c key.c
sshconnect.c]
Introduce SSH Fingerprint ASCII Visualization, a technique inspired by the
graphical hash visualization schemes known as "random art", and by
Dan Kaminsky's musings on the subject during a BlackOp talk at the
23C3 in Berlin.
Scientific publication (original paper):
"Hash Visualization: a New Technique to improve Real-World Security",
Perrig A. and Song D., 1999, International Workshop on Cryptographic
Techniques and E-Commerce (CrypTEC '99)
http://sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf
The algorithm used here is a worm crawling over a discrete plane,
leaving a trace (augmenting the field) everywhere it goes.
Movement is taken from dgst_raw 2bit-wise. Bumping into walls
makes the respective movement vector be ignored for this turn,
thus switching to the other color of the chessboard.
Graphs are not unambiguous for now, because circles in graphs can be
walked in either direction.
discussions with several people,
help, corrections and ok markus@ djm@
2008-06-12 18:40:35 +00:00
|
|
|
printf("The key's randomart image is:\n");
|
|
|
|
printf("%s\n", ra);
|
|
|
|
xfree(ra);
|
2001-03-13 04:57:58 +00:00
|
|
|
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
|
|
|
}
|