=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-keygen.c,v retrieving revision 1.3 retrieving revision 1.7 diff -u -r1.3 -r1.7 --- src/usr.bin/ssh/ssh-keygen.c 1999/09/28 19:42:05 1.3 +++ src/usr.bin/ssh/ssh-keygen.c 1999/11/16 22:27:54 1.7 @@ -14,11 +14,8 @@ */ #include "includes.h" -RCSID("$Id: ssh-keygen.c,v 1.3 1999/09/28 19:42:05 deraadt Exp $"); +RCSID("$Id: ssh-keygen.c,v 1.7 1999/11/16 22:27:54 markus Exp $"); -#ifndef HAVE_GETHOSTNAME -#include -#endif #include "rsa.h" #include "ssh.h" #include "xmalloc.h" @@ -58,42 +55,51 @@ /* Perform changing a passphrase. The argument is the passwd structure for the current user. */ -void -do_change_passphrase(struct passwd *pw) +char * +get_filename(struct passwd *pw, const char *prompt) { - char buf[1024], *comment; - char *old_passphrase, *passphrase1, *passphrase2; - struct stat st; - RSA *private_key; + char buf[1024], default_file[1024]; /* Read key file name. */ if (identity_file != NULL) { - strncpy(buf, identity_file, sizeof(buf)); - buf[sizeof(buf) - 1] = '\0'; + return xstrdup(identity_file); } else { - printf("Enter file in which the key is ($HOME/%s): ", SSH_CLIENT_IDENTITY); + snprintf(default_file, sizeof default_file, "%s/%s", + pw->pw_dir, SSH_CLIENT_IDENTITY); + printf("%s (%s): ", prompt, default_file); fflush(stdout); if (fgets(buf, sizeof(buf), stdin) == NULL) exit(1); if (strchr(buf, '\n')) *strchr(buf, '\n') = 0; if (strcmp(buf, "") == 0) - sprintf(buf, "%s/%s", pw->pw_dir, SSH_CLIENT_IDENTITY); + return xstrdup(default_file); } + return xstrdup(buf); +} +void +do_change_passphrase(struct passwd *pw) +{ + char *file, *comment; + char *old_passphrase, *passphrase1, *passphrase2; + struct stat st; + RSA *private_key; + + file = get_filename(pw, "Enter file in which the key is"); /* Check if the file exists. */ - if (stat(buf, &st) < 0) + if (stat(file, &st) < 0) { - perror(buf); + perror(file); exit(1); } /* Try to load the public key from the file the verify that it is readable and of the proper format. */ public_key = RSA_new(); - if (!load_public_key(buf, public_key, NULL)) + if (!load_public_key(file, public_key, NULL)) { - printf("%s is not a valid key file.\n", buf); + printf("%s is not a valid key file.\n", file); exit(1); } /* Clear the public key since we are just about to load the whole file. */ @@ -101,14 +107,14 @@ /* Try to load the file with empty passphrase. */ private_key = RSA_new(); - if (!load_private_key(buf, "", private_key, &comment)) { + if (!load_private_key(file, "", private_key, &comment)) { /* Read passphrase from the user. */ if (identity_passphrase) old_passphrase = xstrdup(identity_passphrase); else old_passphrase = read_passphrase("Enter old passphrase: ", 1); /* Try to load using the passphrase. */ - if (!load_private_key(buf, old_passphrase, private_key, &comment)) + if (!load_private_key(file, old_passphrase, private_key, &comment)) { memset(old_passphrase, 0, strlen(old_passphrase)); xfree(old_passphrase); @@ -149,10 +155,10 @@ } /* Save the file using the new passphrase. */ - if (!save_private_key(buf, passphrase1, private_key, comment)) + if (!save_private_key(file, passphrase1, private_key, comment)) { printf("Saving the key failed: %s: %s.\n", - buf, strerror(errno)); + file, strerror(errno)); memset(passphrase1, 0, strlen(passphrase1)); xfree(passphrase1); RSA_free(private_key); @@ -174,51 +180,33 @@ void do_change_comment(struct passwd *pw) { - char buf[1024], new_comment[1024], *comment; + char new_comment[1024], *file, *comment; RSA *private_key; char *passphrase; struct stat st; FILE *f; char *tmpbuf; - /* Read key file name. */ - if (identity_file) - { - strncpy(buf, identity_file, sizeof(buf)); - buf[sizeof(buf) - 1] = '\0'; - } - else - { - printf("Enter file in which the key is ($HOME/%s): ", - SSH_CLIENT_IDENTITY); - fflush(stdout); - if (fgets(buf, sizeof(buf), stdin) == NULL) - exit(1); - if (strchr(buf, '\n')) - *strchr(buf, '\n') = 0; - if (strcmp(buf, "") == 0) - sprintf(buf, "%s/%s", pw->pw_dir, SSH_CLIENT_IDENTITY); - } - + file = get_filename(pw, "Enter file in which the key is"); /* Check if the file exists. */ - if (stat(buf, &st) < 0) + if (stat(file, &st) < 0) { - perror(buf); + perror(file); exit(1); } /* Try to load the public key from the file the verify that it is readable and of the proper format. */ public_key = RSA_new(); - if (!load_public_key(buf, public_key, NULL)) + if (!load_public_key(file, public_key, NULL)) { - printf("%s is not a valid key file.\n", buf); + printf("%s is not a valid key file.\n", file); exit(1); } private_key = RSA_new(); /* Try to load the file with empty passphrase. */ - if (load_private_key(buf, "", private_key, &comment)) + if (load_private_key(file, "", private_key, &comment)) passphrase = xstrdup(""); else { @@ -231,7 +219,7 @@ else passphrase = read_passphrase("Enter passphrase: ", 1); /* Try to load using the passphrase. */ - if (!load_private_key(buf, passphrase, private_key, &comment)) + if (!load_private_key(file, passphrase, private_key, &comment)) { memset(passphrase, 0, strlen(passphrase)); xfree(passphrase); @@ -243,8 +231,7 @@ if (identity_comment) { - strncpy(new_comment, identity_comment, sizeof(new_comment)); - new_comment[sizeof(new_comment) - 1] = '\0'; + strlcpy(new_comment, identity_comment, sizeof(new_comment)); } else { @@ -263,10 +250,10 @@ } /* Save the file using the new passphrase. */ - if (!save_private_key(buf, passphrase, private_key, new_comment)) + if (!save_private_key(file, passphrase, private_key, new_comment)) { printf("Saving the key failed: %s: %s.\n", - buf, strerror(errno)); + file, strerror(errno)); memset(passphrase, 0, strlen(passphrase)); xfree(passphrase); RSA_free(private_key); @@ -281,11 +268,11 @@ /* Save the public key in text format in a file with the same name but .pub appended. */ - strcat(buf, ".pub"); - f = fopen(buf, "w"); + strcat(file, ".pub"); + f = fopen(file, "w"); if (!f) { - printf("Could not save your public key in %s\n", buf); + printf("Could not save your public key in %s\n", file); exit(1); } fprintf(f, "%d ", BN_num_bits(public_key->n)); @@ -310,18 +297,24 @@ { char buf[16384], buf2[1024], *passphrase1, *passphrase2; struct passwd *pw; - char *tmpbuf; + char *file, *tmpbuf; int opt; struct stat st; FILE *f; -#ifdef HAVE_GETHOSTNAME - char hostname[257]; -#else - struct utsname uts; -#endif + char hostname[MAXHOSTNAMELEN]; extern int optind; extern char *optarg; + /* check if RSA support exists */ + if (rsa_alive() == 0) { + extern char *__progname; + + fprintf(stderr, + "%s: no RSA support in libssl and libcrypto. See ssl(8).\n", + __progname); + exit(1); + } + /* Get user\'s passwd structure. We need this for the home directory. */ pw = getpwuid(getuid()); if (!pw) @@ -331,7 +324,7 @@ } /* Create ~/.ssh directory if it doesn\'t already exist. */ - sprintf(buf, "%s/%s", pw->pw_dir, SSH_USER_DIR); + snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir, SSH_USER_DIR); if (stat(buf, &st) < 0) if (mkdir(buf, 0755) < 0) error("Could not create directory '%s'.", buf); @@ -406,10 +399,6 @@ if (change_comment) do_change_comment(pw); - /* Initialize random number generator. This may take a while if the - user has no seed file, so display a message to the user. */ - if (!quiet) - printf("Initializing random number generator...\n"); arc4random_stir(); if (quiet) @@ -422,29 +411,12 @@ ask_file_again: - /* Ask for a file to save the key in. */ - if (identity_file) - { - strncpy(buf, identity_file, sizeof(buf)); - buf[sizeof(buf) - 1] = '\0'; - } - else - { - printf("Enter file in which to save the key ($HOME/%s): ", - SSH_CLIENT_IDENTITY); - fflush(stdout); - if (fgets(buf, sizeof(buf), stdin) == NULL) - exit(1); - if (strchr(buf, '\n')) - *strchr(buf, '\n') = 0; - if (strcmp(buf, "") == 0) - sprintf(buf, "%s/%s", pw->pw_dir, SSH_CLIENT_IDENTITY); - } + file = get_filename(pw, "Enter file in which to save the key"); /* If the file aready exists, ask the user to confirm. */ - if (stat(buf, &st) >= 0) + if (stat(file, &st) >= 0) { - printf("%s already exists.\n", buf); + printf("%s already exists.\n", file); printf("Overwrite (y/n)? "); fflush(stdout); if (fgets(buf2, sizeof(buf2), stdin) == NULL) @@ -484,35 +456,26 @@ edit this field. */ if (identity_comment) { - strncpy(buf2, identity_comment, sizeof(buf2)); - buf2[sizeof(buf2) - 1] = '\0'; + strlcpy(buf2, identity_comment, sizeof(buf2)); } else { -#ifdef HAVE_GETHOSTNAME if (gethostname(hostname, sizeof(hostname)) < 0) { perror("gethostname"); exit(1); } - sprintf(buf2, "%s@%s", pw->pw_name, hostname); -#else - if (uname(&uts) < 0) - { - perror("uname"); - exit(1); - } - sprintf(buf2, "%s@%s", pw->pw_name, uts.nodename); -#endif + snprintf(buf2, sizeof buf2, "%s@%s", pw->pw_name, hostname); } /* Save the key with the given passphrase and comment. */ - if (!save_private_key(buf, passphrase1, private_key, buf2)) + if (!save_private_key(file, passphrase1, private_key, buf2)) { printf("Saving the key failed: %s: %s.\n", - buf, strerror(errno)); + file, strerror(errno)); memset(passphrase1, 0, strlen(passphrase1)); xfree(passphrase1); + xfree(file); goto ask_file_again; } /* Clear the passphrase. */ @@ -524,7 +487,7 @@ arc4random_stir(); if (!quiet) - printf("Your identification has been saved in %s.\n", buf); + printf("Your identification has been saved in %s.\n", file); /* Display the public key on the screen. */ if (!quiet) { @@ -540,11 +503,11 @@ /* Save the public key in text format in a file with the same name but .pub appended. */ - strcat(buf, ".pub"); - f = fopen(buf, "w"); + strcat(file, ".pub"); + f = fopen(file, "w"); if (!f) { - printf("Could not save your public key in %s\n", buf); + printf("Could not save your public key in %s\n", file); exit(1); } fprintf(f, "%d ", BN_num_bits(public_key->n)); @@ -557,7 +520,7 @@ fclose(f); if (!quiet) - printf("Your public key has been saved in %s\n", buf); + printf("Your public key has been saved in %s\n", file); exit(0); }