diff options
| author | Damien Miller <djm@mindrot.org> | 2001-03-30 11:01:42 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2001-03-30 11:01:42 +1000 |
| commit | 7f64c3ae26e8c4c7b7956436d41b1dea1c79bb2e (patch) | |
| tree | 1dd2b45cf9746debd7d58fb4f9229f6e2a86ac04 | |
| parent | 42d3204db9c94a63092b3ac31feafe7475b2a6db (diff) | |
- (djm) Patch from OpenBSD CVS:
- stevesk@cvs.openbsd.org 2001/03/29 21:06:21
[sshconnect2.c sshd.c]
need to set both STOC and CTOS for SSH_BUG_BIGENDIANAES; ok markus@
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sshconnect2.c | 7 | ||||
| -rw-r--r-- | sshd.c | 8 |
3 files changed, 14 insertions, 7 deletions
@@ -1,6 +1,10 @@ 20010330 - (djm) Another openbsd-compat/glob.c sync - (djm) Document default protocol order in config files + - (djm) Patch from OpenBSD CVS: + - stevesk@cvs.openbsd.org 2001/03/29 21:06:21 + [sshconnect2.c sshd.c] + need to set both STOC and CTOS for SSH_BUG_BIGENDIANAES; ok markus@ 20010328 - (djm) Reorder tests and library inclusion for Krb4/AFS to try to @@ -4692,4 +4696,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.991.2.17 2001/03/30 00:39:13 djm Exp $ +$Id: ChangeLog,v 1.991.2.18 2001/03/30 01:01:42 djm Exp $ diff --git a/sshconnect2.c b/sshconnect2.c index 86f3bb9b..e74352cf 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -84,6 +84,10 @@ ssh_kex2(char *host, struct sockaddr *hostaddr) myproposal[PROPOSAL_ENC_ALGS_CTOS] = myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; } + myproposal[PROPOSAL_ENC_ALGS_CTOS] = + compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); + myproposal[PROPOSAL_ENC_ALGS_STOC] = + compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]); if (options.compression) { myproposal[PROPOSAL_COMP_ALGS_CTOS] = myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib"; @@ -96,9 +100,6 @@ ssh_kex2(char *host, struct sockaddr *hostaddr) myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; } - myproposal[PROPOSAL_ENC_ALGS_STOC] = - compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]); - /* buffers with raw kexinit messages */ server_kexinit = xmalloc(sizeof(*server_kexinit)); buffer_init(server_kexinit); @@ -1444,15 +1444,17 @@ do_ssh2_kex(void) myproposal[PROPOSAL_ENC_ALGS_CTOS] = myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; } + myproposal[PROPOSAL_ENC_ALGS_CTOS] = + compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); + myproposal[PROPOSAL_ENC_ALGS_STOC] = + compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]); + if (options.macs != NULL) { myproposal[PROPOSAL_MAC_ALGS_CTOS] = myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; } myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types(); - myproposal[PROPOSAL_ENC_ALGS_STOC] = - compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]); - server_kexinit = kex_init(myproposal); client_kexinit = xmalloc(sizeof(*client_kexinit)); buffer_init(client_kexinit); |