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.152 and 1.160

version 1.152, 2006/07/26 13:57:17

version 1.160, 2007/01/21 01:41:54

Line 12

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

#include "includes.h"

#include <sys/types.h>

#include <sys/stat.h>

#include <sys/socket.h>

#include <sys/param.h>

#include <openssl/evp.h>

Line 24

Line 23

#include <errno.h>

#include <fcntl.h>

#include <pwd.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>

Line 34

#include "authfile.h"

#include "uuencode.h"

#include "buffer.h"

#include "bufaux.h"

#include "pathnames.h"

#include "log.h"

#include "misc.h"

Line 216

Line 215

if (buffer_len(b) < bytes)

fatal("buffer_get_bignum_bits: input buffer too small: "

"need %d have %d", bytes, buffer_len(b));

BN_bin2bn(buffer_ptr(b), bytes, value);

if (BN_bin2bn(buffer_ptr(b), bytes, value) == NULL)

fatal("buffer_get_bignum_bits: BN_bin2bn failed");

buffer_consume(b, bytes);

}

Line 234

buffer_init(&b);

buffer_append(&b, blob, blen);

magic = buffer_get_int(&b);

if (magic != SSH_COM_PRIVATE_KEY_MAGIC) {

error("bad magic 0x%x != 0x%x", magic, SSH_COM_PRIVATE_KEY_MAGIC);

buffer_free(&b);

Line 246

i2 = buffer_get_int(&b);

i3 = buffer_get_int(&b);

i4 = buffer_get_int(&b);

debug("ignore (%d %d %d %d)", i1,i2,i3,i4);

debug("ignore (%d %d %d %d)", i1, i2, i3, i4);

if (strcmp(cipher, "none") != 0) {

error("unsupported cipher %s", cipher);

xfree(cipher);

Line 277

buffer_get_bignum_bits(&b, key->dsa->priv_key);

break;

case KEY_RSA:

e = buffer_get_char(&b);

debug("e %lx", e);

if (e < 30) {

e <<= 8;

Line 339

line[pos++] = c;

line[pos] = '\0';

}

if (c == EOF)

/* We reached EOF */

return -1;

return pos;

}

static void

Line 547

Line 546

for (cp = line; *cp == ' ' || *cp == '\t'; cp++)

;

if (!*cp || *cp == '\n' || *cp == '#')

continue ;

continue;

i = strtol(cp, &ep, 10);

if (i == 0 || ep == NULL || (*ep != ' ' && *ep != '\t')) {

int quoted = 0;

Line 1010

Line 1009

#ifdef SMARTCARD

fprintf(stderr, " -D reader Download public key from smartcard.\n");

#endif /* SMARTCARD */

fprintf(stderr, " -e Convert OpenSSH to IETF SECSH key file.\n");

fprintf(stderr, " -e Convert OpenSSH to RFC 4716 key file.\n");

fprintf(stderr, " -F hostname Find hostname in known hosts file.\n");

fprintf(stderr, " -f filename Filename of the key file.\n");

fprintf(stderr, " -G file Generate candidates for DH-GEX moduli.\n");

fprintf(stderr, " -g Use generic DNS resource record format.\n");

fprintf(stderr, " -H Hash names in known_hosts file.\n");

fprintf(stderr, " -i Convert IETF SECSH to OpenSSH key file.\n");

fprintf(stderr, " -i Convert RFC 4716 to OpenSSH key file.\n");

fprintf(stderr, " -l Show fingerprint of key file.\n");

fprintf(stderr, " -M memory Amount of memory (MB) to use for generating DH-GEX moduli.\n");

fprintf(stderr, " -N phrase Provide new passphrase.\n");

Line 1042

Line 1041

* Main program for key management.

int

main(int ac, char **av)

main(int argc, char **argv)

{

char dotsshdir[MAXPATHLEN], comment[1024], *passphrase1, *passphrase2;

char out_file[MAXPATHLEN], *reader_id = NULL;

Line 1065

Line 1064

sanitise_stdfd();

SSLeay_add_all_algorithms();

log_init(av[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);

log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);

/* we need this for the home * directory. */

pw = getpwuid(getuid());

Line 1078

Line 1077

exit(1);

}

while ((opt = getopt(ac, av,

while ((opt = getopt(argc, argv,

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

switch (opt) {

case 'b':

Line 1211

Line 1210

}

/* reinit */

log_init(av[0], log_level, SYSLOG_FACILITY_USER, 1);

log_init(argv[0], log_level, SYSLOG_FACILITY_USER, 1);

if (optind < ac) {

if (optind < argc) {

printf("Too many arguments.\n");

usage();

}