src/usr.bin/ssh/ssh-keygen.c - diff

Return to ssh-keygen.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh-keygen.c between version 1.128.2.2 and 1.136

version 1.128.2.2, 2006/10/06 03:19:33

version 1.136, 2006/02/20 17:19:54

Line 1

/* $OpenBSD$ */

* Author: Tatu Ylonen <ylo@cs.hut.fi>

Line 12

Line 11

* called by a name other than "ssh" or "Secure Shell".

#include "includes.h"

RCSID("$OpenBSD$");

#include <sys/types.h>

#include <sys/stat.h>

#include <sys/socket.h>

#include <sys/param.h>

#include <openssl/evp.h>

#include <openssl/pem.h>

#include <errno.h>

#include <fcntl.h>

#include <pwd.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>

#include "xmalloc.h"

#include "key.h"

#include "rsa.h"

#include "authfile.h"

#include "uuencode.h"

#include "buffer.h"

#include "bufaux.h"

#include "pathnames.h"

#include "log.h"

#include "misc.h"

#include "match.h"

#include "hostfile.h"

#include "dns.h"

#ifdef SMARTCARD

#include "scard.h"

#endif

#include "dns.h"

/* Number of bits in the RSA/DSA key. This value can be set on the command line. */

#define DEFAULT_BITS 2048

Line 113

Line 106

if (key_type_name == NULL)

name = _PATH_SSH_CLIENT_ID_RSA;

else {

else

switch (key_type_from_name(key_type_name)) {

case KEY_RSA1:

name = _PATH_SSH_CLIENT_IDENTITY;

Line 129

Line 122

exit(1);

break;

}

snprintf(identity_file, sizeof(identity_file), "%s/%s", pw->pw_dir, name);

fprintf(stderr, "%s (%s): ", prompt, identity_file);

if (fgets(buf, sizeof(buf), stdin) == NULL)

Line 312

Line 305

return key;

}

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);

}

switch (c) {

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';

}

if (c == EOF)

return -1;

return pos;

}

static void

do_convert_from_ssh2(struct passwd *pw)

{

Key *k;

int blen;

u_int len;

char line[1024];

char line[1024], *p;

u_char blob[8096];

char encoded[8096];

struct stat st;

Line 368

Line 330

exit(1);

}

encoded[0] = '\0';

while ((blen = get_line(fp, line, sizeof(line))) != -1) {

while (fgets(line, sizeof(line), fp)) {

if (line[blen - 1] == '\\')

if (!(p = strchr(line, '\n'))) {

fprintf(stderr, "input line too long.\n");

exit(1);

}

if (p > line && p[-1] == '\\')

escaped++;

if (strncmp(line, "----", 4) == 0 ||

strstr(line, ": ") != NULL) {

Line 386

Line 352

/* fprintf(stderr, "escaped: %s", line); */

continue;

}

*p = '\0';

strlcat(encoded, line, sizeof(encoded));

}

len = strlen(encoded);

Line 521

Line 488

xfree(fp);

exit(0);

}

if (comment) {

if (comment)

xfree(comment);

comment = NULL;

}

f = fopen(identity_file, "r");

if (f != NULL) {

Line 870

Line 835

* Print the SSHFP RR.

static int

static void

do_print_resource_record(struct passwd *pw, char *fname, char *hname)

do_print_resource_record(struct passwd *pw, char *hname)

{

Key *public;

char *comment = NULL;

struct stat st;

if (fname == NULL)

if (!have_identity)

ask_filename(pw, "Enter file in which the key is");

if (stat(fname, &st) < 0) {

if (stat(identity_file, &st) < 0) {

if (errno == ENOENT)

perror(identity_file);

return 0;

perror(fname);

exit(1);

}

public = key_load_public(fname, &comment);

public = key_load_public(identity_file, &comment);

if (public != NULL) {

export_dns_rr(hname, public, stdout, print_generic);

key_free(public);

xfree(comment);

return 1;

exit(0);

}

if (comment)

xfree(comment);

printf("failed to read v2 public key from %s.\n", fname);

printf("failed to read v2 public key from %s.\n", identity_file);

exit(1);

}

Line 1081

Line 1044

"degiqpclBHvxXyF:b:f:t:U:D:P:N:C:r:g:R:T:G:M:S:a:W:")) != -1) {

switch (opt) {

case 'b':

bits = (u_int32_t)strtonum(optarg, 768, 32768, &errstr);

bits = strtonum(optarg, 768, 32768, &errstr);

if (errstr)

fatal("Bits has bad value %s (%s)",

optarg, errstr);

Line 1151

Line 1114

break;

case 'D':

download = 1;

/*FALLTHROUGH*/

case 'U':

reader_id = optarg;

break;

Line 1168

Line 1130

rr_hostname = optarg;

break;

case 'W':

generator_wanted = (u_int32_t)strtonum(optarg, 1,

generator_wanted = strtonum(optarg, 1, UINT_MAX, &errstr);

UINT_MAX, &errstr);

if (errstr)

fatal("Desired generator has bad value: %s (%s)",

optarg, errstr);

break;

case 'a':

trials = (u_int32_t)strtonum(optarg, 1, UINT_MAX, &errstr);

trials = strtonum(optarg, 1, UINT_MAX, &errstr);

if (errstr)

fatal("Invalid number of trials: %s (%s)",

optarg, errstr);

break;

case 'M':

memory = (u_int32_t)strtonum(optarg, 1, UINT_MAX, &errstr);

memory = strtonum(optarg, 1, UINT_MAX, &errstr);

if (errstr) {

fatal("Memory limit is %s: %s", errstr, optarg);

}

Line 1235

Line 1196

if (print_public)

do_print_public(pw);

if (rr_hostname != NULL) {

unsigned int n = 0;

do_print_resource_record(pw, rr_hostname);

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);

}

if (reader_id != NULL) {

#ifdef SMARTCARD