-diff -ruN a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec
---- a/CryptoPkg/CryptoPkg.dec 2020-06-02 09:05:21.000000000 +0200
-+++ b/CryptoPkg/CryptoPkg.dec 2020-06-09 15:21:52.055912797 +0200
-@@ -23,7 +23,6 @@
- Private\r
- Library/Include\r
- Library/OpensslLib/openssl/include\r
-- Library/OpensslLib/openssl/crypto/include\r
- \r
- [LibraryClasses]\r
- ## @libraryclass Provides basic library functions for cryptographic primitives.\r
-diff -ruN a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c
---- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c 2020-06-02 09:05:21.000000000 +0200
-+++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c 2020-06-09 15:26:52.686439106 +0200
-@@ -7,7 +7,7 @@
- **/\r
- \r
- #include "InternalCryptLib.h"\r
--#include "internal/sm3.h"\r
-+#include <crypto/sm3.h>\r
- \r
- /**\r
- Retrieves the size, in bytes, of the context buffer required for SM3 hash operations.\r
-diff -ruN a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c
---- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c 2020-06-02 09:05:21.000000000 +0200
-+++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c 2020-06-09 15:22:47.512057737 +0200
-@@ -15,13 +15,12 @@
- #include <openssl/asn1.h>\r
- #include <openssl/x509.h>\r
- #include <openssl/bio.h>\r
--#include <internal/x509_int.h>\r
- #include <openssl/pkcs7.h>\r
- #include <openssl/bn.h>\r
- #include <openssl/x509_vfy.h>\r
- #include <openssl/pem.h>\r
- #include <openssl/evp.h>\r
--#include <internal/asn1_int.h>\r
-+#include <crypto/asn1.h>\r
- \r
- /**\r
- This function will return the leaf signer certificate in a chain. This is\r
-diff -ruN a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
---- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf 2020-06-02 09:05:21.000000000 +0200
-+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf 2020-06-09 11:08:33.349121703 +0200
-@@ -477,45 +477,44 @@
- $(OPENSSL_PATH)/crypto/s390x_arch.h\r
- $(OPENSSL_PATH)/crypto/sparc_arch.h\r
- $(OPENSSL_PATH)/crypto/vms_rms.h\r
-- $(OPENSSL_PATH)/crypto/aes/aes_locl.h\r
-+ $(OPENSSL_PATH)/crypto/aes/aes_local.h\r
- $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h\r
-- $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h\r
-+ $(OPENSSL_PATH)/crypto/asn1/asn1_local.h\r
- $(OPENSSL_PATH)/crypto/asn1/charmap.h\r
- $(OPENSSL_PATH)/crypto/asn1/standard_methods.h\r
- $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h\r
-- $(OPENSSL_PATH)/crypto/async/async_locl.h\r
-+ $(OPENSSL_PATH)/crypto/async/async_local.h\r
- $(OPENSSL_PATH)/crypto/async/arch/async_null.h\r
- $(OPENSSL_PATH)/crypto/async/arch/async_posix.h\r
- $(OPENSSL_PATH)/crypto/async/arch/async_win.h\r
-- $(OPENSSL_PATH)/crypto/bio/bio_lcl.h\r
-- $(OPENSSL_PATH)/crypto/bn/bn_lcl.h\r
-+ $(OPENSSL_PATH)/crypto/bio/bio_local.h\r
-+ $(OPENSSL_PATH)/crypto/bn/bn_local.h\r
- $(OPENSSL_PATH)/crypto/bn/bn_prime.h\r
- $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h\r
-- $(OPENSSL_PATH)/crypto/comp/comp_lcl.h\r
-+ $(OPENSSL_PATH)/crypto/comp/comp_local.h\r
- $(OPENSSL_PATH)/crypto/conf/conf_def.h\r
-- $(OPENSSL_PATH)/crypto/conf/conf_lcl.h\r
-- $(OPENSSL_PATH)/crypto/dh/dh_locl.h\r
-- $(OPENSSL_PATH)/crypto/dso/dso_locl.h\r
-- $(OPENSSL_PATH)/crypto/evp/evp_locl.h\r
-- $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h\r
-- $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h\r
-- $(OPENSSL_PATH)/crypto/md5/md5_locl.h\r
-- $(OPENSSL_PATH)/crypto/modes/modes_lcl.h\r
-+ $(OPENSSL_PATH)/crypto/conf/conf_local.h\r
-+ $(OPENSSL_PATH)/crypto/dh/dh_local.h\r
-+ $(OPENSSL_PATH)/crypto/dso/dso_local.h\r
-+ $(OPENSSL_PATH)/crypto/evp/evp_local.h\r
-+ $(OPENSSL_PATH)/crypto/hmac/hmac_local.h\r
-+ $(OPENSSL_PATH)/crypto/lhash/lhash_local.h\r
-+ $(OPENSSL_PATH)/crypto/md5/md5_local.h\r
-+ $(OPENSSL_PATH)/crypto/modes/modes_local.h\r
- $(OPENSSL_PATH)/crypto/objects/obj_dat.h\r
-- $(OPENSSL_PATH)/crypto/objects/obj_lcl.h\r
-+ $(OPENSSL_PATH)/crypto/objects/obj_local.h\r
- $(OPENSSL_PATH)/crypto/objects/obj_xref.h\r
-- $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h\r
-- $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h\r
-- $(OPENSSL_PATH)/crypto/rand/rand_lcl.h\r
-- $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h\r
-- $(OPENSSL_PATH)/crypto/sha/sha_locl.h\r
-+ $(OPENSSL_PATH)/crypto/ocsp/ocsp_local.h\r
-+ $(OPENSSL_PATH)/crypto/pkcs12/p12_local.h\r
-+ $(OPENSSL_PATH)/crypto/rand/rand_local.h\r
-+ $(OPENSSL_PATH)/crypto/rsa/rsa_local.h\r
-+ $(OPENSSL_PATH)/crypto/sha/sha_local.h\r
- $(OPENSSL_PATH)/crypto/siphash/siphash_local.h\r
-- $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h\r
-- $(OPENSSL_PATH)/crypto/store/store_locl.h\r
-- $(OPENSSL_PATH)/crypto/ui/ui_locl.h\r
-- $(OPENSSL_PATH)/crypto/x509/x509_lcl.h\r
-+ $(OPENSSL_PATH)/crypto/sm3/sm3_local.h\r
-+ $(OPENSSL_PATH)/crypto/store/store_local.h\r
-+ $(OPENSSL_PATH)/crypto/ui/ui_local.h\r
-+ $(OPENSSL_PATH)/crypto/x509/x509_local.h\r
- $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h\r
-- $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h\r
- $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h\r
- $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h\r
- $(OPENSSL_PATH)/ssl/bio_ssl.c\r
-@@ -562,13 +561,13 @@
- $(OPENSSL_PATH)/ssl/t1_trce.c\r
- $(OPENSSL_PATH)/ssl/tls13_enc.c\r
- $(OPENSSL_PATH)/ssl/tls_srp.c\r
-- $(OPENSSL_PATH)/ssl/packet_locl.h\r
-+ $(OPENSSL_PATH)/ssl/packet_local.h\r
- $(OPENSSL_PATH)/ssl/ssl_cert_table.h\r
-- $(OPENSSL_PATH)/ssl/ssl_locl.h\r
-+ $(OPENSSL_PATH)/ssl/ssl_local.h\r
- $(OPENSSL_PATH)/ssl/record/record.h\r
-- $(OPENSSL_PATH)/ssl/record/record_locl.h\r
-+ $(OPENSSL_PATH)/ssl/record/record_local.h\r
- $(OPENSSL_PATH)/ssl/statem/statem.h\r
-- $(OPENSSL_PATH)/ssl/statem/statem_locl.h\r
-+ $(OPENSSL_PATH)/ssl/statem/statem_local.h\r
- # Autogenerated files list ends here\r
- buildinf.h\r
- rand_pool_noise.h\r
-diff -ruN a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
---- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf 2020-06-02 09:05:21.000000000 +0200
-+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf 2020-06-09 11:17:31.877356870 +0200
-@@ -477,45 +477,44 @@
- $(OPENSSL_PATH)/crypto/s390x_arch.h\r
- $(OPENSSL_PATH)/crypto/sparc_arch.h\r
- $(OPENSSL_PATH)/crypto/vms_rms.h\r
-- $(OPENSSL_PATH)/crypto/aes/aes_locl.h\r
-+ $(OPENSSL_PATH)/crypto/aes/aes_local.h\r
- $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h\r
-- $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h\r
-+ $(OPENSSL_PATH)/crypto/asn1/asn1_local.h\r
- $(OPENSSL_PATH)/crypto/asn1/charmap.h\r
- $(OPENSSL_PATH)/crypto/asn1/standard_methods.h\r
- $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h\r
-- $(OPENSSL_PATH)/crypto/async/async_locl.h\r
-+ $(OPENSSL_PATH)/crypto/async/async_local.h\r
- $(OPENSSL_PATH)/crypto/async/arch/async_null.h\r
- $(OPENSSL_PATH)/crypto/async/arch/async_posix.h\r
- $(OPENSSL_PATH)/crypto/async/arch/async_win.h\r
-- $(OPENSSL_PATH)/crypto/bio/bio_lcl.h\r
-- $(OPENSSL_PATH)/crypto/bn/bn_lcl.h\r
-+ $(OPENSSL_PATH)/crypto/bio/bio_local.h\r
-+ $(OPENSSL_PATH)/crypto/bn/bn_local.h\r
- $(OPENSSL_PATH)/crypto/bn/bn_prime.h\r
- $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h\r
-- $(OPENSSL_PATH)/crypto/comp/comp_lcl.h\r
-+ $(OPENSSL_PATH)/crypto/comp/comp_local.h\r
- $(OPENSSL_PATH)/crypto/conf/conf_def.h\r
-- $(OPENSSL_PATH)/crypto/conf/conf_lcl.h\r
-- $(OPENSSL_PATH)/crypto/dh/dh_locl.h\r
-- $(OPENSSL_PATH)/crypto/dso/dso_locl.h\r
-- $(OPENSSL_PATH)/crypto/evp/evp_locl.h\r
-- $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h\r
-- $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h\r
-- $(OPENSSL_PATH)/crypto/md5/md5_locl.h\r
-- $(OPENSSL_PATH)/crypto/modes/modes_lcl.h\r
-+ $(OPENSSL_PATH)/crypto/conf/conf_local.h\r
-+ $(OPENSSL_PATH)/crypto/dh/dh_local.h\r
-+ $(OPENSSL_PATH)/crypto/dso/dso_local.h\r
-+ $(OPENSSL_PATH)/crypto/evp/evp_local.h\r
-+ $(OPENSSL_PATH)/crypto/hmac/hmac_local.h\r
-+ $(OPENSSL_PATH)/crypto/lhash/lhash_local.h\r
-+ $(OPENSSL_PATH)/crypto/md5/md5_local.h\r
-+ $(OPENSSL_PATH)/crypto/modes/modes_local.h\r
- $(OPENSSL_PATH)/crypto/objects/obj_dat.h\r
-- $(OPENSSL_PATH)/crypto/objects/obj_lcl.h\r
-+ $(OPENSSL_PATH)/crypto/objects/obj_local.h\r
- $(OPENSSL_PATH)/crypto/objects/obj_xref.h\r
-- $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h\r
-- $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h\r
-- $(OPENSSL_PATH)/crypto/rand/rand_lcl.h\r
-- $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h\r
-- $(OPENSSL_PATH)/crypto/sha/sha_locl.h\r
-+ $(OPENSSL_PATH)/crypto/ocsp/ocsp_local.h\r
-+ $(OPENSSL_PATH)/crypto/pkcs12/p12_local.h\r
-+ $(OPENSSL_PATH)/crypto/rand/rand_local.h\r
-+ $(OPENSSL_PATH)/crypto/rsa/rsa_local.h\r
-+ $(OPENSSL_PATH)/crypto/sha/sha_local.h\r
- $(OPENSSL_PATH)/crypto/siphash/siphash_local.h\r
-- $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h\r
-- $(OPENSSL_PATH)/crypto/store/store_locl.h\r
-- $(OPENSSL_PATH)/crypto/ui/ui_locl.h\r
-- $(OPENSSL_PATH)/crypto/x509/x509_lcl.h\r
-+ $(OPENSSL_PATH)/crypto/sm3/sm3_local.h\r
-+ $(OPENSSL_PATH)/crypto/store/store_local.h\r
-+ $(OPENSSL_PATH)/crypto/ui/ui_local.h\r
-+ $(OPENSSL_PATH)/crypto/x509/x509_local.h\r
- $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h\r
-- $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h\r
- $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h\r
- $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h\r
- # Autogenerated files list ends here\r
-diff -ruN a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl
---- a/CryptoPkg/Library/OpensslLib/process_files.pl 2020-06-02 09:05:21.000000000 +0200
-+++ b/CryptoPkg/Library/OpensslLib/process_files.pl 2020-06-09 12:36:16.400775802 +0200
-@@ -111,8 +111,8 @@
- # Generate dso_conf.h per config data\r
- system(\r
- "perl -I. -Mconfigdata util/dofile.pl " .\r
-- "crypto/include/internal/dso_conf.h.in " .\r
-- "> include/internal/dso_conf.h"\r
-+ "include/crypto/dso_conf.h.in " .\r
-+ "> include/crypto/dso_conf.h"\r
- ) == 0 ||\r
- die "Failed to generate dso_conf.h!\n";\r
- \r
-diff -ruN a/CryptoPkg/Library/OpensslLib/rand_pool.c b/CryptoPkg/Library/OpensslLib/rand_pool.c
---- a/CryptoPkg/Library/OpensslLib/rand_pool.c 2020-06-02 09:05:21.000000000 +0200
-+++ b/CryptoPkg/Library/OpensslLib/rand_pool.c 2020-06-17 21:00:46.335684557 +0200
-@@ -7,9 +7,8 @@
- \r
- **/\r
- \r
--#include "internal/rand_int.h"\r
- #include <openssl/aes.h>\r
--\r
-+#include <crypto/rand.h>\r
- #include <Uefi.h>\r
- #include <Library/TimerLib.h>\r
- \r