diff options
| author | Damien Miller <djm@mindrot.org> | 2001-03-30 02:49:35 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2001-03-30 02:49:35 +0200 |
| commit | a0ff466d804969067a684911269c380c664df21d (patch) | |
| tree | a5bd7142743a9d6efc03a98ebf3481091d3c7a7b /sshconnect2.c | |
| parent | - OpenBSD CVS Sync (diff) | |
| download | openssh-a0ff466d804969067a684911269c380c664df21d.tar.xz openssh-a0ff466d804969067a684911269c380c664df21d.zip | |
- OpenBSD CVS Sync
- 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@
Diffstat (limited to 'sshconnect2.c')
| -rw-r--r-- | sshconnect2.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 69249c384..460d614f0 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.59 2001/03/29 14:24:59 provos Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.60 2001/03/29 21:06:21 stevesk Exp $"); #include <openssl/bn.h> #include <openssl/md5.h> @@ -85,6 +85,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"; @@ -97,9 +101,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); |