diff options
author | Richard Levitte <levitte@openssl.org> | 2016-05-27 10:12:58 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-05-28 02:15:04 +0200 |
commit | 7233bea26350d0541909a2fe30e87a95327fb065 (patch) | |
tree | e64babb3bf6207ce04ce99ef33d931deb0eeb350 /crypto/o_str.c | |
parent | 90edbfcce3b84287332ac77f19993cbc18effdef (diff) |
Remove internal functions OPENSSL_strcasecmp and OPENSSL_strncasecmp
Their only reason to exist was that they didn't exist in VMS before
version 7.0. We do not support such old versions any more.
However, for the benefit of systems that don't get strings.h included
by string.h, we include the former in e_os.h.
RT#4458
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'crypto/o_str.c')
-rw-r--r-- | crypto/o_str.c | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/crypto/o_str.c b/crypto/o_str.c index b0e7524820..29c324f474 100644 --- a/crypto/o_str.c +++ b/crypto/o_str.c @@ -14,49 +14,6 @@ #include "internal/cryptlib.h" #include "internal/o_str.h" -#if !defined(OPENSSL_IMPLEMENTS_strncasecmp) && \ - !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_WINCE) && \ - !defined(NETWARE_CLIB) -# include <strings.h> -#endif - -int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n) -{ -#if defined(OPENSSL_IMPLEMENTS_strncasecmp) - while (*str1 && *str2 && n) { - int res = toupper(*str1) - toupper(*str2); - if (res) - return res < 0 ? -1 : 1; - str1++; - str2++; - n--; - } - if (n == 0) - return 0; - if (*str1) - return 1; - if (*str2) - return -1; - return 0; -#else - /* - * Recursion hazard warning! Whenever strncasecmp is #defined as - * OPENSSL_strncasecmp, OPENSSL_IMPLEMENTS_strncasecmp must be defined as - * well. - */ - return strncasecmp(str1, str2, n); -#endif -} - -int OPENSSL_strcasecmp(const char *str1, const char *str2) -{ -#if defined(OPENSSL_IMPLEMENTS_strncasecmp) - return OPENSSL_strncasecmp(str1, str2, (size_t)-1); -#else - return strcasecmp(str1, str2); -#endif -} - int OPENSSL_memcmp(const void *v1, const void *v2, size_t n) { const unsigned char *c1 = v1, *c2 = v2; |