Crypto migration to Openssl 3.0.15

.gitmodules

@@ -1,19 +1,18 @@
 [submodule "MU_BASECORE"]
 	path = MU_BASECORE
 	url = https://github.com/microsoft/mu_basecore.git
-	branch = release/202302
+	branch = release/202405
 [submodule "Silicon/Arm/MU_TIANO"]
 	path = Silicon/Arm/MU_TIANO
 	url = https://github.com/microsoft/mu_silicon_arm_tiano.git
-	branch = release/202302
+	branch = release/202405
 [submodule "Features/MM_SUPV"]
 	path = Features/MM_SUPV
 	url = https://github.com/microsoft/mu_feature_mm_supv.git
 	branch = main
 [submodule "OpensslPkg/Library/OpensslLib/openssl"]
 	path = OpensslPkg/Library/OpensslLib/openssl
 	url = https://github.com/openssl/openssl.git
-[submodule "Common"]
-	path = Common
+[submodule "Common/MU"]
+	path = Common/MU
 	url = https://github.com/microsoft/mu_plus.git
-	branch = release/202302

.pytool/CISettings.py

@@ -186,6 +186,11 @@ def GetDependencies(self):
                 "Path": "Features/MM_SUPV",
                 "Url": "https://github.com/microsoft/mu_feature_mm_supv.git",
                 "Branch": "main"
+            },
+            {
+                "Path": "Common/MU",
+                "Url": "https://github.com/microsoft/mu_plus.git",
+                "Branch": "release/202405"
             }
         ]
     def GetPackagesPath(self):

OpensslPkg/Library/BaseCryptLib/Hash/CryptSm3.c

@@ -7,7 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "InternalCryptLib.h"
-#include "crypto/sm3.h"
+#include "internal/sm3.h"
 
 /**
   Retrieves the size, in bytes, of the context buffer required for SM3 hash operations.
@@ -55,7 +55,7 @@ Sm3Init (
   //
   // Openssl SM3 Context Initialization
   //
-  sm3_init ((SM3_CTX *)Sm3Context);
+  ossl_sm3_init  ((SM3_CTX *)Sm3Context);
   return TRUE;
 }
 
@@ -136,7 +136,7 @@ Sm3Update (
   //
   // Openssl SM3 Hash Update
   //
-  sm3_update ((SM3_CTX *)Sm3Context, Data, DataSize);
+  ossl_sm3_update ((SM3_CTX *)Sm3Context, Data, DataSize);
 
   return TRUE;
 }
@@ -178,7 +178,7 @@ Sm3Final (
   //
   // Openssl SM3 Hash Finalization
   //
-  sm3_final (HashValue, (SM3_CTX *)Sm3Context);
+  ossl_sm3_final (HashValue, (SM3_CTX *)Sm3Context);
 
   return TRUE;
 }
@@ -225,11 +225,11 @@ Sm3HashAll (
   //
   // SM3 Hash Computation.
   //
-  sm3_init (&Ctx);
+  ossl_sm3_init (&Ctx);
 
-  sm3_update (&Ctx, Data, DataSize);
+  ossl_sm3_update (&Ctx, Data, DataSize);
 
-  sm3_final (HashValue, &Ctx);
+  ossl_sm3_final (HashValue, &Ctx);
 
   return TRUE;
 }

OpensslPkg/Library/BaseCryptLib/InternalCryptLib.h

@@ -20,6 +20,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include "CrtLibSupport.h"
 
+// TODO: remove in near future to stop using deprecated OpenSSL APIs
+#define OPENSSL_NO_DEPRECATED  0
+
 #include <openssl/opensslv.h>
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L

OpensslPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyCommon.c

@@ -466,6 +466,7 @@ Pkcs7GetCertificatesList (
   BOOLEAN         Status;
   UINT8           *NewP7Data;
   UINTN           NewP7Length;
+  CONST UINT8     *Temp;
   BOOLEAN         Wrapped;
   UINT8           Index;
   PKCS7           *Pkcs7;
@@ -528,7 +529,8 @@ Pkcs7GetCertificatesList (
   //
   // Decodes PKCS#7 SignedData
   //
-  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **)&NewP7Data, (int)NewP7Length);
+  Temp  = NewP7Data;
+  Pkcs7 = d2i_PKCS7 (NULL, (const unsigned char **)&Temp, (int)NewP7Length);
   if ((Pkcs7 == NULL) || (!PKCS7_type_is_signed (Pkcs7))) {
     goto _Error;
   }

OpensslPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c

@@ -484,32 +484,6 @@ fwrite (
   return 0;
 }
 
-//
-//  -- Dummy OpenSSL Support Routines --
-//
-
-int
-BIO_printf (
-  void        *bio,
-  const char  *format,
-  ...
-  )
-{
-  return 0;
-}
-
-int
-BIO_snprintf (
-  char        *buf,
-  size_t      n,
-  const char  *format,
-  ...
-  )
-{
-  // Because the function does not actually print anything to buf, it returns -1 as error.
-  // Otherwise, the consumer may think that the buf is valid and parse the buffer.
-  return -1;
-}
 
 #ifdef __GNUC__
 

OpensslPkg/Library/BaseCryptLib/SysCall/UnitTestHostCrtWrapper.c

@@ -72,31 +72,6 @@ sscanf (
   return 0;
 }
 
-//
-//  -- Dummy OpenSSL Support Routines --
-//
-
-int
-BIO_printf (
-  void        *bio,
-  const char  *format,
-  ...
-  )
-{
-  return 0;
-}
-
-int
-BIO_snprintf (
-  char        *buf,
-  size_t      n,
-  const char  *format,
-  ...
-  )
-{
-  return 0;
-}
-
 uid_t
 getuid (
   void

OpensslPkg/Library/Include/CrtLibSupport.h

@@ -87,6 +87,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define UINT_MAX      0xFFFFFFFF      /* Maximum unsigned int value */
 #define ULONG_MAX     0xFFFFFFFF      /* Maximum unsigned long value */
 #define CHAR_BIT      8               /* Number of bits in a char */
+#define SIZE_MAX      0xFFFFFFFF      /* Maximum unsigned size_t */
 
 //
 // Address families.