diff options
author | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-09-14 12:45:47 +0000 |
commit | 9b71add4cecf753c45f5fbd6ff0913bc95b3e95d (patch) | |
tree | d4ea8fdb30c7949c6433f5277c39548ea579d4dc /sshconnect2.c | |
parent | ed07bcbea56007ab5b218ddf3aa6a7d4e21966e0 (diff) | |
parent | 16704d57999d987fb8d9ba53379841a79f016d67 (diff) |
Merge 4.2p1 to the trunk.
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 68d56d020..ee7932d68 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.138 2004/06/13 12:53:24 djm Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.142 2005/08/30 22:08:05 djm Exp $"); |
27 | 27 | ||
28 | #include "openbsd-compat/sys-queue.h" | 28 | #include "openbsd-compat/sys-queue.h" |
29 | 29 | ||
@@ -101,10 +101,10 @@ ssh_kex2(char *host, struct sockaddr *hostaddr) | |||
101 | compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]); | 101 | compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]); |
102 | if (options.compression) { | 102 | if (options.compression) { |
103 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = | 103 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = |
104 | myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib,none"; | 104 | myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib@openssh.com,zlib,none"; |
105 | } else { | 105 | } else { |
106 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = | 106 | myproposal[PROPOSAL_COMP_ALGS_CTOS] = |
107 | myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib"; | 107 | myproposal[PROPOSAL_COMP_ALGS_STOC] = "none,zlib@openssh.com,zlib"; |
108 | } | 108 | } |
109 | if (options.macs != NULL) { | 109 | if (options.macs != NULL) { |
110 | myproposal[PROPOSAL_MAC_ALGS_CTOS] = | 110 | myproposal[PROPOSAL_MAC_ALGS_CTOS] = |
@@ -352,7 +352,7 @@ void | |||
352 | input_userauth_error(int type, u_int32_t seq, void *ctxt) | 352 | input_userauth_error(int type, u_int32_t seq, void *ctxt) |
353 | { | 353 | { |
354 | fatal("input_userauth_error: bad message during authentication: " | 354 | fatal("input_userauth_error: bad message during authentication: " |
355 | "type %d", type); | 355 | "type %d", type); |
356 | } | 356 | } |
357 | 357 | ||
358 | void | 358 | void |
@@ -482,7 +482,7 @@ userauth_gssapi(Authctxt *authctxt) | |||
482 | { | 482 | { |
483 | Gssctxt *gssctxt = NULL; | 483 | Gssctxt *gssctxt = NULL; |
484 | static gss_OID_set gss_supported = NULL; | 484 | static gss_OID_set gss_supported = NULL; |
485 | static int mech = 0; | 485 | static u_int mech = 0; |
486 | OM_uint32 min; | 486 | OM_uint32 min; |
487 | int ok = 0; | 487 | int ok = 0; |
488 | 488 | ||
@@ -509,7 +509,8 @@ userauth_gssapi(Authctxt *authctxt) | |||
509 | } | 509 | } |
510 | } | 510 | } |
511 | 511 | ||
512 | if (!ok) return 0; | 512 | if (!ok) |
513 | return 0; | ||
513 | 514 | ||
514 | authctxt->methoddata=(void *)gssctxt; | 515 | authctxt->methoddata=(void *)gssctxt; |
515 | 516 | ||
@@ -544,7 +545,8 @@ process_gssapi_token(void *ctxt, gss_buffer_t recv_tok) | |||
544 | Authctxt *authctxt = ctxt; | 545 | Authctxt *authctxt = ctxt; |
545 | Gssctxt *gssctxt = authctxt->methoddata; | 546 | Gssctxt *gssctxt = authctxt->methoddata; |
546 | gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; | 547 | gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; |
547 | gss_buffer_desc gssbuf, mic; | 548 | gss_buffer_desc mic = GSS_C_EMPTY_BUFFER; |
549 | gss_buffer_desc gssbuf; | ||
548 | OM_uint32 status, ms, flags; | 550 | OM_uint32 status, ms, flags; |
549 | Buffer b; | 551 | Buffer b; |
550 | 552 | ||
@@ -678,7 +680,7 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt) | |||
678 | 680 | ||
679 | /* Stick it into GSSAPI and see what it says */ | 681 | /* Stick it into GSSAPI and see what it says */ |
680 | status = ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds, | 682 | status = ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds, |
681 | &recv_tok, &send_tok, NULL); | 683 | &recv_tok, &send_tok, NULL); |
682 | 684 | ||
683 | xfree(recv_tok.value); | 685 | xfree(recv_tok.value); |
684 | gss_release_buffer(&ms, &send_tok); | 686 | gss_release_buffer(&ms, &send_tok); |