diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | cipher.c | 10 |
2 files changed, 10 insertions, 5 deletions
@@ -9,6 +9,9 @@ | |||
9 | [auth.c] | 9 | [auth.c] |
10 | Log source of connections denied by AllowUsers, DenyUsers, AllowGroups and | 10 | Log source of connections denied by AllowUsers, DenyUsers, AllowGroups and |
11 | DenyGroups. bz #909, ok djm@ | 11 | DenyGroups. bz #909, ok djm@ |
12 | - djm@cvs.openbsd.org 2005/01/23 10:18:12 | ||
13 | [cipher.c] | ||
14 | config option "Ciphers" should be case-sensitive; ok dtucker@ | ||
12 | 15 | ||
13 | 20050120 | 16 | 20050120 |
14 | - (dtucker) OpenBSD CVS Sync | 17 | - (dtucker) OpenBSD CVS Sync |
@@ -2027,4 +2030,4 @@ | |||
2027 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2030 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2028 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2031 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2029 | 2032 | ||
2030 | $Id: ChangeLog,v 1.3622 2005/01/24 10:56:48 dtucker Exp $ | 2033 | $Id: ChangeLog,v 1.3623 2005/01/24 10:57:11 dtucker Exp $ |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: cipher.c,v 1.72 2004/12/22 02:13:19 djm Exp $"); | 38 | RCSID("$OpenBSD: cipher.c,v 1.73 2005/01/23 10:18:12 djm Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "log.h" | 41 | #include "log.h" |
@@ -146,7 +146,7 @@ cipher_by_name(const char *name) | |||
146 | { | 146 | { |
147 | Cipher *c; | 147 | Cipher *c; |
148 | for (c = ciphers; c->name != NULL; c++) | 148 | for (c = ciphers; c->name != NULL; c++) |
149 | if (strcasecmp(c->name, name) == 0) | 149 | if (strcmp(c->name, name) == 0) |
150 | return c; | 150 | return c; |
151 | return NULL; | 151 | return NULL; |
152 | } | 152 | } |
@@ -199,8 +199,10 @@ cipher_number(const char *name) | |||
199 | Cipher *c; | 199 | Cipher *c; |
200 | if (name == NULL) | 200 | if (name == NULL) |
201 | return -1; | 201 | return -1; |
202 | c = cipher_by_name(name); | 202 | for (c = ciphers; c->name != NULL; c++) |
203 | return (c==NULL) ? -1 : c->number; | 203 | if (strcasecmp(c->name, name) == 0) |
204 | return c->number; | ||
205 | return -1; | ||
204 | } | 206 | } |
205 | 207 | ||
206 | char * | 208 | char * |