use the non-locale dependent versions of isxxx functions.

5 files changed, 13 insertions, 9 deletions

diff --git a/lib/system.c b/lib/system.c
index 834266759e..56e13e9bfe 100644
--- a/lib/system.c
+++ b/lib/system.c
@@ -606,7 +606,7 @@ const char *src = data;
 
   for (i=j=0;i<size;i+=2,j++)
     {
-      if (src[i] != 0 || !isascii(src[i+1]))
+      if (src[i] != 0 || !c_isascii(src[i+1]))
         return gnutls_assert_val(GNUTLS_E_PARSING_ERROR);
       dst[j] = src[i+1];
     }
diff --git a/lib/tpm.c b/lib/tpm.c
index 9d1820ac5a..b3ddcb83bd 100644
--- a/lib/tpm.c
+++ b/lib/tpm.c
@@ -40,6 +40,7 @@
 #include <x509_b64.h>
 #include <random.h>
 #include <pin.h>
+#include <c-ctype.h>
 
 #include <trousers/tss.h>
 #include <trousers/trousers.h>
@@ -784,7 +785,7 @@ static int decode_tpmkey_url(const char* url, struct tpmkey_url_st *s)
             {
               break;
             }
-          if (isalnum(p[i])) tmp_uuid[j++]=p[i];
+          if (c_isalnum(p[i])) tmp_uuid[j++]=p[i];
         }
       tmp_uuid[j] = 0;
 
diff --git a/lib/x509/common.c b/lib/x509/common.c
index 5f89fa0a1d..35ab13f41f 100644
--- a/lib/x509/common.c
+++ b/lib/x509/common.c
@@ -31,6 +31,7 @@
 #include <x509_b64.h>
 #include "x509_int.h"
 #include <common.h>
+#include <c-ctype.h>
 
 struct oid_to_string
 {
@@ -222,7 +223,7 @@ size_t size;
        * characters then treat it as printable.
        */
       for (i = 0; i < input->size; i++)
-        if (!isascii (input->data[i]))
+        if (!c_isascii (input->data[i]))
           ascii = 1;
 
       if (ascii == 0)
diff --git a/lib/x509/pkcs12_encr.c b/lib/x509/pkcs12_encr.c
index ba4e39e98c..9f26a3130a 100644
--- a/lib/x509/pkcs12_encr.c
+++ b/lib/x509/pkcs12_encr.c
@@ -24,6 +24,7 @@
 #include <gnutls_mpi.h>
 #include <gnutls_errors.h>
 #include <x509_int.h>
+#include <c-ctype.h>
 
 /* Returns 0 if the password is ok, or a negative error
  * code instead.
@@ -35,7 +36,7 @@ _pkcs12_check_pass (const char *pass, size_t plen)
 
   for (i = 0; i < plen; i++)
     {
-      if (isascii (pass[i]))
+      if (c_isascii (pass[i]))
         continue;
       return GNUTLS_E_INVALID_PASSWORD;
     }
diff --git a/lib/x509/x509_dn.c b/lib/x509/x509_dn.c
index fbfb4e8b10..fad77bb978 100644
--- a/lib/x509/x509_dn.c
+++ b/lib/x509/x509_dn.c
@@ -30,6 +30,7 @@
 #include <common.h>
 #include <gnutls_x509.h>
 #include <x509_b64.h>
+#include <c-ctype.h>
 
 typedef int (*set_dn_func) (void*, const char *oid, unsigned int raw_flag, const void *name, unsigned int name_size);
                                                                                                                                                        
@@ -44,7 +45,7 @@ int dn_attr_crt_set( set_dn_func f, void* crt, const char *attr, unsigned attr_l
   if (value_len == 0 || attr_len == 0)
     return gnutls_assert_val(GNUTLS_E_PARSING_ERROR);
     
-  if (isdigit(attr[0]) != 0)
+  if (c_isdigit(attr[0]) != 0)
     {
       if (attr_len >= sizeof(_oid))
         return gnutls_assert_val(GNUTLS_E_PARSING_ERROR);
@@ -100,7 +101,7 @@ int ret;
   while (*p != 0 && *p != '\n')
     {
       /* Skip leading whitespace */
-      while (isspace(*p))
+      while (c_isspace(*p))
         p++;
       
       if (err)
@@ -113,7 +114,7 @@ int ret;
       name_end = p;
 
       /* Whitespace */
-      while (isspace(*p))
+      while (c_isspace(*p))
         p++;
 
       /* Equals sign */
@@ -125,7 +126,7 @@ int ret;
       p++;
 
       /* Whitespace */
-      while (isspace(*p))
+      while (c_isspace(*p))
         p++;
 
       /* Attribute value */
@@ -133,7 +134,7 @@ int ret;
       while (*p != 0 && (*p != ',' || (*p == ',' && *(p-1) == '\\')) && *p != '\n')
         p++;
       value_end = p;
-      while (value_end > value_start && isspace(value_end[-1]))
+      while (value_end > value_start && c_isspace(value_end[-1]))
         value_end--;
 
       /* Comma, or the end of the string */