summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sshconnect2.c9
-rw-r--r--sshd.c10
3 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 057d1fc10..16be5f953 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
13 - provos@cvs.openbsd.org 2001/03/29 14:24:59 13 - provos@cvs.openbsd.org 2001/03/29 14:24:59
14 [sshconnect2.c] 14 [sshconnect2.c]
15 use recommended defaults 15 use recommended defaults
16 - stevesk@cvs.openbsd.org 2001/03/29 21:06:21
17 [sshconnect2.c sshd.c]
18 need to set both STOC and CTOS for SSH_BUG_BIGENDIANAES; ok markus@
16 19
1720010329 2020010329
18 - OpenBSD CVS Sync 21 - OpenBSD CVS Sync
@@ -4783,4 +4786,4 @@
4783 - Wrote replacements for strlcpy and mkdtemp 4786 - Wrote replacements for strlcpy and mkdtemp
4784 - Released 1.0pre1 4787 - Released 1.0pre1
4785 4788
4786$Id: ChangeLog,v 1.1039 2001/03/30 00:49:05 djm Exp $ 4789$Id: ChangeLog,v 1.1040 2001/03/30 00:49:35 djm Exp $
diff --git a/sshconnect2.c b/sshconnect2.c
index 69249c384..460d614f0 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.59 2001/03/29 14:24:59 provos Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.60 2001/03/29 21:06:21 stevesk Exp $");
27 27
28#include <openssl/bn.h> 28#include <openssl/bn.h>
29#include <openssl/md5.h> 29#include <openssl/md5.h>
@@ -85,6 +85,10 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
85 myproposal[PROPOSAL_ENC_ALGS_CTOS] = 85 myproposal[PROPOSAL_ENC_ALGS_CTOS] =
86 myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; 86 myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers;
87 } 87 }
88 myproposal[PROPOSAL_ENC_ALGS_CTOS] =
89 compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]);
90 myproposal[PROPOSAL_ENC_ALGS_STOC] =
91 compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]);
88 if (options.compression) { 92 if (options.compression) {
89 myproposal[PROPOSAL_COMP_ALGS_CTOS] = 93 myproposal[PROPOSAL_COMP_ALGS_CTOS] =
90 myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib"; 94 myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib";
@@ -97,9 +101,6 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
97 myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; 101 myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
98 } 102 }
99 103
100 myproposal[PROPOSAL_ENC_ALGS_STOC] =
101 compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]);
102
103 /* buffers with raw kexinit messages */ 104 /* buffers with raw kexinit messages */
104 server_kexinit = xmalloc(sizeof(*server_kexinit)); 105 server_kexinit = xmalloc(sizeof(*server_kexinit));
105 buffer_init(server_kexinit); 106 buffer_init(server_kexinit);
diff --git a/sshd.c b/sshd.c
index d9d3780fb..d35403f20 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: sshd.c,v 1.183 2001/03/28 21:59:41 provos Exp $"); 43RCSID("$OpenBSD: sshd.c,v 1.184 2001/03/29 21:06:21 stevesk Exp $");
44 44
45#include <openssl/dh.h> 45#include <openssl/dh.h>
46#include <openssl/bn.h> 46#include <openssl/bn.h>
@@ -1419,15 +1419,17 @@ do_ssh2_kex(void)
1419 myproposal[PROPOSAL_ENC_ALGS_CTOS] = 1419 myproposal[PROPOSAL_ENC_ALGS_CTOS] =
1420 myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; 1420 myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers;
1421 } 1421 }
1422 myproposal[PROPOSAL_ENC_ALGS_CTOS] =
1423 compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]);
1424 myproposal[PROPOSAL_ENC_ALGS_STOC] =
1425 compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]);
1426
1422 if (options.macs != NULL) { 1427 if (options.macs != NULL) {
1423 myproposal[PROPOSAL_MAC_ALGS_CTOS] = 1428 myproposal[PROPOSAL_MAC_ALGS_CTOS] =
1424 myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; 1429 myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
1425 } 1430 }
1426 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types(); 1431 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types();
1427 1432
1428 myproposal[PROPOSAL_ENC_ALGS_STOC] =
1429 compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]);
1430
1431 server_kexinit = kex_init(myproposal); 1433 server_kexinit = kex_init(myproposal);
1432 client_kexinit = xmalloc(sizeof(*client_kexinit)); 1434 client_kexinit = xmalloc(sizeof(*client_kexinit));
1433 buffer_init(client_kexinit); 1435 buffer_init(client_kexinit);