[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.79 and 1.80

version 1.79, 2014/02/02 03:44:31 version 1.80, 2014/04/29 18:01:49
Line 36 
Line 36 
 #include <string.h>  #include <string.h>
 #include <unistd.h>  #include <unistd.h>
   
   #ifdef WITH_OPENSSL
 #include <openssl/bn.h>  #include <openssl/bn.h>
 #include <openssl/dh.h>  #include <openssl/dh.h>
 #include <openssl/evp.h>  #endif
   
 #include "xmalloc.h"  #include "xmalloc.h"
 #include "ssh.h"  #include "ssh.h"
   #ifdef WITH_OPENSSL
 #include "dh.h"  #include "dh.h"
   #endif
 #include "buffer.h"  #include "buffer.h"
 #include "key.h"  #include "key.h"
 #include "cipher.h"  #include "cipher.h"
Line 165 
Line 168 
                     rtype, type);                      rtype, type);
 }  }
   
   #ifdef WITH_OPENSSL
 DH *  DH *
 mm_choose_dh(int min, int nbits, int max)  mm_choose_dh(int min, int nbits, int max)
 {  {
Line 198 
Line 202 
   
         return (dh_new_group(g, p));          return (dh_new_group(g, p));
 }  }
   #endif
   
 int  int
 mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen)  mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen)
Line 767 
Line 772 
         buffer_free(&m);          buffer_free(&m);
 }  }
   
   #ifdef WITH_SSH1
 int  int
 mm_ssh1_session_key(BIGNUM *num)  mm_ssh1_session_key(BIGNUM *num)
 {  {
Line 786 
Line 792 
   
         return (rsafail);          return (rsafail);
 }  }
   #endif
   
 static void  static void
 mm_chall_setup(char **name, char **infotxt, u_int *numprompts,  mm_chall_setup(char **name, char **infotxt, u_int *numprompts,
Line 873 
Line 880 
         buffer_free(&m);          buffer_free(&m);
 }  }
   
   #ifdef WITH_SSH1
 int  int
 mm_auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)  mm_auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey)
 {  {
Line 968 
Line 976 
   
         return (success);          return (success);
 }  }
   #endif
   
 #ifdef GSSAPI  #ifdef GSSAPI
 OM_uint32  OM_uint32
Legend:
Removed from v.1.79  
changed lines
  Added in v.1.80