[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.174 and 1.175

version 1.174, 2009/06/22 05:39:28 version 1.175, 2009/08/27 17:33:49
Line 516 
Line 516 
         public = key_load_public(identity_file, &comment);          public = key_load_public(identity_file, &comment);
         if (public != NULL) {          if (public != NULL) {
                 fp = key_fingerprint(public, fptype, rep);                  fp = key_fingerprint(public, fptype, rep);
                 ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);                  ra = key_fingerprint(public, SSH_FP_MD5, SSH_FP_RANDOMART);
                 printf("%u %s %s (%s)\n", key_size(public), fp, comment,                  printf("%u %s %s (%s)\n", key_size(public), fp, comment,
                     key_type(public));                      key_type(public));
                 if (log_level >= SYSLOG_LEVEL_VERBOSE)                  if (log_level >= SYSLOG_LEVEL_VERBOSE)
Line 581 
Line 581 
                         }                          }
                         comment = *cp ? cp : comment;                          comment = *cp ? cp : comment;
                         fp = key_fingerprint(public, fptype, rep);                          fp = key_fingerprint(public, fptype, rep);
                         ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);                          ra = key_fingerprint(public, SSH_FP_MD5, SSH_FP_RANDOMART);
                         printf("%u %s %s (%s)\n", key_size(public), fp,                          printf("%u %s %s (%s)\n", key_size(public), fp,
                             comment ? comment : "no comment", key_type(public));                              comment ? comment : "no comment", key_type(public));
                         if (log_level >= SYSLOG_LEVEL_VERBOSE)                          if (log_level >= SYSLOG_LEVEL_VERBOSE)
Line 611 
Line 611 
                 fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;                  fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;
                 rep =    print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;                  rep =    print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
                 fp = key_fingerprint(public, fptype, rep);                  fp = key_fingerprint(public, fptype, rep);
                 ra = key_fingerprint(public, fptype, SSH_FP_RANDOMART);                  ra = key_fingerprint(public, SSH_FP_MD5, SSH_FP_RANDOMART);
                 printf("%u %s %s (%s)\n", key_size(public), fp, name,                  printf("%u %s %s (%s)\n", key_size(public), fp, name,
                     key_type(public));                      key_type(public));
                 if (log_level >= SYSLOG_LEVEL_VERBOSE)                  if (log_level >= SYSLOG_LEVEL_VERBOSE)
Legend:
Removed from v.1.174  
changed lines
  Added in v.1.175