[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.38 and 1.45

version 1.38, 2000/12/28 18:58:39 version 1.45, 2001/02/22 08:03:51
Line 16 
Line 16 
   
 #include <openssl/evp.h>  #include <openssl/evp.h>
 #include <openssl/pem.h>  #include <openssl/pem.h>
 #include <openssl/rsa.h>  
 #include <openssl/dsa.h>  
   
 #include "ssh.h"  
 #include "xmalloc.h"  #include "xmalloc.h"
 #include "key.h"  #include "key.h"
 #include "rsa.h"  
 #include "authfile.h"  #include "authfile.h"
 #include "uuencode.h"  #include "uuencode.h"
   
 #include "buffer.h"  #include "buffer.h"
 #include "bufaux.h"  #include "bufaux.h"
   #include "pathnames.h"
   #include "log.h"
   #include "readpass.h"
   
 /* Number of bits in the RSA/DSA key.  This value can be changed on the command line. */  /* Number of bits in the RSA/DSA key.  This value can be changed on the command line. */
 int bits = 1024;  int bits = 1024;
Line 83 
Line 81 
   
         switch (key_type_from_name(key_type_name)) {          switch (key_type_from_name(key_type_name)) {
         case KEY_RSA1:          case KEY_RSA1:
                 name = SSH_CLIENT_IDENTITY;                  name = _PATH_SSH_CLIENT_IDENTITY;
                 break;                  break;
         case KEY_DSA:          case KEY_DSA:
                 name = SSH_CLIENT_ID_DSA;                  name = _PATH_SSH_CLIENT_ID_DSA;
                 break;                  break;
         case KEY_RSA:          case KEY_RSA:
                 name = SSH_CLIENT_ID_RSA;                  name = _PATH_SSH_CLIENT_ID_RSA;
                 break;                  break;
         default:          default:
                 fprintf(stderr, "bad key type");                  fprintf(stderr, "bad key type");
Line 126 
Line 124 
 #define SSH_COM_PUBLIC_BEGIN            "---- BEGIN SSH2 PUBLIC KEY ----"  #define SSH_COM_PUBLIC_BEGIN            "---- BEGIN SSH2 PUBLIC KEY ----"
 #define SSH_COM_PUBLIC_END              "---- END SSH2 PUBLIC KEY ----"  #define SSH_COM_PUBLIC_END              "---- END SSH2 PUBLIC KEY ----"
 #define SSH_COM_PRIVATE_BEGIN           "---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----"  #define SSH_COM_PRIVATE_BEGIN           "---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----"
 #define SSH_COM_PRIVATE_KEY_MAGIC       0x3f6ff9eb  #define SSH_COM_PRIVATE_KEY_MAGIC       0x3f6ff9eb
   
 void  void
 do_convert_to_ssh2(struct passwd *pw)  do_convert_to_ssh2(struct passwd *pw)
Line 530 
Line 528 
         public = key_new(KEY_RSA1);          public = key_new(KEY_RSA1);
         if (!load_public_key(identity_file, public, NULL)) {          if (!load_public_key(identity_file, public, NULL)) {
                 printf("%s is not a valid key file.\n", identity_file);                  printf("%s is not a valid key file.\n", identity_file);
                   printf("Comments are only supported in RSA1 keys\n");
                 exit(1);                  exit(1);
         }          }
   
Line 602 
Line 601 
 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 636 
Line 636 
                 exit(1);                  exit(1);
         }          }
   
         while ((opt = getopt(ac, av, "dqpclRxXyb:f:t:P:N:C:")) != EOF) {          while ((opt = getopt(ac, av, "dqpclRxXyb:f:t:P:N:C:")) != -1) {
                 switch (opt) {                  switch (opt) {
                 case 'b':                  case 'b':
                         bits = atoi(optarg);                          bits = atoi(optarg);
Line 750 
Line 750 
                 ask_filename(pw, "Enter file in which to save the key");                  ask_filename(pw, "Enter file in which to save the key");
   
         /* Create ~/.ssh directory if it doesn\'t already exist. */          /* Create ~/.ssh directory if it doesn\'t already exist. */
         snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", pw->pw_dir, SSH_USER_DIR);          snprintf(dotsshdir, sizeof dotsshdir, "%s/%s", pw->pw_dir, _PATH_SSH_USER_DIR);
         if (strstr(identity_file, dotsshdir) != NULL &&          if (strstr(identity_file, dotsshdir) != NULL &&
             stat(dotsshdir, &st) < 0) {              stat(dotsshdir, &st) < 0) {
                 if (mkdir(dotsshdir, 0700) < 0)                  if (mkdir(dotsshdir, 0700) < 0)
Legend:
Removed from v.1.38  
changed lines
  Added in v.1.45