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

Diff for /src/usr.bin/ssh/auth2-gss.c between version 1.23 and 1.24

version 1.23, 2017/05/30 14:18:15 version 1.24, 2017/05/30 14:23:52
Line 43 
Line 43 
   
 extern ServerOptions options;  extern ServerOptions options;
   
 static int input_gssapi_token(int type, u_int32_t plen, void *ctxt);  static int input_gssapi_token(int type, u_int32_t plen, struct ssh *ssh);
 static int input_gssapi_mic(int type, u_int32_t plen, void *ctxt);  static int input_gssapi_mic(int type, u_int32_t plen, struct ssh *ssh);
 static int input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt);  static int input_gssapi_exchange_complete(int type, u_int32_t plen, struct ssh *ssh);
 static int input_gssapi_errtok(int, u_int32_t, void *);  static int input_gssapi_errtok(int, u_int32_t, struct ssh *);
   
 /*  /*
  * We only support those mechanisms that we know about (ie ones that we know   * We only support those mechanisms that we know about (ie ones that we know
Line 122 
Line 122 
 }  }
   
 static int  static int
 input_gssapi_token(int type, u_int32_t plen, void *ctxt)  input_gssapi_token(int type, u_int32_t plen, struct ssh *ssh)
 {  {
         struct ssh *ssh = ctxt;  
         Authctxt *authctxt = ssh->authctxt;          Authctxt *authctxt = ssh->authctxt;
         Gssctxt *gssctxt;          Gssctxt *gssctxt;
         gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;          gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
Line 178 
Line 177 
 }  }
   
 static int  static int
 input_gssapi_errtok(int type, u_int32_t plen, void *ctxt)  input_gssapi_errtok(int type, u_int32_t plen, struct ssh *ssh)
 {  {
         struct ssh *ssh = ctxt;  
         Authctxt *authctxt = ssh->authctxt;          Authctxt *authctxt = ssh->authctxt;
         Gssctxt *gssctxt;          Gssctxt *gssctxt;
         gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;          gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
Line 220 
Line 218 
  */   */
   
 static int  static int
 input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt)  input_gssapi_exchange_complete(int type, u_int32_t plen, struct ssh *ssh)
 {  {
         struct ssh *ssh = ctxt;  
         Authctxt *authctxt = ssh->authctxt;          Authctxt *authctxt = ssh->authctxt;
         int authenticated;          int authenticated;
   
Line 248 
Line 245 
 }  }
   
 static int  static int
 input_gssapi_mic(int type, u_int32_t plen, void *ctxt)  input_gssapi_mic(int type, u_int32_t plen, struct ssh *ssh)
 {  {
         struct ssh *ssh = ctxt;  
         Authctxt *authctxt = ssh->authctxt;          Authctxt *authctxt = ssh->authctxt;
         Gssctxt *gssctxt;          Gssctxt *gssctxt;
         int authenticated = 0;          int authenticated = 0;

Legend:
Removed from v.1.23  
changed lines
  Added in v.1.24