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.25.2.4 and 1.39

version 1.25.2.4, 2001/03/12 15:44:16

version 1.39, 2001/01/13 18:03:07

Line 16

#include <openssl/evp.h>

#include <openssl/pem.h>

#include <openssl/rsa.h>

#include <openssl/dsa.h>

#include "ssh.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 "readpass.h"

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

int bits = 1024;

Line 81

Line 83

switch (key_type_from_name(key_type_name)) {

case KEY_RSA1:

name = _PATH_SSH_CLIENT_IDENTITY;

name = SSH_CLIENT_IDENTITY;

break;

case KEY_DSA:

name = _PATH_SSH_CLIENT_ID_DSA;

name = SSH_CLIENT_ID_DSA;

break;

case KEY_RSA:

name = _PATH_SSH_CLIENT_ID_RSA;

name = SSH_CLIENT_ID_RSA;

break;

default:

fprintf(stderr, "bad key type");

Line 124

Line 126

#define SSH_COM_PUBLIC_BEGIN "---- BEGIN SSH2 PUBLIC KEY ----"

#define SSH_COM_PUBLIC_END "---- END SSH2 PUBLIC KEY ----"

#define SSH_COM_PRIVATE_BEGIN "---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----"

#define SSH_COM_PRIVATE_KEY_MAGIC 0x3f6ff9eb

void

do_convert_to_ssh2(struct passwd *pw)

Line 528

Line 530

public = key_new(KEY_RSA1);

if (!load_public_key(identity_file, public, NULL)) {

printf("%s is not a valid key file.\n", identity_file);

printf("Comments are only supported in RSA1 keys\n");

exit(1);

}

Line 749

Line 750

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

/* Create ~/.ssh directory if it doesn\'t already exist. */

snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", pw->pw_dir, _PATH_SSH_USER_DIR);

snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", pw->pw_dir, SSH_USER_DIR);

if (strstr(identity_file, dotsshdir) != NULL &&

stat(dotsshdir, &st) < 0) {

if (mkdir(dotsshdir, 0700) < 0)