summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-04-19 16:26:12 +1000
committerDamien Miller <djm@mindrot.org>2000-04-19 16:26:12 +1000
commit8bb73be04e3e38be582c4b3843c765aab74017c2 (patch)
tree2050fbf49e4e94a9cef9bbe557787298111eb886
parent71795160ee9dbf15633b2c27679df62c11f79aaa (diff)
- OpenBSD CVS updates
[channels.c] - fix pr 1196, listen_port and port_to_connect interchanged [scp.c] - after completion, replace the progress bar ETA counter with a final elapsed time; my idea, aaron wrote the patch [ssh_config sshd_config] - show 'Protocol' as an example, ok markus@ [sshd.c] - missing xfree() - Add missing header to bsd-misc.c
-rw-r--r--ChangeLog13
-rw-r--r--bsd-misc.c2
-rw-r--r--channels.c6
-rw-r--r--scp.c14
-rw-r--r--ssh_config1
-rw-r--r--sshd.c3
-rw-r--r--sshd_config1
7 files changed, 32 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index e921e227..73d7db37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+20000419
+ - OpenBSD CVS updates
+ [channels.c]
+ - fix pr 1196, listen_port and port_to_connect interchanged
+ [scp.c]
+ - after completion, replace the progress bar ETA counter with a final
+ elapsed time; my idea, aaron wrote the patch
+ [ssh_config sshd_config]
+ - show 'Protocol' as an example, ok markus@
+ [sshd.c]
+ - missing xfree()
+ - Add missing header to bsd-misc.c
+
20000416
- Reduce diff against OpenBSD source
- All OpenSSL includes are now unconditionally referenced as
diff --git a/bsd-misc.c b/bsd-misc.c
index 83822cad..c22cde32 100644
--- a/bsd-misc.c
+++ b/bsd-misc.c
@@ -47,6 +47,8 @@
#include "bsd-misc.h"
#include "entropy.h"
+#include <openssl/rand.h>
+
#ifndef HAVE_ARC4RANDOM
typedef struct
diff --git a/channels.c b/channels.c
index 5f3b0d11..a0091586 100644
--- a/channels.c
+++ b/channels.c
@@ -17,7 +17,7 @@
*/
#include "includes.h"
-RCSID("$Id: channels.c,v 1.25 2000/04/16 01:18:41 damien Exp $");
+RCSID("$Id: channels.c,v 1.26 2000/04/19 06:26:13 damien Exp $");
#include "ssh.h"
#include "packet.h"
@@ -1469,9 +1469,9 @@ channel_request_remote_forwarding(u_short listen_port, const char *host_to_conne
packet_put_int(listen_port);
} else {
packet_start(SSH_CMSG_PORT_FORWARD_REQUEST);
- packet_put_int(port_to_connect);
- packet_put_cstring(host_to_connect);
packet_put_int(listen_port);
+ packet_put_cstring(host_to_connect);
+ packet_put_int(port_to_connect);
packet_send();
packet_write_wait();
/*
diff --git a/scp.c b/scp.c
index 2bd3ed2b..64869f97 100644
--- a/scp.c
+++ b/scp.c
@@ -45,7 +45,7 @@
*/
#include "includes.h"
-RCSID("$Id: scp.c,v 1.19 2000/04/16 01:18:45 damien Exp $");
+RCSID("$Id: scp.c,v 1.20 2000/04/19 06:26:14 damien Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -1008,7 +1008,7 @@ run_err(const char *fmt,...)
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: scp.c,v 1.19 2000/04/16 01:18:45 damien Exp $
+ * $Id: scp.c,v 1.20 2000/04/19 06:26:14 damien Exp $
*/
char *
@@ -1211,7 +1211,12 @@ progressmeter(int flag)
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
" - stalled -");
} else {
- remaining = (int) (totalbytes / (statbytes / elapsed) - elapsed);
+ if (flag != 1)
+ remaining =
+ (int)(totalbytes / (statbytes / elapsed) - elapsed);
+ else
+ remaining = elapsed;
+
i = remaining / 3600;
if (i)
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
@@ -1221,7 +1226,8 @@ progressmeter(int flag)
" ");
i = remaining % 3600;
snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
- "%02d:%02d ETA", i / 60, i % 60);
+ "%02d:%02d%s", i / 60, i % 60,
+ (flag != 1) ? " ETA" : " ");
}
atomicio(write, fileno(stdout), buf, strlen(buf));
diff --git a/ssh_config b/ssh_config
index 6e732a22..b71ff658 100644
--- a/ssh_config
+++ b/ssh_config
@@ -26,6 +26,7 @@
# StrictHostKeyChecking no
# IdentityFile ~/.ssh/identity
# Port 22
+# Protocol 2,1
# Cipher blowfish
# EscapeChar ~
diff --git a/sshd.c b/sshd.c
index c8508e93..3b75b884 100644
--- a/sshd.c
+++ b/sshd.c
@@ -14,7 +14,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.105 2000/04/14 10:30:33 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.106 2000/04/17 12:31:47 markus Exp $");
#include "xmalloc.h"
#include "rsa.h"
@@ -1265,6 +1265,7 @@ do_ssh2_kex()
packet_put_bignum2(dh->pub_key); // f
packet_put_string((char *)signature, slen);
packet_send();
+ xfree(signature);
packet_write_wait();
kex_derive_keys(kex, hash, shared_secret);
diff --git a/sshd_config b/sshd_config
index 614cf706..52436ac3 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,6 +1,7 @@
# This is ssh server systemwide configuration file.
Port 22
+#Protocol 2,1
ListenAddress 0.0.0.0
#ListenAddress ::
HostKey /etc/ssh_host_key