- 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

diff --git a/ChangeLog b/ChangeLog
index e921e2275981cd80b19fc52a5cad8fdb505dfd6c..73d7db3723d0f91f14d7c1080ee467297f5a2c0c 100644 (file)
--- 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 83822cad52d6dfcaa9e4d8b589463894c654ae7c..c22cde3282d163f04d70711b4369b36bfc1d4573 100644 (file)
--- 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 a67615b3c3147d85e2d18a02a6f07a7b195730e9..0f1a5233b4e820373b09218da71dcdadf6815e40 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -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 8c86e0282c5dd31e99521cf4ebb2bd7485f8c7c3..f9277b1e53624e7163b3820d43552d01347736ed 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -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 6e732a22e6f33f2042ae8cfd2924c962f79c8e9a..b71ff6588a673a8abb9bdd2d786dd3ecce8b51b3 100644 (file)
--- 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 c8508e931ac882f7df7b4cb27b2f2595ed289acd..3b75b884e7465527f342e7ea9aaca24d5a7defe5 100644 (file)
--- 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 614cf706b33295bd3401af8894f5a412b7afd296..52436ac36dfedf0a333a15b9c6d0e11e2657e4bb 100644 (file)
--- 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