[BACK]Return to ssh-keygen.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh-keygen.c between version 1.25.2.4 and 1.46

version 1.25.2.4, 2001/03/12 15:44:16 version 1.46, 2001/03/09 03:14:39
Line 508 
Line 508 
 void  void
 do_change_comment(struct passwd *pw)  do_change_comment(struct passwd *pw)
 {  {
         char new_comment[1024], *comment;          char new_comment[1024], *comment, *passphrase;
         Key *private;          Key *private, *public;
         Key *public;  
         char *passphrase;  
         struct stat st;          struct stat st;
         FILE *f;          FILE *f;
           int fd;
   
         if (!have_identity)          if (!have_identity)
                 ask_filename(pw, "Enter file in which the key is");                  ask_filename(pw, "Enter file in which the key is");
Line 581 
Line 580 
         key_free(private);          key_free(private);
   
         strlcat(identity_file, ".pub", sizeof(identity_file));          strlcat(identity_file, ".pub", sizeof(identity_file));
         f = fopen(identity_file, "w");          fd = open(identity_file, O_WRONLY | O_CREAT | O_TRUNC, 0644);
         if (!f) {          if (fd == -1) {
                 printf("Could not save your public key in %s\n", identity_file);                  printf("Could not save your public key in %s\n", identity_file);
                 exit(1);                  exit(1);
         }          }
           f = fdopen(fd, "w");
           if (f == NULL) {
                   printf("fdopen %s failed", identity_file);
                   exit(1);
           }
         if (!key_write(public, f))          if (!key_write(public, f))
                 fprintf(stderr, "write key failed");                  fprintf(stderr, "write key failed");
         key_free(public);          key_free(public);
Line 601 
Line 605 
 void  void
 usage(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);          exit(1);
 }  }
   
Line 612 
Line 617 
 main(int ac, char **av)  main(int ac, char **av)
 {  {
         char dotsshdir[16 * 1024], comment[1024], *passphrase1, *passphrase2;          char dotsshdir[16 * 1024], comment[1024], *passphrase1, *passphrase2;
           Key *private, *public;
         struct passwd *pw;          struct passwd *pw;
         int opt, type;          int opt, type, fd;
         struct stat st;          struct stat st;
         FILE *f;          FILE *f;
         Key *private;  
         Key *public;  
   
         extern int optind;          extern int optind;
         extern char *optarg;          extern char *optarg;
Line 819 
Line 823 
                 printf("Your identification has been saved in %s.\n", identity_file);                  printf("Your identification has been saved in %s.\n", identity_file);
   
         strlcat(identity_file, ".pub", sizeof(identity_file));          strlcat(identity_file, ".pub", sizeof(identity_file));
         f = fopen(identity_file, "w");          fd = open(identity_file, O_WRONLY | O_CREAT | O_TRUNC, 0644);
         if (!f) {          if (fd == -1) {
                 printf("Could not save your public key in %s\n", identity_file);                  printf("Could not save your public key in %s\n", identity_file);
                   exit(1);
           }
           f = fdopen(fd, "w");
           if (f == NULL) {
                   printf("fdopen %s failed", identity_file);
                 exit(1);                  exit(1);
         }          }
         if (!key_write(public, f))          if (!key_write(public, f))
Legend:
Removed from v.1.25.2.4  
changed lines
  Added in v.1.46