[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.138 and 1.138.2.1

version 1.138, 2004/06/13 12:53:24 version 1.138.2.1, 2005/09/02 03:45:01
Line 99 
Line 99 
             compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]);              compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]);
         if (options.compression) {          if (options.compression) {
                 myproposal[PROPOSAL_COMP_ALGS_CTOS] =                  myproposal[PROPOSAL_COMP_ALGS_CTOS] =
                 myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib,none";                  myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib@openssh.com,zlib,none";
         } else {          } else {
                 myproposal[PROPOSAL_COMP_ALGS_CTOS] =                  myproposal[PROPOSAL_COMP_ALGS_CTOS] =
                 myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib";                  myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com,zlib";
         }          }
         if (options.macs != NULL) {          if (options.macs != NULL) {
                 myproposal[PROPOSAL_MAC_ALGS_CTOS] =                  myproposal[PROPOSAL_MAC_ALGS_CTOS] =
Line 350 
Line 350 
 input_userauth_error(int type, u_int32_t seq, void *ctxt)  input_userauth_error(int type, u_int32_t seq, void *ctxt)
 {  {
         fatal("input_userauth_error: bad message during authentication: "          fatal("input_userauth_error: bad message during authentication: "
            "type %d", type);              "type %d", type);
 }  }
   
 void  void
Line 480 
Line 480 
 {  {
         Gssctxt *gssctxt = NULL;          Gssctxt *gssctxt = NULL;
         static gss_OID_set gss_supported = NULL;          static gss_OID_set gss_supported = NULL;
         static int mech = 0;          static u_int mech = 0;
         OM_uint32 min;          OM_uint32 min;
         int ok = 0;          int ok = 0;
   
Line 507 
Line 507 
                 }                  }
         }          }
   
         if (!ok) return 0;          if (!ok)
                   return 0;
   
         authctxt->methoddata=(void *)gssctxt;          authctxt->methoddata=(void *)gssctxt;
   
Line 542 
Line 543 
         Authctxt *authctxt = ctxt;          Authctxt *authctxt = ctxt;
         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 gssbuf, mic;          gss_buffer_desc mic = GSS_C_EMPTY_BUFFER;
           gss_buffer_desc gssbuf;
         OM_uint32 status, ms, flags;          OM_uint32 status, ms, flags;
         Buffer b;          Buffer b;
   
Line 676 
Line 678 
   
         /* Stick it into GSSAPI and see what it says */          /* Stick it into GSSAPI and see what it says */
         status = ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds,          status = ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds,
                                      &recv_tok, &send_tok, NULL);              &recv_tok, &send_tok, NULL);
   
         xfree(recv_tok.value);          xfree(recv_tok.value);
         gss_release_buffer(&ms, &send_tok);          gss_release_buffer(&ms, &send_tok);
Legend:
Removed from v.1.138  
changed lines
  Added in v.1.138.2.1