diff options
| author | Daiki Ueno <dueno@redhat.com> | 2018-05-24 11:01:33 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2018-05-25 12:50:54 +0200 |
| commit | 117b35db99af4331daad4279eadfb9280e0c1325 (patch) | |
| tree | 981b85e10f2b1606f57386b2272e793eeb799331 /common | |
| parent | e42dcf5283a5537c196147c9a2468ee537b9da7b (diff) | |
common: Make case conversion locale independent
The tolower()/toupper() functions take into account of the current
locale settings, which p11-kit doesn't want. Add replacement
functions that work as if they are called under the C locale.
Diffstat (limited to 'common')
| -rw-r--r-- | common/compat.c | 16 | ||||
| -rw-r--r-- | common/compat.h | 3 | ||||
| -rw-r--r-- | common/mock.c | 4 | ||||
| -rw-r--r-- | common/url.c | 4 |
4 files changed, 23 insertions, 4 deletions
diff --git a/common/compat.c b/common/compat.c index 1e17230..2e559c7 100644 --- a/common/compat.c +++ b/common/compat.c @@ -953,3 +953,19 @@ fdwalk (int (* cb) (void *data, int fd), #endif /* HAVE_FDWALK */ #endif /* OS_UNIX */ + +int +p11_ascii_tolower (int c) +{ + if (c >= 'A' && c <= 'Z') + return 'a' + (c - 'A'); + return c; +} + +int +p11_ascii_toupper (int c) +{ + if (c >= 'a' && c <= 'z') + return 'A' + (c - 'a'); + return c; +} diff --git a/common/compat.h b/common/compat.h index a9d2fe1..96a731d 100644 --- a/common/compat.h +++ b/common/compat.h @@ -340,4 +340,7 @@ int fdwalk (int (* cb) (void *data, int fd), #endif +int p11_ascii_tolower (int c); +int p11_ascii_toupper (int c); + #endif /* __COMPAT_H__ */ diff --git a/common/mock.c b/common/mock.c index 8bd617d..d3c015f 100644 --- a/common/mock.c +++ b/common/mock.c @@ -2024,7 +2024,7 @@ mock_C_EncryptUpdate (CK_SESSION_HANDLE session, } for (i = 0; i < part_len; ++i) - encrypted_part[i] = toupper (part[i]); + encrypted_part[i] = p11_ascii_toupper (part[i]); *encrypted_part_len = part_len; return CKR_OK; } @@ -2220,7 +2220,7 @@ mock_C_DecryptUpdate (CK_SESSION_HANDLE session, } for (i = 0; i < encrypted_part_len; ++i) - part[i] = tolower (encrypted_part[i]); + part[i] = p11_ascii_tolower (encrypted_part[i]); *part_len = encrypted_part_len; return CKR_OK; } diff --git a/common/url.c b/common/url.c index 884c584..344d971 100644 --- a/common/url.c +++ b/common/url.c @@ -75,8 +75,8 @@ p11_url_decode (const char *value, free (result); return NULL; } - a = strchr (HEX_CHARS, tolower (value[0])); - b = strchr (HEX_CHARS, tolower (value[1])); + a = strchr (HEX_CHARS, p11_ascii_tolower (value[0])); + b = strchr (HEX_CHARS, p11_ascii_tolower (value[1])); if (!a || !b) { free (result); return NULL; |