[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.367.2.1 and 1.368

version 1.367.2.1, 2023/12/18 14:56:35 version 1.368, 2023/10/12 02:15:53
Line 351 
Line 351 
 };  };
   
 static int input_userauth_service_accept(int, u_int32_t, struct ssh *);  static int input_userauth_service_accept(int, u_int32_t, struct ssh *);
   static int input_userauth_ext_info(int, u_int32_t, struct ssh *);
 static int input_userauth_success(int, u_int32_t, struct ssh *);  static int input_userauth_success(int, u_int32_t, struct ssh *);
 static int input_userauth_failure(int, u_int32_t, struct ssh *);  static int input_userauth_failure(int, u_int32_t, struct ssh *);
 static int input_userauth_banner(int, u_int32_t, struct ssh *);  static int input_userauth_banner(int, u_int32_t, struct ssh *);
Line 464 
Line 465 
   
         ssh->authctxt = &authctxt;          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, kex_input_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_fatal(ssh, DISPATCH_BLOCK, &authctxt.success); /* loop until success */          ssh_dispatch_run_fatal(ssh, DISPATCH_BLOCK, &authctxt.success); /* loop until success */
         pubkey_cleanup(ssh);          pubkey_cleanup(ssh);
   #ifdef GSSAPI
           if (authctxt.gss_supported_mechs != NULL) {
                   u_int ms;
   
                   gss_release_oid_set(&ms, &authctxt.gss_supported_mechs);
                   authctxt.gss_supported_mechs = NULL;
           }
   #endif
         ssh->authctxt = NULL;          ssh->authctxt = NULL;
   
         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 515 
Line 524 
         return r;          return r;
 }  }
   
   static int
   input_userauth_ext_info(int type, u_int32_t seqnr, struct ssh *ssh)
   {
           return kex_input_ext_info(type, seqnr, ssh);
   }
   
 void  void
 userauth(struct ssh *ssh, char *authlist)  userauth(struct ssh *ssh, char *authlist)
 {  {
Line 593 
Line 608 
         free(authctxt->methoddata);          free(authctxt->methoddata);
         authctxt->methoddata = NULL;          authctxt->methoddata = NULL;
         authctxt->success = 1;                  /* break out */          authctxt->success = 1;                  /* break out */
         ssh_dispatch_set(ssh, SSH2_MSG_EXT_INFO, dispatch_protocol_error);  
         return 0;          return 0;
 }  }
   
Line 807 
Line 821 
   
         ssh_gssapi_delete_ctx(&gssctxt);          ssh_gssapi_delete_ctx(&gssctxt);
         authctxt->methoddata = NULL;          authctxt->methoddata = NULL;
   
         free(authctxt->gss_supported_mechs);  
         authctxt->gss_supported_mechs = NULL;  
 }  }
   
 static OM_uint32  static OM_uint32
Legend:
Removed from v.1.367.2.1  
changed lines
  Added in v.1.368