Minor fixes to recent HTTP proxy changes:

* use strcasecmp instead of stricmp

* define HASH and HASHHEX as unsigned char to avoid compiler
  warnings

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@5629 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/config-win32.h b/config-win32.h
index bed043c063d884a17c5df6f218e357d412dd617b..be0b3207eed1bfca95806187d403ece1e129da6f 100644 (file)
--- a/config-win32.h
+++ b/config-win32.h
@@ -291,7 +291,7 @@ typedef unsigned long in_addr_t;
 #define lseek _lseek\r
 #define chdir _chdir\r
 #define strdup _strdup\r
-#define stricmp _stricmp\r
+#define strcasecmp _stricmp\r
 #define chsize _chsize\r
 #define S_IRUSR 0\r
 #define S_IWUSR 0\r

diff --git a/httpdigest.c b/httpdigest.c
index abe5beaf8014d71a2f422d73248c83e203fd138d..ef77e12602485490e5880ca22399e671b8e271d9 100644 (file)
--- a/httpdigest.c
+++ b/httpdigest.c
@@ -75,7 +75,7 @@ DigestCalcHA1(
   MD5_Update(&Md5Ctx, ":", 1);\r
   MD5_Update(&Md5Ctx, pszPassword, strlen(pszPassword));\r
   MD5_Final(HA1, &Md5Ctx);\r
-  if (pszAlg && stricmp(pszAlg, "md5-sess") == 0)\r
+  if (pszAlg && strcasecmp(pszAlg, "md5-sess") == 0)\r
     {\r
       MD5_Init(&Md5Ctx);\r
       MD5_Update(&Md5Ctx, HA1, HASHLEN);\r
@@ -112,7 +112,7 @@ DigestCalcResponse(
   MD5_Update(&Md5Ctx, pszMethod, strlen(pszMethod));\r
   MD5_Update(&Md5Ctx, ":", 1);\r
   MD5_Update(&Md5Ctx, pszDigestUri, strlen(pszDigestUri));\r
-  if (stricmp(pszQop, "auth-int") == 0)\r
+  if (strcasecmp(pszQop, "auth-int") == 0)\r
     {\r
       MD5_Update(&Md5Ctx, ":", 1);\r
       MD5_Update(&Md5Ctx, HEntity, HASHHEXLEN);\r

diff --git a/httpdigest.h b/httpdigest.h
index d4764a150d1a37d0bb1a49c0353db8ea2e1c3b4e..fb6d114b38f25de5a047da80d8e797cd84569c95 100644 (file)
--- a/httpdigest.h
+++ b/httpdigest.h
@@ -25,9 +25,9 @@
 #if PROXY_DIGEST_AUTH\r
 \r
 #define HASHLEN 16\r
-typedef char HASH[HASHLEN];\r
+typedef unsigned char HASH[HASHLEN];\r
 #define HASHHEXLEN 32\r
-typedef char HASHHEX[HASHHEXLEN+1];\r
+typedef unsigned char HASHHEX[HASHHEXLEN+1];\r
 #undef IN\r
 #undef OUT\r
 #define IN const\r