[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.10 and 1.11

version 1.10, 1999/11/20 19:53:40 version 1.11, 1999/11/21 21:58:31
Line 357 
Line 357 
 int  int
 main(int ac, char **av)  main(int ac, char **av)
 {  {
   char buf[16384], buf2[1024], *passphrase1, *passphrase2;    char dotsshdir[16*1024], comment[1024], *passphrase1, *passphrase2;
   struct passwd *pw;    struct passwd *pw;
   char *tmpbuf;    char *tmpbuf;
   int opt;    int opt;
Line 385 
Line 385 
       exit(1);        exit(1);
     }      }
   
   /* Create ~/.ssh directory if it doesn\'t already exist. */  
   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);  
   
   /* Parse command line arguments. */    /* Parse command line arguments. */
   while ((opt = getopt(ac, av, "qpclb:f:P:N:C:")) != EOF)    while ((opt = getopt(ac, av, "qpclb:f:P:N:C:")) != EOF)
     {      {
Line 480 
Line 474 
   if (!have_identity)    if (!have_identity)
     ask_filename(pw, "Enter file in which to save the key");      ask_filename(pw, "Enter file in which to save the key");
   
   /* If the file aready exists, ask the user to confirm. */    /* Create ~/.ssh directory if it doesn\'t already exist. */
     snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", pw->pw_dir, SSH_USER_DIR);
     if (strstr(identity_file, dotsshdir) != NULL &&
         stat(dotsshdir, &st) < 0) {
       if (mkdir(dotsshdir, 0755) < 0)
         error("Could not create directory '%s'.", dotsshdir);
       else if(!quiet)
         printf("Created directory '%s'.\n", dotsshdir);
    }
   
     /* If the file already exists, ask the user to confirm. */
   if (stat(identity_file, &st) >= 0)    if (stat(identity_file, &st) >= 0)
     {      {
         char yesno[3];
       printf("%s already exists.\n", identity_file);        printf("%s already exists.\n", identity_file);
       printf("Overwrite (y/n)? ");        printf("Overwrite (y/n)? ");
       fflush(stdout);        fflush(stdout);
       if (fgets(buf2, sizeof(buf2), stdin) == NULL)        if (fgets(yesno, sizeof(yesno), stdin) == NULL)
         exit(1);          exit(1);
       if (buf2[0] != 'y' && buf2[0] != 'Y')        if (yesno[0] != 'y' && yesno[0] != 'Y')
         exit(1);          exit(1);
     }      }
   
Line 523 
Line 528 
      edit this field. */       edit this field. */
   if (identity_comment)    if (identity_comment)
     {      {
       strlcpy(buf2, identity_comment, sizeof(buf2));        strlcpy(comment, identity_comment, sizeof(comment));
     }      }
   else    else
     {      {
Line 532 
Line 537 
           perror("gethostname");            perror("gethostname");
           exit(1);            exit(1);
         }          }
       snprintf(buf2, sizeof buf2, "%s@%s", pw->pw_name, hostname);        snprintf(comment, sizeof comment, "%s@%s", pw->pw_name, hostname);
     }      }
   
   /* Save the key with the given passphrase and comment. */    /* Save the key with the given passphrase and comment. */
   if (!save_private_key(identity_file, passphrase1, private_key, buf2))    if (!save_private_key(identity_file, passphrase1, private_key, comment))
     {      {
       printf("Saving the key failed: %s: %s.\n",        printf("Saving the key failed: %s: %s.\n",
              identity_file, strerror(errno));               identity_file, strerror(errno));
Line 555 
Line 560 
   if (!quiet)    if (!quiet)
     printf("Your identification has been saved in %s.\n", identity_file);      printf("Your identification has been saved in %s.\n", identity_file);
   
   /* Display the public key on the screen. */  
   if (!quiet) {  
     printf("Your public key is:\n");  
     printf("%d ", BN_num_bits(public_key->n));  
     tmpbuf = BN_bn2dec(public_key->e);  
     printf("%s ", tmpbuf);  
     free(tmpbuf);  
     tmpbuf = BN_bn2dec(public_key->n);  
     printf("%s %s\n", tmpbuf, buf2);  
     free(tmpbuf);  
   }  
   
   /* Save the public key in text format in a file with the same name but    /* Save the public key in text format in a file with the same name but
      .pub appended. */       .pub appended. */
   strlcat(identity_file, ".pub", sizeof(identity_file));    strlcat(identity_file, ".pub", sizeof(identity_file));
Line 581 
Line 574 
   fprintf(f, "%s ", tmpbuf);    fprintf(f, "%s ", tmpbuf);
   free(tmpbuf);    free(tmpbuf);
   tmpbuf = BN_bn2dec(public_key->n);    tmpbuf = BN_bn2dec(public_key->n);
   fprintf(f, "%s %s\n", tmpbuf, buf2);    fprintf(f, "%s %s\n", tmpbuf, comment);
   free(tmpbuf);    free(tmpbuf);
   fclose(f);    fclose(f);
   
   if (!quiet)    if (!quiet) {
     printf("Your public key has been saved in %s\n", identity_file);      printf("Your public key has been saved in %s.\n", identity_file);
       printf("The key fingerprint is:\n");
       printf("%d %s %s\n", BN_num_bits(public_key->n),
              fingerprint(public_key->e, public_key->n),
              comment);
     }
   
   exit(0);    exit(0);
 }  }
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11