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

Diff for /src/usr.bin/ssh/sshkey.c between version 1.1 and 1.2

version 1.1, 2014/06/24 01:16:58 version 1.2, 2014/06/27 18:50:39
Line 3775 
Line 3775 
         if (commentp != NULL)          if (commentp != NULL)
                 *commentp = NULL;                  *commentp = NULL;
   
         if ((r = sshkey_parse_private_fileblob_type(buffer, KEY_UNSPEC,  
             passphrase, keyp, commentp)) == 0)  
                 return 0;  
 #ifdef WITH_SSH1  #ifdef WITH_SSH1
         /* it's a SSH v1 key if the public key part is readable */          /* it's a SSH v1 key if the public key part is readable */
         if ((r = sshkey_parse_public_rsa1_fileblob(buffer, NULL, NULL)) == 0) {          if ((r = sshkey_parse_public_rsa1_fileblob(buffer, NULL, NULL)) == 0) {
Line 3785 
Line 3782 
                     passphrase, keyp, commentp);                      passphrase, keyp, commentp);
         }          }
 #endif /* WITH_SSH1 */  #endif /* WITH_SSH1 */
           if ((r = sshkey_parse_private_fileblob_type(buffer, KEY_UNSPEC,
               passphrase, keyp, commentp)) == 0)
                   return 0;
         return r;          return r;
 }  }
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2