version 1.134, 2005/11/28 05:16:53 |
version 1.137, 2006/03/13 08:43:16 |
|
|
#include "includes.h" |
#include "includes.h" |
RCSID("$OpenBSD$"); |
RCSID("$OpenBSD$"); |
|
|
|
#include <sys/types.h> |
|
#include <sys/stat.h> |
|
|
#include <openssl/evp.h> |
#include <openssl/evp.h> |
#include <openssl/pem.h> |
#include <openssl/pem.h> |
|
|
|
|
return key; |
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'; |
|
} |
|
return pos; |
|
} |
|
|
static void |
static void |
do_convert_from_ssh2(struct passwd *pw) |
do_convert_from_ssh2(struct passwd *pw) |
{ |
{ |
Key *k; |
Key *k; |
int blen; |
int blen; |
u_int len; |
u_int len; |
char line[1024], *p; |
char line[1024]; |
u_char blob[8096]; |
u_char blob[8096]; |
char encoded[8096]; |
char encoded[8096]; |
struct stat st; |
struct stat st; |
|
|
exit(1); |
exit(1); |
} |
} |
encoded[0] = '\0'; |
encoded[0] = '\0'; |
while (fgets(line, sizeof(line), fp)) { |
while ((blen = get_line(fp, line, sizeof(line))) != -1) { |
if (!(p = strchr(line, '\n'))) { |
if (line[blen - 1] == '\\') |
fprintf(stderr, "input line too long.\n"); |
|
exit(1); |
|
} |
|
if (p > line && p[-1] == '\\') |
|
escaped++; |
escaped++; |
if (strncmp(line, "----", 4) == 0 || |
if (strncmp(line, "----", 4) == 0 || |
strstr(line, ": ") != NULL) { |
strstr(line, ": ") != NULL) { |
|
|
/* fprintf(stderr, "escaped: %s", line); */ |
/* fprintf(stderr, "escaped: %s", line); */ |
continue; |
continue; |
} |
} |
*p = '\0'; |
|
strlcat(encoded, line, sizeof(encoded)); |
strlcat(encoded, line, sizeof(encoded)); |
} |
} |
len = strlen(encoded); |
len = strlen(encoded); |
|
|
fprintf(stderr, "unknown key type %s\n", key_type_name); |
fprintf(stderr, "unknown key type %s\n", key_type_name); |
exit(1); |
exit(1); |
} |
} |
|
if (bits == 0) |
|
bits = (type == KEY_DSA) ? DEFAULT_BITS_DSA : DEFAULT_BITS; |
if (type == KEY_DSA && bits != 1024) |
if (type == KEY_DSA && bits != 1024) |
fatal("DSA keys must be 1024 bits"); |
fatal("DSA keys must be 1024 bits"); |
if (!quiet) |
if (!quiet) |
printf("Generating public/private %s key pair.\n", key_type_name); |
printf("Generating public/private %s key pair.\n", key_type_name); |
if (bits == 0) |
|
bits = (type == KEY_DSA) ? DEFAULT_BITS_DSA : DEFAULT_BITS; |
|
private = key_generate(type, bits); |
private = key_generate(type, bits); |
if (private == NULL) { |
if (private == NULL) { |
fprintf(stderr, "key_generate failed"); |
fprintf(stderr, "key_generate failed"); |