3 files changed, 17 insertions, 17 deletions
diff --git a/Cryptlib/Include/OpenSslSupport.h b/Cryptlib/Include/OpenSslSupport.h
index b38043cb..0b555271 100644
--- a/Cryptlib/Include/OpenSslSupport.h
+++ b/Cryptlib/Include/OpenSslSupport.h
@@ -370,14 +370,14 @@ extern FILE  *stdout;
 #define memcmp(buf1,buf2,count)           (int)(CompareMem(buf1,buf2,(UINTN)(count)))
 #define memmove(dest,source,count)        CopyMem(dest,source,(UINTN)(count))
 #define strlen(str)                       (size_t)(AsciiStrLen((CHAR8 *)str))
-#define strcpy(strDest,strSource)         AsciiStrCpy(strDest,strSource)
-#define strncpy(strDest,strSource,count)  AsciiStrnCpy(strDest,strSource,(UINTN)count)
-#define strcat(strDest,strSource)         AsciiStrCat(strDest,strSource)
+#define strcpy(strDest,strSource)         AsciiStrCpy((CHAR8 *)strDest,(const CHAR8 *)strSource)
+#define strncpy(strDest,strSource,count)  AsciiStrnCpy((CHAR8 *)strDest,(const CHAR8 *)strSource,(UINTN)count)
+#define strcat(strDest,strSource)         AsciiStrCat((CHAR8 *)strDest,(const CHAR8 *)strSource)
 #define strchr(str,ch)                    (char *)(ScanMem8((CHAR8 *)str,AsciiStrSize((CHAR8 *)str),ch))
-#define strncmp(string1,string2,count)    (int)(AsciiStrnCmp(string1,string2,(UINTN)(count)))
+#define strncmp(string1,string2,count)    (int)(AsciiStrnCmp((const CHAR8 *)string1, (const CHAR8 *)string2,(UINTN)(count)))
 #define localtime(timer)                  NULL
 #define assert(expression)
-#define atoi(nptr)                        AsciiStrDecimalToUintn(nptr)
+#define atoi(nptr)                        AsciiStrDecimalToUintn((const CHAR8 *)nptr)
 #define gettimeofday(tvp,tz)              do { (tvp)->tv_sec = time(NULL); (tvp)->tv_usec = 0; } while (0)
 #define gmtime_r(timer,result)            (result = NULL)
 #define abort()
diff --git a/Cryptlib/Library/BaseLib.h b/Cryptlib/Library/BaseLib.h
index 5d326844..93d5c691 100644
--- a/Cryptlib/Library/BaseLib.h
+++ b/Cryptlib/Library/BaseLib.h
@@ -2,8 +2,8 @@
 #include <efilib.h>
 
 UINT32 WriteUnaligned32 (UINT32 *Buffer, UINT32 Value);
-UINTN AsciiStrSize (CHAR8 *string);
-char *AsciiStrnCpy(char *Destination, char *Source, UINTN count);
-char *AsciiStrCat(char *Destination, char *Source);
-CHAR8 *AsciiStrCpy(CHAR8 *Destination, CHAR8 *Source);
-UINTN AsciiStrDecimalToUintn(const char *String);
+UINTN AsciiStrSize (const CHAR8 *string);
+CHAR8 *AsciiStrnCpy(CHAR8 *Destination, const CHAR8 *Source, UINTN count);
+CHAR8 *AsciiStrCat(CHAR8 *Destination, const CHAR8 *Source);
+CHAR8 *AsciiStrCpy(CHAR8 *Destination, const CHAR8 *Source);
+UINTN AsciiStrDecimalToUintn(const CHAR8 *String);
diff --git a/Cryptlib/SysCall/BaseStrings.c b/Cryptlib/SysCall/BaseStrings.c
index 252e6db3..c4b3e18e 100644
--- a/Cryptlib/SysCall/BaseStrings.c
+++ b/Cryptlib/SysCall/BaseStrings.c
@@ -1,7 +1,7 @@
 #include <OpenSslSupport.h>
 
-char *
-AsciiStrCat(char *Destination, char *Source)
+CHAR8 *
+AsciiStrCat(CHAR8 *Destination, const CHAR8 *Source)
 {
 	UINTN dest_len = strlena((CHAR8 *)Destination);
 	UINTN i;
@@ -14,7 +14,7 @@ AsciiStrCat(char *Destination, char *Source)
 }
 
 CHAR8 *
-AsciiStrCpy(CHAR8 *Destination, CHAR8 *Source)
+AsciiStrCpy(CHAR8 *Destination, const CHAR8 *Source)
 {
 	UINTN i;
 
@@ -25,8 +25,8 @@ AsciiStrCpy(CHAR8 *Destination, CHAR8 *Source)
 	return Destination;
 }
 
-char *
-AsciiStrnCpy(char *Destination, char *Source, UINTN count)
+CHAR8 *
+AsciiStrnCpy(CHAR8 *Destination, const CHAR8 *Source, UINTN count)
 {
 	UINTN i;
 
@@ -59,7 +59,7 @@ WriteUnaligned32(UINT32 *Buffer, UINT32 Value)
 }
 
 UINTN
-AsciiStrSize(CHAR8 *string)
+AsciiStrSize(const CHAR8 *string)
 {
 	return strlena(string) + 1;
 }
@@ -97,7 +97,7 @@ strcasecmp (const char *str1, const char *str2)
 /* Based on AsciiStrDecimalToUintnS() in edk2
  * MdePkg/Library/BaseLib/SafeString.c */
 UINTN
-AsciiStrDecimalToUintn(const char *String)
+AsciiStrDecimalToUintn(const CHAR8 *String)
 {
 	UINTN     Result;