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

Diff for /src/usr.bin/ssh/sshconnect2.c between version 1.259 and 1.260

version 1.259, 2017/05/30 08:52:20 version 1.260, 2017/05/30 14:19:15
Line 389 
Line 389 
             (r = sshpkt_send(ssh)) != 0)              (r = sshpkt_send(ssh)) != 0)
                 fatal("%s: %s", __func__, ssh_err(r));                  fatal("%s: %s", __func__, ssh_err(r));
   
           ssh->authctxt = &authctxt;
         ssh_dispatch_init(ssh, &input_userauth_error);          ssh_dispatch_init(ssh, &input_userauth_error);
         ssh_dispatch_set(ssh, SSH2_MSG_EXT_INFO, &input_userauth_ext_info);          ssh_dispatch_set(ssh, SSH2_MSG_EXT_INFO, &input_userauth_ext_info);
         ssh_dispatch_set(ssh, SSH2_MSG_SERVICE_ACCEPT, &input_userauth_service_accept);          ssh_dispatch_set(ssh, SSH2_MSG_SERVICE_ACCEPT, &input_userauth_service_accept);
         ssh_dispatch_run(ssh, DISPATCH_BLOCK, &authctxt.success, &authctxt);    /* loop until success */          ssh_dispatch_run(ssh, DISPATCH_BLOCK, &authctxt.success, ssh);  /* loop until success */
           ssh->authctxt = NULL;
   
         pubkey_cleanup(&authctxt);          pubkey_cleanup(&authctxt);
         ssh_dispatch_range(ssh, SSH2_MSG_USERAUTH_MIN, SSH2_MSG_USERAUTH_MAX, NULL);          ssh_dispatch_range(ssh, SSH2_MSG_USERAUTH_MIN, SSH2_MSG_USERAUTH_MAX, NULL);
Line 406 
Line 408 
 int  int
 input_userauth_service_accept(int type, u_int32_t seqnr, void *ctxt)  input_userauth_service_accept(int type, u_int32_t seqnr, void *ctxt)
 {  {
         Authctxt *authctxt = ctxt;          struct ssh *ssh = ctxt;
         struct ssh *ssh = active_state;          Authctxt *authctxt = ssh->authctxt;
         int r;          int r;
   
         if (ssh_packet_remaining(ssh) > 0) {          if (ssh_packet_remaining(ssh) > 0) {
Line 440 
Line 442 
 int  int
 input_userauth_ext_info(int type, u_int32_t seqnr, void *ctxt)  input_userauth_ext_info(int type, u_int32_t seqnr, void *ctxt)
 {  {
         return kex_input_ext_info(type, seqnr, active_state);          return kex_input_ext_info(type, seqnr, ctxt);
 }  }
   
 void  void
Line 508 
Line 510 
 int  int
 input_userauth_success(int type, u_int32_t seq, void *ctxt)  input_userauth_success(int type, u_int32_t seq, void *ctxt)
 {  {
         Authctxt *authctxt = ctxt;          struct ssh *ssh = ctxt;
           Authctxt *authctxt = ssh->authctxt;
   
         if (authctxt == NULL)          if (authctxt == NULL)
                 fatal("input_userauth_success: no authentication context");                  fatal("input_userauth_success: no authentication context");
Line 525 
Line 528 
 int  int
 input_userauth_success_unexpected(int type, u_int32_t seq, void *ctxt)  input_userauth_success_unexpected(int type, u_int32_t seq, void *ctxt)
 {  {
         Authctxt *authctxt = ctxt;          struct ssh *ssh = ctxt;
           Authctxt *authctxt = ssh->authctxt;
   
         if (authctxt == NULL)          if (authctxt == NULL)
                 fatal("%s: no authentication context", __func__);                  fatal("%s: no authentication context", __func__);
Line 539 
Line 543 
 int  int
 input_userauth_failure(int type, u_int32_t seq, void *ctxt)  input_userauth_failure(int type, u_int32_t seq, void *ctxt)
 {  {
         Authctxt *authctxt = ctxt;          struct ssh *ssh = ctxt;
           Authctxt *authctxt = ssh->authctxt;
         char *authlist = NULL;          char *authlist = NULL;
         int partial;          int partial;
   
Line 565 
Line 570 
 int  int
 input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt)  input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt)
 {  {
         Authctxt *authctxt = ctxt;          struct ssh *ssh = ctxt;
           Authctxt *authctxt = ssh->authctxt;
         struct sshkey *key = NULL;          struct sshkey *key = NULL;
         Identity *id = NULL;          Identity *id = NULL;
         Buffer b;          Buffer b;
Line 696 
Line 702 
 static OM_uint32  static OM_uint32
 process_gssapi_token(void *ctxt, gss_buffer_t recv_tok)  process_gssapi_token(void *ctxt, gss_buffer_t recv_tok)
 {  {
         Authctxt *authctxt = ctxt;          struct ssh *ssh = ctxt;
           Authctxt *authctxt = ssh->authctxt;
         Gssctxt *gssctxt = authctxt->methoddata;          Gssctxt *gssctxt = authctxt->methoddata;
         gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;          gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
         gss_buffer_desc mic = GSS_C_EMPTY_BUFFER;          gss_buffer_desc mic = GSS_C_EMPTY_BUFFER;
Line 751 
Line 758 
 int  int
 input_gssapi_response(int type, u_int32_t plen, void *ctxt)  input_gssapi_response(int type, u_int32_t plen, void *ctxt)
 {  {
         Authctxt *authctxt = ctxt;          struct ssh *ssh = ctxt;
           Authctxt *authctxt = ssh->authctxt;
         Gssctxt *gssctxt;          Gssctxt *gssctxt;
         int oidlen;          int oidlen;
         char *oidv;          char *oidv;
Line 792 
Line 800 
 int  int
 input_gssapi_token(int type, u_int32_t plen, void *ctxt)  input_gssapi_token(int type, u_int32_t plen, void *ctxt)
 {  {
         Authctxt *authctxt = ctxt;          struct ssh *ssh = ctxt;
           Authctxt *authctxt = ssh->authctxt;
         gss_buffer_desc recv_tok;          gss_buffer_desc recv_tok;
         OM_uint32 status;          OM_uint32 status;
         u_int slen;          u_int slen;
Line 821 
Line 830 
 int  int
 input_gssapi_errtok(int type, u_int32_t plen, void *ctxt)  input_gssapi_errtok(int type, u_int32_t plen, void *ctxt)
 {  {
         Authctxt *authctxt = ctxt;          struct ssh *ssh = ctxt;
           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;
         gss_buffer_desc recv_tok;          gss_buffer_desc recv_tok;
Line 923 
Line 933 
 int  int
 input_userauth_passwd_changereq(int type, u_int32_t seqnr, void *ctxt)  input_userauth_passwd_changereq(int type, u_int32_t seqnr, void *ctxt)
 {  {
         Authctxt *authctxt = ctxt;          struct ssh *ssh = ctxt;
           Authctxt *authctxt = ssh->authctxt;
         char *info, *lang, *password = NULL, *retype = NULL;          char *info, *lang, *password = NULL, *retype = NULL;
         char prompt[150];          char prompt[150];
         const char *host;          const char *host;
Line 1553 
Line 1564 
 int  int
 input_userauth_info_req(int type, u_int32_t seq, void *ctxt)  input_userauth_info_req(int type, u_int32_t seq, void *ctxt)
 {  {
         Authctxt *authctxt = ctxt;          struct ssh *ssh = ctxt;
           Authctxt *authctxt = ssh->authctxt;
         char *name, *inst, *lang, *prompt, *response;          char *name, *inst, *lang, *prompt, *response;
         u_int num_prompts, i;          u_int num_prompts, i;
         int echo = 0;          int echo = 0;
Legend:
Removed from v.1.259  
changed lines
  Added in v.1.260