X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=crypto%2Fo_str.c;h=2db099333a7fd0781463f44b0023db619d0ffee0;hb=f0fa285f75f6551a78392a8c7ef0d3c229ad9e97;hp=5a78f3250977adbb2ef50a1b6e4679c1dcaba96f;hpb=3b4de6e4cc91516f799849307be1204f6b5f2f4a;p=openssl.git

diff --git a/crypto/o_str.c b/crypto/o_str.c
index 5a78f32509..2db099333a 100644
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -60,12 +60,9 @@
 #include <e_os.h>
 #include "o_str.h"
 
-#undef strncasecmp
-#undef strcasecmp
-
 int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
 	{
-#if defined(OPENSSL_SYS_VMS)
+#if defined(OPENSSL_IMPLEMENTS_strncasecmp)
 	while (*str1 && *str2 && n)
 		{
 		int res = toupper(*str1) - toupper(*str2);
@@ -81,20 +78,28 @@ int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
 	if (*str2)
 		return -1;
 	return 0;
-#elif defined(OPENSSL_SYS_WINDOWS)
-	return _strnicmp(str1, str2, n);
 #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_SYS_VMS)
+#if defined(OPENSSL_IMPLEMENTS_strncasecmp)
 	return OPENSSL_strncasecmp(str1, str2, (size_t)-1);
-#elif defined(OPENSSL_SYS_WINDOWS)
-	return _stricmp(str1, str2);
 #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;
+	int ret=0;
+
+	while(n && (ret=*c1-*c2)==0) n--,c1++,c2++;
+
+	return ret;
+	}