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

Diff for /src/usr.bin/ssh/monitor_wrap.c between version 1.90 and 1.91

version 1.90, 2017/05/17 01:24:17 version 1.91, 2017/05/30 08:52:19
Line 205 
Line 205 
 #endif  #endif
   
 int  int
 mm_key_sign(Key *key, u_char **sigp, u_int *lenp,  mm_key_sign(struct sshkey *key, u_char **sigp, u_int *lenp,
     const u_char *data, u_int datalen, const char *hostkey_alg)      const u_char *data, u_int datalen, const char *hostkey_alg)
 {  {
         struct kex *kex = *pmonitor->m_pkex;          struct kex *kex = *pmonitor->m_pkex;
Line 357 
Line 357 
 }  }
   
 int  int
 mm_user_key_allowed(struct passwd *pw, Key *key, int pubkey_auth_attempt)  mm_user_key_allowed(struct passwd *pw, struct sshkey *key,
       int pubkey_auth_attempt)
 {  {
         return (mm_key_allowed(MM_USERKEY, NULL, NULL, key,          return (mm_key_allowed(MM_USERKEY, NULL, NULL, key,
             pubkey_auth_attempt));              pubkey_auth_attempt));
Line 365 
Line 366 
   
 int  int
 mm_hostbased_key_allowed(struct passwd *pw, const char *user, const char *host,  mm_hostbased_key_allowed(struct passwd *pw, const char *user, const char *host,
     Key *key)      struct sshkey *key)
 {  {
         return (mm_key_allowed(MM_HOSTKEY, user, host, key, 0));          return (mm_key_allowed(MM_HOSTKEY, user, host, key, 0));
 }  }
   
 int  int
 mm_key_allowed(enum mm_keytype type, const char *user, const char *host,  mm_key_allowed(enum mm_keytype type, const char *user, const char *host,
     Key *key, int pubkey_auth_attempt)      struct sshkey *key, int pubkey_auth_attempt)
 {  {
         Buffer m;          Buffer m;
         u_char *blob;          u_char *blob;
Line 417 
Line 418 
  */   */
   
 int  int
 mm_key_verify(Key *key, u_char *sig, u_int siglen, u_char *data, u_int datalen)  mm_key_verify(struct sshkey *key, u_char *sig, u_int siglen, u_char *data,
       u_int datalen)
 {  {
         Buffer m;          Buffer m;
         u_char *blob;          u_char *blob;
Legend:
Removed from v.1.90  
changed lines
  Added in v.1.91