diff options
| author | Niels Provos <provos@cvs.openbsd.org> | 1999-09-30 14:05:42 +0000 |
|---|---|---|
| committer | Niels Provos <provos@cvs.openbsd.org> | 1999-09-30 14:05:42 +0000 |
| commit | 8e65edaf5619f2b4cb4cf480f414533e9aeeba5f (patch) | |
| tree | fcc5a5270135344fb196fe55e573c77b73e14d6c /usr.bin | |
| parent | dcd0c1975c714f780fcd9e3a06817810e235ae88 (diff) | |
remove ``none''.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/cipher.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh.c | 15 |
2 files changed, 7 insertions, 14 deletions
diff --git a/usr.bin/ssh/cipher.c b/usr.bin/ssh/cipher.c index ae93413fb43..4a846890094 100644 --- a/usr.bin/ssh/cipher.c +++ b/usr.bin/ssh/cipher.c @@ -12,7 +12,7 @@ Created: Wed Apr 19 17:41:39 1995 ylo */ #include "includes.h" -RCSID("$Id: cipher.c,v 1.6 1999/09/30 05:53:04 deraadt Exp $"); +RCSID("$Id: cipher.c,v 1.7 1999/09/30 14:05:41 provos Exp $"); #include "ssh.h" #include "cipher.h" @@ -122,7 +122,7 @@ detect_cbc_attack(const unsigned char *src, int cipher.h. */ static char *cipher_names[] = { - "none", + "no none", "no idea", "no des", "3des", @@ -138,7 +138,6 @@ static char *cipher_names[] = unsigned int cipher_mask() { unsigned int mask = 0; - mask |= 1 << SSH_CIPHER_NONE; mask |= 1 << SSH_CIPHER_3DES; /* Mandatory */ mask |= 1 << SSH_CIPHER_BLOWFISH; return mask; @@ -205,6 +204,7 @@ void cipher_set_key(CipherContext *context, int cipher, switch (cipher) { case SSH_CIPHER_NONE: + /* Has to stay for authfile saving of private key with no passphrase */ break; case SSH_CIPHER_3DES: diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 2a1036a039e..6f12dd311d3 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -18,7 +18,7 @@ Modified to work with SSL by Niels Provos <provos@citi.umich.edu> in Canada. */ #include "includes.h" -RCSID("$Id: ssh.c,v 1.18 1999/09/30 05:53:04 deraadt Exp $"); +RCSID("$Id: ssh.c,v 1.19 1999/09/30 14:05:41 provos Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -100,16 +100,9 @@ usage() fprintf(stderr, " -f Fork into background after authentication.\n"); fprintf(stderr, " -e char Set escape character; ``none'' = disable (default: ~).\n"); - fprintf(stderr, " -c cipher Select encryption algorithm: "); - for (i = 1; i <= 6; i++) - { - const char *t = cipher_name(i); - if (t[0] == 'n' && t[1] == 'o' && t[2] == ' ') - continue; - fprintf(stderr, "%s, ", t); - } - fprintf(stderr, "or none.\n"); - + fprintf(stderr, " -c cipher Select encryption algorithm: " + "``3des'', " + "``blowfish''\n"); fprintf(stderr, " -p port Connect to this port. Server must be on the same port.\n"); fprintf(stderr, " -g Allow remote hosts to connect to forwarded ports.\n"); fprintf(stderr, " -L listen-port:host:port Forward local port to remote address\n"); |