- 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@

1 files changed, 6 insertions, 4 deletions

diff --git a/sshd.c b/sshd.c
index d9d3780fb..d35403f20 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.183 2001/03/28 21:59:41 provos Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.184 2001/03/29 21:06:21 stevesk Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -1419,15 +1419,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);