summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/cipher.c
diff options
context:
space:
mode:
authorprovos <provos@openbsd.org>1999-09-30 18:37:45 +0000
committerprovos <provos@openbsd.org>1999-09-30 18:37:45 +0000
commit705c03c914a1f416240f207f3a4eb858a6803d1f (patch)
tree9e9e2eb72bb83ad152910739e6aae5b424f3ac14 /usr.bin/ssh/cipher.c
parentbetter way to deal with authfile cipher; dugsong@ (diff)
downloadwireguard-openbsd-705c03c914a1f416240f207f3a4eb858a6803d1f.tar.xz
wireguard-openbsd-705c03c914a1f416240f207f3a4eb858a6803d1f.zip
less brain damage, get rid of 'no '
Diffstat (limited to 'usr.bin/ssh/cipher.c')
-rw-r--r--usr.bin/ssh/cipher.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/ssh/cipher.c b/usr.bin/ssh/cipher.c
index a9e2edbc525..817d9474ed1 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.8 1999/09/30 17:08:52 deraadt Exp $");
+RCSID("$Id: cipher.c,v 1.9 1999/09/30 18:37:45 provos Exp $");
#include "ssh.h"
#include "cipher.h"
@@ -123,12 +123,12 @@ detect_cbc_attack(const unsigned char *src,
int cipher.h. */
static char *cipher_names[] =
{
- "no none",
- "no idea",
- "no des",
+ NULL, /* no none */
+ NULL, /* no idea */
+ NULL, /* no des */
"3des",
- "no tss",
- "no rc4",
+ NULL, /* no tss */
+ NULL, /* no rc4 */
"blowfish"
};
@@ -162,7 +162,7 @@ cipher_number(const char *name)
{
int i;
for (i = 0; i < sizeof(cipher_names) / sizeof(cipher_names[0]); i++)
- if (strcmp(cipher_names[i], name) == 0)
+ if (cipher_names[i] != NULL && strcmp(cipher_names[i], name) == 0)
return i;
return -1;
}