[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.227 and 1.228

version 1.227, 2013/05/17 00:13:14 version 1.228, 2013/07/12 00:20:00
Line 515 
Line 515 
                 fatal("%s: %s: %s", __progname, identity_file, strerror(errno));                  fatal("%s: %s: %s", __progname, identity_file, strerror(errno));
         encoded[0] = '\0';          encoded[0] = '\0';
         while ((blen = get_line(fp, line, sizeof(line))) != -1) {          while ((blen = get_line(fp, line, sizeof(line))) != -1) {
                 if (line[blen - 1] == '\\')                  if (blen > 0 && line[blen - 1] == '\\')
                         escaped++;                          escaped++;
                 if (strncmp(line, "----", 4) == 0 ||                  if (strncmp(line, "----", 4) == 0 ||
                     strstr(line, ": ") != NULL) {                      strstr(line, ": ") != NULL) {
Line 1782 
Line 1782 
 static void  static void
 show_options(const Buffer *optbuf, int v00, int in_critical)  show_options(const Buffer *optbuf, int v00, int in_critical)
 {  {
         u_char *name, *data;          char *name;
           u_char *data;
         u_int dlen;          u_int dlen;
         Buffer options, option;          Buffer options, option;
   
Legend:
Removed from v.1.227  
changed lines
  Added in v.1.228