diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
index d43806708a..c6f72193e7 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
@@ -35,10 +35,10 @@
 # Autogenerated files list ends here
   buildinf.h
   buildinf.c
-  ossl_store.c
-  rand_pool.c
-#  SslNull.c
-  EcSm2Null.c
+  OpensslStub/ossl_store.c
+  OpensslStub/rand_pool.c
+#  OpensslStub/SslNull.c
+  OpensslStub/EcSm2Null.c
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
index 54cf01279c..98fcad47dc 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibAccel.inf
@@ -37,10 +37,10 @@
 # Autogenerated files list ends here
   buildinf.h
   buildinf.c
-  ossl_store.c
-  rand_pool.c
-#  SslNull.c
-  EcSm2Null.c
+  OpensslStub/ossl_store.c
+  OpensslStub/rand_pool.c
+#  OpensslStub/SslNull.c
+  OpensslStub/EcSm2Null.c
 
 [Sources.IA32]
 # Autogenerated files list starts here
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
index 3037eba9d3..861f42c3d8 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
@@ -36,10 +36,10 @@
 # Autogenerated files list ends here
   buildinf.h
   buildinf.c
-  ossl_store.c
-  rand_pool.c
-  SslNull.c
-  EcSm2Null.c
+  OpensslStub/ossl_store.c
+  OpensslStub/rand_pool.c
+  OpensslStub/SslNull.c
+  OpensslStub/EcSm2Null.c
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
index f9c00605f2..7815b5fea1 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibFull.inf
@@ -40,10 +40,10 @@
 # Autogenerated files list ends here
   buildinf.h
   buildinf.c
-  ossl_store.c
-  rand_pool.c
-#  SslNull.c
-#  EcSm2Null.c
+  OpensslStub/ossl_store.c
+  OpensslStub/rand_pool.c
+#  OpensslStub/SslNull.c
+#  OpensslStub/EcSm2Null.c
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
index 7ba262cb01..0a13bd04bf 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
@@ -42,10 +42,10 @@
 # Autogenerated files list ends here
   buildinf.h
   buildinf.c
-  ossl_store.c
-  rand_pool.c
-#  SslNull.c
-#  EcSm2Null.c
+  OpensslStub/ossl_store.c
+  OpensslStub/rand_pool.c
+#  OpensslStub/SslNull.c
+#  OpensslStub/EcSm2Null.c
 
 [Sources.IA32]
 # Autogenerated files list starts here
diff --git a/CryptoPkg/Library/OpensslLib/EcSm2Null.c b/CryptoPkg/Library/OpensslLib/OpensslStub/EcSm2Null.c
similarity index 100%
rename from CryptoPkg/Library/OpensslLib/EcSm2Null.c
rename to CryptoPkg/Library/OpensslLib/OpensslStub/EcSm2Null.c
diff --git a/CryptoPkg/Library/OpensslLib/SslNull.c b/CryptoPkg/Library/OpensslLib/OpensslStub/SslNull.c
similarity index 100%
rename from CryptoPkg/Library/OpensslLib/SslNull.c
rename to CryptoPkg/Library/OpensslLib/OpensslStub/SslNull.c
diff --git a/CryptoPkg/Library/OpensslLib/ossl_store.c b/CryptoPkg/Library/OpensslLib/OpensslStub/ossl_store.c
similarity index 100%
rename from CryptoPkg/Library/OpensslLib/ossl_store.c
rename to CryptoPkg/Library/OpensslLib/OpensslStub/ossl_store.c
diff --git a/CryptoPkg/Library/OpensslLib/rand_pool.c b/CryptoPkg/Library/OpensslLib/OpensslStub/rand_pool.c
similarity index 100%
rename from CryptoPkg/Library/OpensslLib/rand_pool.c
rename to CryptoPkg/Library/OpensslLib/OpensslStub/rand_pool.c