*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.55 2001/04/05 10:42:54 markus Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.65 2001/06/24 05:35:33 markus Exp $");
#include <openssl/evp.h>
#include <openssl/pem.h>
char hostname[MAXHOSTNAMELEN];
-void
+static void
ask_filename(struct passwd *pw, const char *prompt)
{
char buf[1024];
have_identity = 1;
}
-Key *
-try_load_pem_key(char *filename)
+static Key *
+load_identity(char *filename)
{
char *pass;
Key *prv;
prv = key_load_private(filename, "", NULL);
if (prv == NULL) {
- pass = read_passphrase("Enter passphrase: ", 1);
+ if (identity_passphrase)
+ pass = xstrdup(identity_passphrase);
+ else
+ pass = read_passphrase("Enter passphrase: ",
+ RP_ALLOW_STDIN);
prv = key_load_private(filename, pass, NULL);
memset(pass, 0, strlen(pass));
xfree(pass);
#define SSH_COM_PRIVATE_BEGIN "---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----"
#define SSH_COM_PRIVATE_KEY_MAGIC 0x3f6ff9eb
-void
+static void
do_convert_to_ssh2(struct passwd *pw)
{
- Key *prv;
+ Key *k;
int len;
u_char *blob;
struct stat st;
perror(identity_file);
exit(1);
}
- prv = try_load_pem_key(identity_file);
- if (prv == NULL) {
- fprintf(stderr, "load failed\n");
- exit(1);
+ if ((k = key_load_public(identity_file, NULL)) == NULL) {
+ if ((k = load_identity(identity_file)) == NULL) {
+ fprintf(stderr, "load failed\n");
+ exit(1);
+ }
}
- key_to_blob(prv, &blob, &len);
+ key_to_blob(k, &blob, &len);
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN);
fprintf(stdout,
"Comment: \"%d-bit %s, converted from OpenSSH by %s@%s\"\n",
- key_size(prv), key_type(prv),
+ key_size(k), key_type(k),
pw->pw_name, hostname);
dump_base64(stdout, blob, len);
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_END);
- key_free(prv);
+ key_free(k);
xfree(blob);
exit(0);
}
-void
+static void
buffer_get_bignum_bits(Buffer *b, BIGNUM *value)
{
int bits = buffer_get_int(b);
buffer_consume(b, bytes);
}
-Key *
+static Key *
do_convert_private_ssh2_from_blob(char *blob, int blen)
{
Buffer b;
Key *key = NULL;
- int ignore, magic, rlen, ktype;
char *type, *cipher;
+ u_char *sig, data[10] = "abcde12345";
+ int magic, rlen, ktype, i1, i2, i3, i4;
+ u_int slen;
+ u_long e;
buffer_init(&b);
buffer_append(&b, blob, blen);
buffer_free(&b);
return NULL;
}
- ignore = buffer_get_int(&b);
+ i1 = buffer_get_int(&b);
type = buffer_get_string(&b, NULL);
cipher = buffer_get_string(&b, NULL);
- ignore = buffer_get_int(&b);
- ignore = buffer_get_int(&b);
- ignore = buffer_get_int(&b);
-
+ 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);
if (strcmp(cipher, "none") != 0) {
error("unsupported cipher %s", cipher);
xfree(cipher);
buffer_get_bignum_bits(&b, key->dsa->priv_key);
break;
case KEY_RSA:
- if (!BN_set_word(key->rsa->e, (u_long) buffer_get_char(&b))) {
+ e = buffer_get_char(&b);
+ debug("e %lx", e);
+ if (e < 30) {
+ e <<= 8;
+ e += buffer_get_char(&b);
+ debug("e %lx", e);
+ e <<= 8;
+ e += buffer_get_char(&b);
+ debug("e %lx", e);
+ }
+ if (!BN_set_word(key->rsa->e, e)) {
buffer_free(&b);
key_free(key);
return NULL;
error("do_convert_private_ssh2_from_blob: "
"remaining bytes in key blob %d", rlen);
buffer_free(&b);
-#ifdef DEBUG_PK
- {
- u_int slen;
- u_char *sig, data[10] = "abcde12345";
- key_sign(key, &sig, &slen, data, sizeof data);
- key_verify(key, sig, slen, data, sizeof data);
- xfree(sig);
- }
-#endif
+ /* try the key */
+ key_sign(key, &sig, &slen, data, sizeof(data));
+ key_verify(key, sig, slen, data, sizeof(data));
+ xfree(sig);
return key;
}
-void
+static void
do_convert_from_ssh2(struct passwd *pw)
{
Key *k;
strstr(line, ": ") != NULL) {
if (strstr(line, SSH_COM_PRIVATE_BEGIN) != NULL)
private = 1;
- fprintf(stderr, "ignore: %s", line);
+ if (strstr(line, " END ") != NULL) {
+ break;
+ }
+ /* fprintf(stderr, "ignore: %s", line); */
continue;
}
if (escaped) {
escaped--;
- fprintf(stderr, "escaped: %s", line);
+ /* fprintf(stderr, "escaped: %s", line); */
continue;
}
*p = '\0';
exit(0);
}
-void
+static void
do_print_public(struct passwd *pw)
{
Key *prv;
perror(identity_file);
exit(1);
}
- prv = try_load_pem_key(identity_file);
+ prv = load_identity(identity_file);
if (prv == NULL) {
fprintf(stderr, "load failed\n");
exit(1);
exit(0);
}
-void
+static void
do_fingerprint(struct passwd *pw)
{
FILE *f;
* Perform changing a passphrase. The argument is the passwd structure
* for the current user.
*/
-void
+static void
do_change_passphrase(struct passwd *pw)
{
char *comment;
if (identity_passphrase)
old_passphrase = xstrdup(identity_passphrase);
else
- old_passphrase = read_passphrase("Enter old passphrase: ", 1);
- private = key_load_private(identity_file, old_passphrase , &comment);
+ old_passphrase =
+ read_passphrase("Enter old passphrase: ",
+ RP_ALLOW_STDIN);
+ private = key_load_private(identity_file, old_passphrase,
+ &comment);
memset(old_passphrase, 0, strlen(old_passphrase));
xfree(old_passphrase);
if (private == NULL) {
passphrase2 = NULL;
} else {
passphrase1 =
- read_passphrase("Enter new passphrase (empty for no passphrase): ", 1);
- passphrase2 = read_passphrase("Enter same passphrase again: ", 1);
+ read_passphrase("Enter new passphrase (empty for no "
+ "passphrase): ", RP_ALLOW_STDIN);
+ passphrase2 = read_passphrase("Enter same passphrase again: ",
+ RP_ALLOW_STDIN);
/* Verify that they are the same. */
if (strcmp(passphrase1, passphrase2) != 0) {
/* Save the file using the new passphrase. */
if (!key_save_private(private, identity_file, passphrase1, comment)) {
- printf("Saving the key failed: %s: %s.\n",
- identity_file, strerror(errno));
+ printf("Saving the key failed: %s.\n", identity_file);
memset(passphrase1, 0, strlen(passphrase1));
xfree(passphrase1);
key_free(private);
/*
* Change the comment of a private key file.
*/
-void
+static void
do_change_comment(struct passwd *pw)
{
char new_comment[1024], *comment, *passphrase;
else if (identity_new_passphrase)
passphrase = xstrdup(identity_new_passphrase);
else
- passphrase = read_passphrase("Enter passphrase: ", 1);
+ passphrase = read_passphrase("Enter passphrase: ",
+ RP_ALLOW_STDIN);
/* Try to load using the passphrase. */
private = key_load_private(identity_file, passphrase, &comment);
if (private == NULL) {
/* Save the file using the new passphrase. */
if (!key_save_private(private, identity_file, passphrase, new_comment)) {
- printf("Saving the key failed: %s: %s.\n",
- identity_file, strerror(errno));
+ printf("Saving the key failed: %s.\n", identity_file);
memset(passphrase, 0, strlen(passphrase));
xfree(passphrase);
key_free(private);
exit(0);
}
-void
+static void
usage(void)
{
- printf("Usage: %s [-lBpqxXyc] [-t type] [-b bits] [-f file] [-C comment] "
+ printf("Usage: %s [-ceilpqyB] [-t type] [-b bits] [-f file] [-C comment] "
"[-N new-pass] [-P pass]\n", __progname);
exit(1);
}
exit(1);
}
- while ((opt = getopt(ac, av, "dqpclBRxXyb:f:t:P:N:C:")) != -1) {
+ while ((opt = getopt(ac, av, "deiqpclBRxXyb:f:t:P:N:C:")) != -1) {
switch (opt) {
case 'b':
bits = atoi(optarg);
exit(0);
break;
+ case 'e':
case 'x':
+ /* export key */
convert_to_ssh2 = 1;
break;
+ case 'i':
case 'X':
+ /* import key */
convert_from_ssh2 = 1;
break;
else {
passphrase_again:
passphrase1 =
- read_passphrase("Enter passphrase (empty for no passphrase): ", 1);
- passphrase2 = read_passphrase("Enter same passphrase again: ", 1);
+ read_passphrase("Enter passphrase (empty for no "
+ "passphrase): ", RP_ALLOW_STDIN);
+ passphrase2 = read_passphrase("Enter same passphrase again: ",
+ RP_ALLOW_STDIN);
if (strcmp(passphrase1, passphrase2) != 0) {
- /* The passphrases do not match. Clear them and retry. */
+ /*
+ * The passphrases do not match. Clear them and
+ * retry.
+ */
memset(passphrase1, 0, strlen(passphrase1));
memset(passphrase2, 0, strlen(passphrase2));
xfree(passphrase1);
/* Save the key with the given passphrase and comment. */
if (!key_save_private(private, identity_file, passphrase1, comment)) {
- printf("Saving the key failed: %s: %s.\n",
- identity_file, strerror(errno));
+ printf("Saving the key failed: %s.\n", identity_file);
memset(passphrase1, 0, strlen(passphrase1));
xfree(passphrase1);
exit(1);
andersk / openssh.git / blobdiff