summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b43819e6..90d0c9d7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -147,6 +147,9 @@
147 - markus@cvs.openbsd.org 2001/03/04 00:03:59 147 - markus@cvs.openbsd.org 2001/03/04 00:03:59
148 [channels.c] 148 [channels.c]
149 debug1->2 149 debug1->2
150 - stevesk@cvs.openbsd.org 2001/03/04 10:57:53
151 [ssh.c]
152 add -m to usage; ok markus@
150 153
15120010304 15420010304
152 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. 155 - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@@ -4339,4 +4342,4 @@
4339 - Wrote replacements for strlcpy and mkdtemp 4342 - Wrote replacements for strlcpy and mkdtemp
4340 - Released 1.0pre1 4343 - Released 1.0pre1
4341 4344
4342$Id: ChangeLog,v 1.897 2001/03/05 07:33:14 mouring Exp $ 4345$Id: ChangeLog,v 1.898 2001/03/05 07:39:01 mouring Exp $
diff --git a/ssh.c b/ssh.c
index a08ddf397..c22002bd4 100644
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
39 */ 39 */
40 40
41#include "includes.h" 41#include "includes.h"
42RCSID("$OpenBSD: ssh.c,v 1.101 2001/03/03 23:59:34 markus Exp $"); 42RCSID("$OpenBSD: ssh.c,v 1.102 2001/03/04 10:57:53 stevesk Exp $");
43 43
44#include <openssl/evp.h> 44#include <openssl/evp.h>
45#include <openssl/err.h> 45#include <openssl/err.h>
@@ -175,6 +175,7 @@ usage(void)
175 175
176 fprintf(stderr, " -c cipher Select encryption algorithm: " 176 fprintf(stderr, " -c cipher Select encryption algorithm: "
177 "``3des'', ``blowfish''\n"); 177 "``3des'', ``blowfish''\n");
178 fprintf(stderr, " -m macs Specify MAC algorithms for protocol version 2.\n");
178 fprintf(stderr, " -p port Connect to this port. Server must be on the same port.\n"); 179 fprintf(stderr, " -p port Connect to this port. Server must be on the same port.\n");
179 fprintf(stderr, " -L listen-port:host:port Forward local port to remote address\n"); 180 fprintf(stderr, " -L listen-port:host:port Forward local port to remote address\n");
180 fprintf(stderr, " -R listen-port:host:port Forward remote port to local address\n"); 181 fprintf(stderr, " -R listen-port:host:port Forward remote port to local address\n");