diff options
| author | kris <kris@FreeBSD.org> | 2000-06-03 09:52:37 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-06-03 09:52:37 +0000 |
| commit | 3639dd9acea182e29b2d59915fbb97029217d9b2 (patch) | |
| tree | 2b0a0dae36e62d807780aa047b690ffacb266b19 /crypto/openssh/cipher.c | |
| parent | 585dc667de870922b14ce5a99c088c1a68de7934 (diff) | |
| download | FreeBSD-src-3639dd9acea182e29b2d59915fbb97029217d9b2.zip FreeBSD-src-3639dd9acea182e29b2d59915fbb97029217d9b2.tar.gz | |
Initial import of OpenSSH snapshot from 2000/05/30
Obtained from: OpenBSD
Diffstat (limited to 'crypto/openssh/cipher.c')
| -rw-r--r-- | crypto/openssh/cipher.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/openssh/cipher.c b/crypto/openssh/cipher.c index bcaff02..ca77c6d 100644 --- a/crypto/openssh/cipher.c +++ b/crypto/openssh/cipher.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$Id: cipher.c,v 1.26 2000/04/14 10:30:30 markus Exp $"); +RCSID("$Id: cipher.c,v 1.27 2000/05/22 18:42:00 markus Exp $"); #include "ssh.h" #include "cipher.h" @@ -178,7 +178,7 @@ ciphers_valid(const char *names) char *p; int i; - if (strcmp(names, "") == 0) + if (names == NULL || strcmp(names, "") == 0) return 0; ciphers = xstrdup(names); for ((p = strtok(ciphers, CIPHER_SEP)); p; (p = strtok(NULL, CIPHER_SEP))) { @@ -201,6 +201,8 @@ int cipher_number(const char *name) { int i; + if (name == NULL) + return -1; for (i = 0; i < sizeof(cipher_names) / sizeof(cipher_names[0]); i++) if (strcmp(cipher_names[i], name) == 0 && (cipher_mask() & (1 << i))) |
