CryptoPkg/BaseCryptLibMbedTls : Add strncpy() support to SecCryptLib

Mbedtls requires the use of strncpy(), but it is currently included in DummyOpensslSupport.c, which is not part of Mbedtls SecCryptLib. To resolve this, move strncpy() to CrtWrapper.c, as Mbedtls SecCryptLib not depend on OpensslLib Signed-off-by: Amy Chan <[email protected]>
NVIDIA · Jan 11, 2025 · 11cffd9 · 11cffd9
1 parent c0533b7
commit 11cffd9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/SysCall/CrtWrapper.c b/CryptoPkg/Library/BaseCryptLibMbedTls/SysCall/CrtWrapper.c
@@ -47,6 +47,26 @@ strchr (
   return ScanMem8 (str, AsciiStrSize (str), (char)ch);
 }
 
+char *
+strncpy (
+  char        *strDest,
+  const char  *strSource,
+  size_t      count
+  )
+{
+  UINTN  DestMax = MAX_STRING_SIZE;
+
+  if (count < MAX_STRING_SIZE) {
+    DestMax = count + 1;
+  } else {
+    count = MAX_STRING_SIZE-1;
+  }
+
+  AsciiStrnCpyS (strDest, DestMax, strSource, (UINTN)count);
+
+  return strDest;
+}
+
 /**strcmp function. **/
 int
 strcmp (

diff --git a/CryptoPkg/Library/BaseCryptLibMbedTls/SysCall/DummyOpensslSupport.c b/CryptoPkg/Library/BaseCryptLibMbedTls/SysCall/DummyOpensslSupport.c
@@ -262,26 +262,6 @@ strcpy (
   return strDest;
 }
 
-char *
-strncpy (
-  char        *strDest,
-  const char  *strSource,
-  size_t      count
-  )
-{
-  UINTN  DestMax = MAX_STRING_SIZE;
-
-  if (count < MAX_STRING_SIZE) {
-    DestMax = count + 1;
-  } else {
-    count = MAX_STRING_SIZE-1;
-  }
-
-  AsciiStrnCpyS (strDest, DestMax, strSource, (UINTN)count);
-
-  return strDest;
-}
-
 //
 // -- Character Classification Routines --
 //