replaced strncmp() == 0 by strneq()
authorAndreas Steffen <andreas.steffen@strongswan.org>
Sun, 7 Oct 2007 13:42:43 +0000 (13:42 -0000)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Sun, 7 Oct 2007 13:42:43 +0000 (13:42 -0000)
src/libstrongswan/asn1/pem.c
src/libstrongswan/utils/identification.c

index 6418058..4ab70db 100755 (executable)
@@ -10,6 +10,8 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  * for more details.
+ *
+ * RCSID $Id$
  */
 
 #include <stdio.h>
@@ -40,7 +42,7 @@ static bool present(const char* pattern, chunk_t* ch)
 {
        u_int pattern_len = strlen(pattern);
 
-       if (ch->len >= pattern_len && strncmp(ch->ptr, pattern, pattern_len) == 0)
+       if (ch->len >= pattern_len && strneq(ch->ptr, pattern, pattern_len))
        {
                ch->ptr += pattern_len;
                ch->len -= pattern_len;
index d9b7670..6d969ed 100644 (file)
@@ -456,12 +456,16 @@ static bool same_dn(chunk_t a, chunk_t b)
                || (type_a == ASN1_IA5STRING && known_oid(oid_a) == OID_PKCS9_EMAIL)))
                {
                        if (strncasecmp(value_a.ptr, value_b.ptr, value_b.len) != 0)
+                       {
                                return FALSE;
+                       }
                }
                else
                {
-                       if (strncmp(value_a.ptr, value_b.ptr, value_b.len) != 0)
-                               return FALSE;
+                       if (!strneq(value_a.ptr, value_b.ptr, value_b.len))
+                       {
+                               return FALSE;   
+                       }
                }
        }
        /* both DNs must have same number of RDNs */
@@ -529,12 +533,16 @@ bool match_dn(chunk_t a, chunk_t b, int *wildcards)
                || (type_a == ASN1_IA5STRING && known_oid(oid_a) == OID_PKCS9_EMAIL)))
                {
                        if (strncasecmp(value_a.ptr, value_b.ptr, value_b.len) != 0)
+                       {
                                return FALSE;
+                       }
                }
                else
                {
-                       if (strncmp(value_a.ptr, value_b.ptr, value_b.len) != 0)
+                       if (!strneq(value_a.ptr, value_b.ptr, value_b.len))
+                       {
                                return FALSE;
+                       }
                }
        }
        /* both DNs must have same number of RDNs */