diff options
author | Damien Miller <djm@mindrot.org> | 2000-04-19 16:26:12 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-04-19 16:26:12 +1000 |
commit | 8bb73be04e3e38be582c4b3843c765aab74017c2 (patch) | |
tree | 2050fbf49e4e94a9cef9bbe557787298111eb886 | |
parent | 71795160ee9dbf15633b2c27679df62c11f79aaa (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-- | ChangeLog | 13 | ||||
-rw-r--r-- | bsd-misc.c | 2 | ||||
-rw-r--r-- | channels.c | 6 | ||||
-rw-r--r-- | scp.c | 14 | ||||
-rw-r--r-- | ssh_config | 1 | ||||
-rw-r--r-- | sshd.c | 3 | ||||
-rw-r--r-- | sshd_config | 1 |
7 files changed, 32 insertions, 8 deletions
@@ -1,3 +1,16 @@ | |||
1 | 20000419 | ||
2 | - OpenBSD CVS updates | ||
3 | [channels.c] | ||
4 | - fix pr 1196, listen_port and port_to_connect interchanged | ||
5 | [scp.c] | ||
6 | - after completion, replace the progress bar ETA counter with a final | ||
7 | elapsed time; my idea, aaron wrote the patch | ||
8 | [ssh_config sshd_config] | ||
9 | - show 'Protocol' as an example, ok markus@ | ||
10 | [sshd.c] | ||
11 | - missing xfree() | ||
12 | - Add missing header to bsd-misc.c | ||
13 | |||
1 | 20000416 | 14 | 20000416 |
2 | - Reduce diff against OpenBSD source | 15 | - Reduce diff against OpenBSD source |
3 | - All OpenSSL includes are now unconditionally referenced as | 16 | - All OpenSSL includes are now unconditionally referenced as |
diff --git a/bsd-misc.c b/bsd-misc.c index 83822cad5..c22cde328 100644 --- a/bsd-misc.c +++ b/bsd-misc.c | |||
@@ -47,6 +47,8 @@ | |||
47 | #include "bsd-misc.h" | 47 | #include "bsd-misc.h" |
48 | #include "entropy.h" | 48 | #include "entropy.h" |
49 | 49 | ||
50 | #include <openssl/rand.h> | ||
51 | |||
50 | #ifndef HAVE_ARC4RANDOM | 52 | #ifndef HAVE_ARC4RANDOM |
51 | 53 | ||
52 | typedef struct | 54 | typedef struct |
diff --git a/channels.c b/channels.c index 5f3b0d113..a0091586b 100644 --- a/channels.c +++ b/channels.c | |||
@@ -17,7 +17,7 @@ | |||
17 | */ | 17 | */ |
18 | 18 | ||
19 | #include "includes.h" | 19 | #include "includes.h" |
20 | RCSID("$Id: channels.c,v 1.25 2000/04/16 01:18:41 damien Exp $"); | 20 | RCSID("$Id: channels.c,v 1.26 2000/04/19 06:26:13 damien Exp $"); |
21 | 21 | ||
22 | #include "ssh.h" | 22 | #include "ssh.h" |
23 | #include "packet.h" | 23 | #include "packet.h" |
@@ -1469,9 +1469,9 @@ channel_request_remote_forwarding(u_short listen_port, const char *host_to_conne | |||
1469 | packet_put_int(listen_port); | 1469 | packet_put_int(listen_port); |
1470 | } else { | 1470 | } else { |
1471 | packet_start(SSH_CMSG_PORT_FORWARD_REQUEST); | 1471 | packet_start(SSH_CMSG_PORT_FORWARD_REQUEST); |
1472 | packet_put_int(port_to_connect); | ||
1473 | packet_put_cstring(host_to_connect); | ||
1474 | packet_put_int(listen_port); | 1472 | packet_put_int(listen_port); |
1473 | packet_put_cstring(host_to_connect); | ||
1474 | packet_put_int(port_to_connect); | ||
1475 | packet_send(); | 1475 | packet_send(); |
1476 | packet_write_wait(); | 1476 | packet_write_wait(); |
1477 | /* | 1477 | /* |
@@ -45,7 +45,7 @@ | |||
45 | */ | 45 | */ |
46 | 46 | ||
47 | #include "includes.h" | 47 | #include "includes.h" |
48 | RCSID("$Id: scp.c,v 1.19 2000/04/16 01:18:45 damien Exp $"); | 48 | RCSID("$Id: scp.c,v 1.20 2000/04/19 06:26:14 damien Exp $"); |
49 | 49 | ||
50 | #include "ssh.h" | 50 | #include "ssh.h" |
51 | #include "xmalloc.h" | 51 | #include "xmalloc.h" |
@@ -1008,7 +1008,7 @@ run_err(const char *fmt,...) | |||
1008 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 1008 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
1009 | * SUCH DAMAGE. | 1009 | * SUCH DAMAGE. |
1010 | * | 1010 | * |
1011 | * $Id: scp.c,v 1.19 2000/04/16 01:18:45 damien Exp $ | 1011 | * $Id: scp.c,v 1.20 2000/04/19 06:26:14 damien Exp $ |
1012 | */ | 1012 | */ |
1013 | 1013 | ||
1014 | char * | 1014 | char * |
@@ -1211,7 +1211,12 @@ progressmeter(int flag) | |||
1211 | snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), | 1211 | snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), |
1212 | " - stalled -"); | 1212 | " - stalled -"); |
1213 | } else { | 1213 | } else { |
1214 | remaining = (int) (totalbytes / (statbytes / elapsed) - elapsed); | 1214 | if (flag != 1) |
1215 | remaining = | ||
1216 | (int)(totalbytes / (statbytes / elapsed) - elapsed); | ||
1217 | else | ||
1218 | remaining = elapsed; | ||
1219 | |||
1215 | i = remaining / 3600; | 1220 | i = remaining / 3600; |
1216 | if (i) | 1221 | if (i) |
1217 | snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), | 1222 | snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), |
@@ -1221,7 +1226,8 @@ progressmeter(int flag) | |||
1221 | " "); | 1226 | " "); |
1222 | i = remaining % 3600; | 1227 | i = remaining % 3600; |
1223 | snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), | 1228 | snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), |
1224 | "%02d:%02d ETA", i / 60, i % 60); | 1229 | "%02d:%02d%s", i / 60, i % 60, |
1230 | (flag != 1) ? " ETA" : " "); | ||
1225 | } | 1231 | } |
1226 | atomicio(write, fileno(stdout), buf, strlen(buf)); | 1232 | atomicio(write, fileno(stdout), buf, strlen(buf)); |
1227 | 1233 | ||
diff --git a/ssh_config b/ssh_config index 6e732a22e..b71ff6588 100644 --- a/ssh_config +++ b/ssh_config | |||
@@ -26,6 +26,7 @@ | |||
26 | # StrictHostKeyChecking no | 26 | # StrictHostKeyChecking no |
27 | # IdentityFile ~/.ssh/identity | 27 | # IdentityFile ~/.ssh/identity |
28 | # Port 22 | 28 | # Port 22 |
29 | # Protocol 2,1 | ||
29 | # Cipher blowfish | 30 | # Cipher blowfish |
30 | # EscapeChar ~ | 31 | # EscapeChar ~ |
31 | 32 | ||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$OpenBSD: sshd.c,v 1.105 2000/04/14 10:30:33 markus Exp $"); | 17 | RCSID("$OpenBSD: sshd.c,v 1.106 2000/04/17 12:31:47 markus Exp $"); |
18 | 18 | ||
19 | #include "xmalloc.h" | 19 | #include "xmalloc.h" |
20 | #include "rsa.h" | 20 | #include "rsa.h" |
@@ -1265,6 +1265,7 @@ do_ssh2_kex() | |||
1265 | packet_put_bignum2(dh->pub_key); // f | 1265 | packet_put_bignum2(dh->pub_key); // f |
1266 | packet_put_string((char *)signature, slen); | 1266 | packet_put_string((char *)signature, slen); |
1267 | packet_send(); | 1267 | packet_send(); |
1268 | xfree(signature); | ||
1268 | packet_write_wait(); | 1269 | packet_write_wait(); |
1269 | 1270 | ||
1270 | kex_derive_keys(kex, hash, shared_secret); | 1271 | kex_derive_keys(kex, hash, shared_secret); |
diff --git a/sshd_config b/sshd_config index 614cf706b..52436ac36 100644 --- a/sshd_config +++ b/sshd_config | |||
@@ -1,6 +1,7 @@ | |||
1 | # This is ssh server systemwide configuration file. | 1 | # This is ssh server systemwide configuration file. |
2 | 2 | ||
3 | Port 22 | 3 | Port 22 |
4 | #Protocol 2,1 | ||
4 | ListenAddress 0.0.0.0 | 5 | ListenAddress 0.0.0.0 |
5 | #ListenAddress :: | 6 | #ListenAddress :: |
6 | HostKey /etc/ssh_host_key | 7 | HostKey /etc/ssh_host_key |