- djm@cvs.openbsd.org 2005/01/23 10:18:12

     [cipher.c]
     config option "Ciphers" should be case-sensitive; ok dtucker@

diff --git a/ChangeLog b/ChangeLog
index 334e6969d7767351bbf5fce5cf73ddd7959c0118..1460c5d0c886df9b5c707e33a8a304413ef6914c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
      [auth.c]
      Log source of connections denied by AllowUsers, DenyUsers, AllowGroups and
      DenyGroups.  bz #909, ok djm@
+   - djm@cvs.openbsd.org 2005/01/23 10:18:12
+     [cipher.c]
+     config option "Ciphers" should be case-sensitive; ok dtucker@
 
 20050120
  - (dtucker) OpenBSD CVS Sync

diff --git a/cipher.c b/cipher.c
index 64be0571f431b188cf6f9ddc150547ff3a0010ca..beba4618dc82d2912fffd2ec32066734a8b59325 100644 (file)
--- a/cipher.c
+++ b/cipher.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: cipher.c,v 1.72 2004/12/22 02:13:19 djm Exp $");
+RCSID("$OpenBSD: cipher.c,v 1.73 2005/01/23 10:18:12 djm Exp $");
 
 #include "xmalloc.h"
 #include "log.h"
@@ -146,7 +146,7 @@ cipher_by_name(const char *name)
 {
        Cipher *c;
        for (c = ciphers; c->name != NULL; c++)
-               if (strcasecmp(c->name, name) == 0)
+               if (strcmp(c->name, name) == 0)
                        return c;
        return NULL;
 }
@@ -199,8 +199,10 @@ cipher_number(const char *name)
        Cipher *c;
        if (name == NULL)
                return -1;
-       c = cipher_by_name(name);
-       return (c==NULL) ? -1 : c->number;
+       for (c = ciphers; c->name != NULL; c++)
+               if (strcasecmp(c->name, name) == 0)
+                       return c->number;
+       return -1;
 }
 
 char *