From: Richard Levitte <levitte@openssl.org>
Date: Wed, 12 May 2004 10:09:00 +0000 (+0000)
Subject: The functions OPENSSL_strcasen?cmp() were forgotten when merging the
X-Git-Tag: OpenSSL_0_9_7e~114
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d529f2a8f743f9026010aabd0b6ba2bca5be7620;p=oweals%2Fopenssl.git

The functions OPENSSL_strcasen?cmp() were forgotten when merging the
FIPS branch into this.  It's needed at least for certain OpenVMS
versions, and should really be used in a more general way.
---

diff --git a/apps/apps.h b/apps/apps.h
index 0fbb3a8914..f3f8882b29 100644
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -141,12 +141,6 @@ long app_RAND_load_files(char *file); /* `file' is a list of files to read,
 int WIN32_rename(char *oldname,char *newname);
 #endif
 
-/* VMS below version 7.0 doesn't have strcasecmp() */
-#ifdef OPENSSL_SYS_VMS
-#define strcasecmp(str1,str2) VMS_strcasecmp((str1),(str2))
-int VMS_strcasecmp(const char *str1, const char *str2);
-#endif
-
 #ifndef MONOLITH
 
 #define MAIN(a,v)	main(a,v)
diff --git a/crypto/o_str.c b/crypto/o_str.c
index 0bdfb40076..5cdfc4f9a0 100644
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -56,11 +56,12 @@
  *
  */
 
-#include <ctype.h>
-#include <strings.h>
-#include "o_str.h"
+#include <o_str.h>
 #include <openssl/e_os2.h>
 
+#undef strncasecmp
+#undef strcasecmp
+
 int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n)
 	{
 #if defined(OPENSSL_SYS_VMS)