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

Diff for /src/usr.bin/ssh/hostfile.c between version 1.50 and 1.51

version 1.50, 2010/12/04 13:31:37 version 1.51, 2013/05/17 00:13:13
Line 93 
Line 93 
         b64salt[b64len] = '\0';          b64salt[b64len] = '\0';
   
         ret = __b64_pton(b64salt, salt, salt_len);          ret = __b64_pton(b64salt, salt, salt_len);
         xfree(b64salt);          free(b64salt);
         if (ret == -1) {          if (ret == -1) {
                 debug2("extract_salt: salt decode error");                  debug2("extract_salt: salt decode error");
                 return (-1);                  return (-1);
Line 324 
Line 324 
         u_int i;          u_int i;
   
         for (i = 0; i < hostkeys->num_entries; i++) {          for (i = 0; i < hostkeys->num_entries; i++) {
                 xfree(hostkeys->entries[i].host);                  free(hostkeys->entries[i].host);
                 xfree(hostkeys->entries[i].file);                  free(hostkeys->entries[i].file);
                 key_free(hostkeys->entries[i].key);                  key_free(hostkeys->entries[i].key);
                 bzero(hostkeys->entries + i, sizeof(*hostkeys->entries));                  bzero(hostkeys->entries + i, sizeof(*hostkeys->entries));
         }          }
         if (hostkeys->entries != NULL)          free(hostkeys->entries);
                 xfree(hostkeys->entries);          bzero(hostkeys, sizeof(*hostkeys));
         hostkeys->entries = NULL;          free(hostkeys);
         hostkeys->num_entries = 0;  
         xfree(hostkeys);  
 }  }
   
 static int  static int
Legend:
Removed from v.1.50  
changed lines
  Added in v.1.51