- markus@cvs.openbsd.org 2001/04/23 21:57:07

[openssh.git] / ssh-keygen.c

diff --git a/ssh-keygen.c b/ssh-keygen.c
index b0f814475a0427b91a48f5c87fd4d3ff3295706d..8daa52833b7e2cd2a87246ac6723b8954686b6eb 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.54 2001/04/03 13:56:11 stevesk Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.59 2001/04/23 21:57:07 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/pem.h>
@@ -118,7 +118,7 @@ try_load_pem_key(char *filename)
        char *pass;
        Key *prv;
 
-       prv = key_load_private(filename, "", NULL);
+       prv = key_load_private(filename, "", NULL);
        if (prv == NULL) {
                pass = read_passphrase("Enter passphrase: ", 1);
                prv = key_load_private(filename, pass, NULL);
@@ -136,7 +136,7 @@ try_load_pem_key(char *filename)
 void
 do_convert_to_ssh2(struct passwd *pw)
 {
-       Key *prv;
+       Key *k;
        int len;
        u_char *blob;
        struct stat st;
@@ -147,20 +147,21 @@ do_convert_to_ssh2(struct passwd *pw)
                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 = try_load_pem_key(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);
 }
@@ -512,8 +513,7 @@ do_change_passphrase(struct passwd *pw)
 
        /* 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);
@@ -591,8 +591,7 @@ do_change_comment(struct passwd *pw)
 
        /* 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);
@@ -630,7 +629,7 @@ do_change_comment(struct passwd *pw)
 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);
 }
@@ -668,7 +667,7 @@ main(int ac, char **av)
                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);
@@ -720,11 +719,15 @@ main(int ac, char **av)
                        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;
 
@@ -838,8 +841,7 @@ passphrase_again:
 
        /* 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);