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.40 and 1.45

version 1.40, 2001/01/19 15:55:11

version 1.45, 2001/02/22 08:03:51

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 127

Line 124

#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 531

Line 528

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 603

Line 601

void

usage(void)

{

printf("Usage: %s [-lpqxXyc] [-t type] [-b bits] [-f file] [-C comment] [-N new-pass] [-P pass]\n", __progname);

printf("Usage: %s [-lpqxXyc] [-t type] [-b bits] [-f file] [-C comment] "

"[-N new-pass] [-P pass]\n", __progname);

exit(1);

}