Reviewed-by: Ye Ting <ting...@intel.com> -----Original Message----- From: Long, Qin Sent: Tuesday, September 01, 2015 4:55 PM To: Ye, Ting; Dong, Eric Cc: edk2-devel@lists.01.org Subject: [patch] CryptoPkg: Replace string wrapper functions with safe string functions
EDKII core suggest retire unsafe string functions. This patch is to replace string wrapper functions with new-added safe string functions for consistence. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qin Long <qin.l...@intel.com> --- CryptoPkg/Include/OpenSslSupport.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CryptoPkg/Include/OpenSslSupport.h b/CryptoPkg/Include/OpenSslSupport.h index b5a8b58..2c6e23c 100644 --- a/CryptoPkg/Include/OpenSslSupport.h +++ b/CryptoPkg/Include/OpenSslSupport.h @@ -21,6 +21,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Library/MemoryAllocationLib.h> #include <Library/DebugLib.h> +#define MAX_STRING_SIZE 0x1000 + // // File operations are not required for building Open SSL, // so FILE is mapped to VOID * to pass build @@ -236,10 +238,10 @@ extern FILE *stdout; #define memmove(dest,source,count) CopyMem(dest,source,(UINTN)(count)) #define strcmp AsciiStrCmp #define strncmp(string1,string2,count) (int)(AsciiStrnCmp(string1,string2,(UINTN)(count))) -#define strcpy(strDest,strSource) AsciiStrCpy(strDest,strSource) -#define strncpy(strDest,strSource,count) AsciiStrnCpy(strDest,strSource,(UINTN)count) -#define strlen(str) (size_t)(AsciiStrLen(str)) -#define strcat(strDest,strSource) AsciiStrCat(strDest,strSource) +#define strcpy(strDest,strSource) AsciiStrCpyS(strDest,MAX_STRING_SIZE,strSource) +#define strncpy(strDest,strSource,count) AsciiStrnCpyS(strDest,MAX_STRING_SIZE,strSource,(UINTN)count) +#define strlen(str) (size_t)(AsciiStrnLenS(str,MAX_STRING_SIZE)) +#define strcat(strDest,strSource) AsciiStrCatS(strDest,MAX_STRING_SIZE,strSource) #define strchr(str,ch) ScanMem8((VOID *)(str),AsciiStrSize(str),(UINT8)ch) #define abort() ASSERT (FALSE) #define assert(expression) -- 1.9.5.msysgit.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
