From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web12.10985.1594887178784086314 for ; Thu, 16 Jul 2020 01:12:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=OttZdshh; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: jian.j.wang@intel.com) IronPort-SDR: ncehQQevrlfMUUS5TqFRVW+ujy3vyXUlpnuO0I/wd1za12T84f6S+W7JRuy4OacMS7tXVd73UO VCVfTxBoJEOw== X-IronPort-AV: E=McAfee;i="6000,8403,9683"; a="146850602" X-IronPort-AV: E=Sophos;i="5.75,358,1589266800"; d="scan'208";a="146850602" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jul 2020 01:12:58 -0700 IronPort-SDR: 7mpDvY73tBGpPRTE8bGYvzoE8Z2JNSjLh10BeKuuT2UY6ilLUjQA9NibR8SA0Wd8dpMCJMvKM1 Lc/jUbrN8mJQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,358,1589266800"; d="scan'208";a="282376516" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by orsmga003.jf.intel.com with ESMTP; 16 Jul 2020 01:12:57 -0700 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 16 Jul 2020 01:12:57 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Thu, 16 Jul 2020 01:12:57 -0700 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (104.47.38.55) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 16 Jul 2020 01:12:50 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hmNtmqzdIjL2VlQj2xX2UGvcPd2aaQyXZ3ZENLaIt4QdceiUKaKQQ3ggK1NQjUQW3h0/d4/VbUjVytZr1VxFn6+AgDzO7YebFy82IrQ6vL8UePQtfG2/tW5pnzPOeOsUew/BbUWiHLuevTQZqnsE0AvRTs1zC1q0VF5kgkofKOfII1jcebEHEu7s+RFTUZfz/EX0fhCdFMtUQEi4oxgu/7NK/MyM4yoh2/8OLbw2/gVRnkqBcTYbmMF+HVXHwRkXLxc0nVVide2NxnAHtfYVS30XhLq5LALGWddcX67QVQI/yxSqa37vae/VOldqrcqrN8SdWD0j2JNXtfIl9sdC+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=L7vc3xD+iMhudA86Zxo+U7wEKmmDUyvTwnXn8WNMKIg=; b=ZsspzpB8smbApN5ZV/7pkj4UGw1tN8Gk/lQkQoL1T9A8tS7HTTHXJtHg8D4EiIwvZo9wnv8pgp4IhWW6eab09WhNBbXfTuzgjDLEBEIb5VMjFXRvYqqDsjFuDeAppBfvqEqa0NtcdSYvZxdXUVtdM012MDfUinkTX0nr4sl9TEAWPHHPw5nD90sI5tDvFAcZQ137sMY5l+cUB9JNt68N8TpCytmW10z0/i7Pyp2u/N1enyUywOpDTlZaobZBivj1Sp4EPUFeRnacDijZ8utJ6YJUgVMbXIT/fCbupoivLtssZ1Na1x4EpL96GzzYL485uYITzSU/U3LUaLGXj9za/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=L7vc3xD+iMhudA86Zxo+U7wEKmmDUyvTwnXn8WNMKIg=; b=OttZdshhVpX0Rffauiu1zgg9WJnR7jHXoQbFFP5um9cpN+EvSMl8VwkiSEQRbr+3oPpgg3UK4bPtTSMpZLtQ3TjzkztwVfhAbT0tNxQxQjc3MosvYpRt/4tsqimgvfEwdtCrKI6VhP9k52GNJ/lg6ufqHKkiiucuSBwcx/0XypE= Received: from SN6PR11MB3312.namprd11.prod.outlook.com (2603:10b6:805:c8::14) by SN6PR11MB2894.namprd11.prod.outlook.com (2603:10b6:805:d7::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.23; Thu, 16 Jul 2020 08:12:48 +0000 Received: from SN6PR11MB3312.namprd11.prod.outlook.com ([fe80::31f6:24c6:99f0:33d2]) by SN6PR11MB3312.namprd11.prod.outlook.com ([fe80::31f6:24c6:99f0:33d2%6]) with mapi id 15.20.3174.025; Thu, 16 Jul 2020 08:12:48 +0000 From: "Wang, Jian J" To: "Jiang, Guomin" , "devel@edk2.groups.io" CC: "Lu, XiaoyuX" , GuoMinJ Subject: Re: [PATCH 1/1] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1g Thread-Topic: [PATCH 1/1] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1g Thread-Index: AQHWVmG4qFVMNIp1/kOzLrShMK61kakJ42MA Date: Thu, 16 Jul 2020 08:12:48 +0000 Message-ID: References: <20200710022736.408-1-guomin.jiang@intel.com> In-Reply-To: <20200710022736.408-1-guomin.jiang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMzg0NjI3ODktNzFkYy00OTNlLWI4ZGItNzMyNjExYzZhYTNmIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiZkhmMVM3ODAwVGdBWHd5TkFZY3duN2RzRWhiSWdxR1wvbXNBanNrVFVlRFgrd3NTaEVUeVNIMFZEdUk3d0syWE8ifQ== dlp-reaction: no-action dlp-version: 11.2.0.6 dlp-product: dlpe-windows x-ctpclassification: CTP_NT authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.194] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: f535ed12-3246-4a00-3865-08d82960071b x-ms-traffictypediagnostic: SN6PR11MB2894: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:517; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: GC5SN8Kaj3YmmkpHEOchLGUKpTH5WhEnDwK53Vd3mGYfVfx6sw/E+LdSLayOB8Ok7+bnBCfgBBKOhtasn0swcQWCTZdNVXE6+i9pDhRZTxjep6G1YWRe9yJgrvPI2bFVyOzS1KTN9gx6C9wVUog96xY/oL2hgd/dWlbKLWxko9qcD8PtK9+reJUzgTabGPc8ZtrHvTgTSy0pBawM9KLW6mqDDrA69ufPQzsQkbubuTTR0VmjdL2BxeZ7dnlo+QrVuBsy5W/fftx98ezVvXG0jknp+s+Lc+rXPMsnYiKGBGoUPfEQhOXyKUhxlnLpfoSXN+hQTWyOu7EhZMqd2UKLATVOzwdBUISyF49Cekzs+vUZdMMOsIxLwRZpM5Q5hqnAt+9/7B443EDsjOBUTA2ICg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR11MB3312.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(376002)(39860400002)(366004)(346002)(396003)(6506007)(54906003)(83380400001)(186003)(19627235002)(8676002)(110136005)(966005)(86362001)(478600001)(4326008)(30864003)(71200400001)(316002)(8936002)(55016002)(33656002)(53546011)(9686003)(7696005)(66556008)(66476007)(64756008)(76116006)(2906002)(66446008)(5660300002)(26005)(52536014)(66946007);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: fjt6SXz6dtDFNB9Cb2EZErzYiVgYcyLifrgYogRTdMoxygroc1V9KHQte4k6OtGoT4LyDjCCKTF0Y7t3gfYaousxN7Siuvmq/V2Tn3sqmQ++eIV2amx7IswdehiucnSc+arbultg5xYBfeSW9BPzirL+hmiuphncDHJ7ajt6vlMbxw3FzoapPHKINf3ysBKRJdxvoeqx8sSCclng8n+9YhA00wy20we9QY2iFpR0yAc78UVWxkHNu+7y5QFEZPVKi6yn3ersUdvpEB2ue/UD+6i/SJJDIlMVfwWQd87lJuIYt3AxsIh4uvOQFufZ6JjKkw7404u37K8LO2RHHQnsd3nCMvl5o6xY+46KuqgGifhWS7EHz1AQPByrFAdjzTu+t/67Gqpb3xa6iwhGJcou+vzTD9YaGodyqjum/yZJ1VluS5EsQDoo2NgD5P2j5o0loIDGhE2KqCzUqurK1ZgPCnk0+iW0WSSfVo5DwaTi809RJYe44pGCBocuuqpxwTnG MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB3312.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f535ed12-3246-4a00-3865-08d82960071b X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Jul 2020 08:12:48.4609 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 6FFj6MlfFGeE0dlEzIKtuWTdmi+hhjVs7REghjt3cunqKdgaQPusOSBm6Iaj3oiXzk6OJUU+kO7XImuAssrI+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2894 Return-Path: jian.j.wang@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Guomin, Thank you very much for this upgrade. Just one comment. The opensslconf.h and dso_conf.h generated after calling process_files.pl are unix EOL. But the EOL in the patch is correct. I guess= you converted them manually. I'd suggest that you update process_files.pl to do it automatically. Regards, Jian > -----Original Message----- > From: Jiang, Guomin > Sent: Friday, July 10, 2020 10:28 AM > To: devel@edk2.groups.io > Cc: Wang, Jian J ; Lu, XiaoyuX ; > GuoMinJ > Subject: [PATCH 1/1] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1g >=20 > Upgrade openssl to 1.1.1g. the directory have been reorganized, > openssl moved crypto/include/internal to include/crypto folder. > So we change directory to match the re-organization. >=20 > Cc: Jian J Wang > Cc: Xiaoyu Lu > Signed-off-by: GuoMinJ > --- > CryptoPkg/CryptoPkg.dec | 1 - > CryptoPkg/Library/OpensslLib/OpensslLib.inf | 58 +++++++++---------- > .../Library/OpensslLib/OpensslLibCrypto.inf | 50 ++++++++-------- > .../Include/{internal =3D> crypto}/dso_conf.h | 32 +++++----- > .../Library/Include/openssl/opensslconf.h | 3 - > .../Library/BaseCryptLib/Hash/CryptSm3.c | 2 +- > .../BaseCryptLib/Pk/CryptPkcs7VerifyEku.c | 4 +- > CryptoPkg/Library/OpensslLib/rand_pool.c | 2 +- > CryptoPkg/Library/OpensslLib/openssl | 2 +- > CryptoPkg/Library/OpensslLib/process_files.pl | 10 ++-- > 10 files changed, 80 insertions(+), 84 deletions(-) > rename CryptoPkg/Library/Include/{internal =3D> crypto}/dso_conf.h (76%) >=20 > diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec > index 4d1a1368a8d4..5888941bab4c 100644 > --- a/CryptoPkg/CryptoPkg.dec > +++ b/CryptoPkg/CryptoPkg.dec > @@ -23,7 +23,6 @@ [Includes.Common.Private] > Private > Library/Include > Library/OpensslLib/openssl/include > - Library/OpensslLib/openssl/crypto/include >=20 > [LibraryClasses] > ## @libraryclass Provides basic library functions for cryptographic = primitives. > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > index c8ec9454bd90..dbbe5386a10c 100644 > --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf > +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf > @@ -477,45 +477,45 @@ [Sources] > $(OPENSSL_PATH)/crypto/s390x_arch.h > $(OPENSSL_PATH)/crypto/sparc_arch.h > $(OPENSSL_PATH)/crypto/vms_rms.h > - $(OPENSSL_PATH)/crypto/aes/aes_locl.h > + $(OPENSSL_PATH)/crypto/aes/aes_local.h > $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h > - $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h > + $(OPENSSL_PATH)/crypto/asn1/asn1_local.h > $(OPENSSL_PATH)/crypto/asn1/charmap.h > $(OPENSSL_PATH)/crypto/asn1/standard_methods.h > $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h > - $(OPENSSL_PATH)/crypto/async/async_locl.h > + $(OPENSSL_PATH)/crypto/async/async_local.h > $(OPENSSL_PATH)/crypto/async/arch/async_null.h > $(OPENSSL_PATH)/crypto/async/arch/async_posix.h > $(OPENSSL_PATH)/crypto/async/arch/async_win.h > - $(OPENSSL_PATH)/crypto/bio/bio_lcl.h > - $(OPENSSL_PATH)/crypto/bn/bn_lcl.h > + $(OPENSSL_PATH)/crypto/bio/bio_local.h > + $(OPENSSL_PATH)/crypto/bn/bn_local.h > $(OPENSSL_PATH)/crypto/bn/bn_prime.h > $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h > - $(OPENSSL_PATH)/crypto/comp/comp_lcl.h > + $(OPENSSL_PATH)/crypto/comp/comp_local.h > $(OPENSSL_PATH)/crypto/conf/conf_def.h > - $(OPENSSL_PATH)/crypto/conf/conf_lcl.h > - $(OPENSSL_PATH)/crypto/dh/dh_locl.h > - $(OPENSSL_PATH)/crypto/dso/dso_locl.h > - $(OPENSSL_PATH)/crypto/evp/evp_locl.h > - $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h > - $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h > - $(OPENSSL_PATH)/crypto/md5/md5_locl.h > - $(OPENSSL_PATH)/crypto/modes/modes_lcl.h > + $(OPENSSL_PATH)/crypto/conf/conf_local.h > + $(OPENSSL_PATH)/crypto/dh/dh_local.h > + $(OPENSSL_PATH)/crypto/dso/dso_local.h > + $(OPENSSL_PATH)/crypto/evp/evp_local.h > + $(OPENSSL_PATH)/crypto/hmac/hmac_local.h > + $(OPENSSL_PATH)/crypto/lhash/lhash_local.h > + $(OPENSSL_PATH)/crypto/md5/md5_local.h > + $(OPENSSL_PATH)/crypto/modes/modes_local.h > $(OPENSSL_PATH)/crypto/objects/obj_dat.h > - $(OPENSSL_PATH)/crypto/objects/obj_lcl.h > + $(OPENSSL_PATH)/crypto/objects/obj_local.h > $(OPENSSL_PATH)/crypto/objects/obj_xref.h > - $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h > - $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h > - $(OPENSSL_PATH)/crypto/rand/rand_lcl.h > - $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h > - $(OPENSSL_PATH)/crypto/sha/sha_locl.h > + $(OPENSSL_PATH)/crypto/ocsp/ocsp_local.h > + $(OPENSSL_PATH)/crypto/pkcs12/p12_local.h > + $(OPENSSL_PATH)/crypto/rand/rand_local.h > + $(OPENSSL_PATH)/crypto/rsa/rsa_local.h > + $(OPENSSL_PATH)/crypto/sha/sha_local.h > $(OPENSSL_PATH)/crypto/siphash/siphash_local.h > - $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h > - $(OPENSSL_PATH)/crypto/store/store_locl.h > - $(OPENSSL_PATH)/crypto/ui/ui_locl.h > - $(OPENSSL_PATH)/crypto/x509/x509_lcl.h > + $(OPENSSL_PATH)/crypto/sm3/sm3_local.h > + $(OPENSSL_PATH)/crypto/store/store_local.h > + $(OPENSSL_PATH)/crypto/ui/ui_local.h > + $(OPENSSL_PATH)/crypto/x509/x509_local.h > $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h > - $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h > + $(OPENSSL_PATH)/crypto/x509v3/pcy_local.h > $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h > $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h > $(OPENSSL_PATH)/ssl/bio_ssl.c > @@ -562,13 +562,13 @@ [Sources] > $(OPENSSL_PATH)/ssl/t1_trce.c > $(OPENSSL_PATH)/ssl/tls13_enc.c > $(OPENSSL_PATH)/ssl/tls_srp.c > - $(OPENSSL_PATH)/ssl/packet_locl.h > + $(OPENSSL_PATH)/ssl/packet_local.h > $(OPENSSL_PATH)/ssl/ssl_cert_table.h > - $(OPENSSL_PATH)/ssl/ssl_locl.h > + $(OPENSSL_PATH)/ssl/ssl_local.h > $(OPENSSL_PATH)/ssl/record/record.h > - $(OPENSSL_PATH)/ssl/record/record_locl.h > + $(OPENSSL_PATH)/ssl/record/record_local.h > $(OPENSSL_PATH)/ssl/statem/statem.h > - $(OPENSSL_PATH)/ssl/statem/statem_locl.h > + $(OPENSSL_PATH)/ssl/statem/statem_local.h > # Autogenerated files list ends here > buildinf.h > rand_pool_noise.h > diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > index 2f232e3e1289..616ccd9f62d1 100644 > --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > @@ -477,45 +477,45 @@ [Sources] > $(OPENSSL_PATH)/crypto/s390x_arch.h > $(OPENSSL_PATH)/crypto/sparc_arch.h > $(OPENSSL_PATH)/crypto/vms_rms.h > - $(OPENSSL_PATH)/crypto/aes/aes_locl.h > + $(OPENSSL_PATH)/crypto/aes/aes_local.h > $(OPENSSL_PATH)/crypto/asn1/asn1_item_list.h > - $(OPENSSL_PATH)/crypto/asn1/asn1_locl.h > + $(OPENSSL_PATH)/crypto/asn1/asn1_local.h > $(OPENSSL_PATH)/crypto/asn1/charmap.h > $(OPENSSL_PATH)/crypto/asn1/standard_methods.h > $(OPENSSL_PATH)/crypto/asn1/tbl_standard.h > - $(OPENSSL_PATH)/crypto/async/async_locl.h > + $(OPENSSL_PATH)/crypto/async/async_local.h > $(OPENSSL_PATH)/crypto/async/arch/async_null.h > $(OPENSSL_PATH)/crypto/async/arch/async_posix.h > $(OPENSSL_PATH)/crypto/async/arch/async_win.h > - $(OPENSSL_PATH)/crypto/bio/bio_lcl.h > - $(OPENSSL_PATH)/crypto/bn/bn_lcl.h > + $(OPENSSL_PATH)/crypto/bio/bio_local.h > + $(OPENSSL_PATH)/crypto/bn/bn_local.h > $(OPENSSL_PATH)/crypto/bn/bn_prime.h > $(OPENSSL_PATH)/crypto/bn/rsaz_exp.h > - $(OPENSSL_PATH)/crypto/comp/comp_lcl.h > + $(OPENSSL_PATH)/crypto/comp/comp_local.h > $(OPENSSL_PATH)/crypto/conf/conf_def.h > - $(OPENSSL_PATH)/crypto/conf/conf_lcl.h > - $(OPENSSL_PATH)/crypto/dh/dh_locl.h > - $(OPENSSL_PATH)/crypto/dso/dso_locl.h > - $(OPENSSL_PATH)/crypto/evp/evp_locl.h > - $(OPENSSL_PATH)/crypto/hmac/hmac_lcl.h > - $(OPENSSL_PATH)/crypto/lhash/lhash_lcl.h > - $(OPENSSL_PATH)/crypto/md5/md5_locl.h > - $(OPENSSL_PATH)/crypto/modes/modes_lcl.h > + $(OPENSSL_PATH)/crypto/conf/conf_local.h > + $(OPENSSL_PATH)/crypto/dh/dh_local.h > + $(OPENSSL_PATH)/crypto/dso/dso_local.h > + $(OPENSSL_PATH)/crypto/evp/evp_local.h > + $(OPENSSL_PATH)/crypto/hmac/hmac_local.h > + $(OPENSSL_PATH)/crypto/lhash/lhash_local.h > + $(OPENSSL_PATH)/crypto/md5/md5_local.h > + $(OPENSSL_PATH)/crypto/modes/modes_local.h > $(OPENSSL_PATH)/crypto/objects/obj_dat.h > - $(OPENSSL_PATH)/crypto/objects/obj_lcl.h > + $(OPENSSL_PATH)/crypto/objects/obj_local.h > $(OPENSSL_PATH)/crypto/objects/obj_xref.h > - $(OPENSSL_PATH)/crypto/ocsp/ocsp_lcl.h > - $(OPENSSL_PATH)/crypto/pkcs12/p12_lcl.h > - $(OPENSSL_PATH)/crypto/rand/rand_lcl.h > - $(OPENSSL_PATH)/crypto/rsa/rsa_locl.h > - $(OPENSSL_PATH)/crypto/sha/sha_locl.h > + $(OPENSSL_PATH)/crypto/ocsp/ocsp_local.h > + $(OPENSSL_PATH)/crypto/pkcs12/p12_local.h > + $(OPENSSL_PATH)/crypto/rand/rand_local.h > + $(OPENSSL_PATH)/crypto/rsa/rsa_local.h > + $(OPENSSL_PATH)/crypto/sha/sha_local.h > $(OPENSSL_PATH)/crypto/siphash/siphash_local.h > - $(OPENSSL_PATH)/crypto/sm3/sm3_locl.h > - $(OPENSSL_PATH)/crypto/store/store_locl.h > - $(OPENSSL_PATH)/crypto/ui/ui_locl.h > - $(OPENSSL_PATH)/crypto/x509/x509_lcl.h > + $(OPENSSL_PATH)/crypto/sm3/sm3_local.h > + $(OPENSSL_PATH)/crypto/store/store_local.h > + $(OPENSSL_PATH)/crypto/ui/ui_local.h > + $(OPENSSL_PATH)/crypto/x509/x509_local.h > $(OPENSSL_PATH)/crypto/x509v3/ext_dat.h > - $(OPENSSL_PATH)/crypto/x509v3/pcy_int.h > + $(OPENSSL_PATH)/crypto/x509v3/pcy_local.h > $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h > $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h > # Autogenerated files list ends here > diff --git a/CryptoPkg/Library/Include/internal/dso_conf.h > b/CryptoPkg/Library/Include/crypto/dso_conf.h > similarity index 76% > rename from CryptoPkg/Library/Include/internal/dso_conf.h > rename to CryptoPkg/Library/Include/crypto/dso_conf.h > index 43c891588bc2..95f4db2b1586 100644 > --- a/CryptoPkg/Library/Include/internal/dso_conf.h > +++ b/CryptoPkg/Library/Include/crypto/dso_conf.h > @@ -1,16 +1,16 @@ > -/* WARNING: do not edit! */ > -/* Generated from crypto/include/internal/dso_conf.h.in */ > -/* > - * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. > - * > - * Licensed under the OpenSSL license (the "License"). You may not use > - * this file except in compliance with the License. You can obtain a co= py > - * in the file LICENSE in the source distribution or at > - * https://www.openssl.org/source/license.html > - */ > - > -#ifndef HEADER_DSO_CONF_H > -# define HEADER_DSO_CONF_H > -# define DSO_NONE > -# define DSO_EXTENSION ".so" > -#endif > +/* WARNING: do not edit! */ > +/* Generated from include/crypto/dso_conf.h.in */ > +/* > + * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved. > + * > + * Licensed under the OpenSSL license (the "License"). You may not use > + * this file except in compliance with the License. You can obtain a co= py > + * in the file LICENSE in the source distribution or at > + * https://www.openssl.org/source/license.html > + */ > + > +#ifndef OSSL_CRYPTO_DSO_CONF_H > +# define OSSL_CRYPTO_DSO_CONF_H > +# define DSO_NONE > +# define DSO_EXTENSION ".so" > +#endif > diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h > b/CryptoPkg/Library/Include/openssl/opensslconf.h > index 62c2736cb0b5..3a2544ea5ccc 100644 > --- a/CryptoPkg/Library/Include/openssl/opensslconf.h > +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h > @@ -247,9 +247,6 @@ extern "C" { > #ifndef OPENSSL_NO_DYNAMIC_ENGINE > # define OPENSSL_NO_DYNAMIC_ENGINE > #endif > -#ifndef OPENSSL_NO_AFALGENG > -# define OPENSSL_NO_AFALGENG > -#endif >=20 >=20 > /* > diff --git a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c > b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c > index eacf4826c4f7..235331c2a038 100644 > --- a/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c > +++ b/CryptoPkg/Library/BaseCryptLib/Hash/CryptSm3.c > @@ -7,7 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > **/ >=20 > #include "InternalCryptLib.h" > -#include "internal/sm3.h" > +#include "crypto/sm3.h" >=20 > /** > Retrieves the size, in bytes, of the context buffer required for SM3 h= ash > operations. > diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c > b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c > index 229c244b2657..c9fdb65b99d1 100644 > --- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c > +++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptPkcs7VerifyEku.c > @@ -15,13 +15,13 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > #include > #include > -#include > +#include >=20 > /** > This function will return the leaf signer certificate in a chain. Thi= s is > diff --git a/CryptoPkg/Library/OpensslLib/rand_pool.c > b/CryptoPkg/Library/OpensslLib/rand_pool.c > index 9f3983f7c35b..9e0179b03490 100644 > --- a/CryptoPkg/Library/OpensslLib/rand_pool.c > +++ b/CryptoPkg/Library/OpensslLib/rand_pool.c > @@ -7,7 +7,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ >=20 > -#include "internal/rand_int.h" > +#include "crypto/rand.h" > #include >=20 > #include > diff --git a/CryptoPkg/Library/OpensslLib/openssl > b/CryptoPkg/Library/OpensslLib/openssl > index c3656cc594da..e2e09d9fba11 160000 > --- a/CryptoPkg/Library/OpensslLib/openssl > +++ b/CryptoPkg/Library/OpensslLib/openssl > @@ -1 +1 @@ > -Subproject commit c3656cc594daac8167721dde7220f0e59ae146fc > +Subproject commit e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72 > diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl > b/CryptoPkg/Library/OpensslLib/process_files.pl > index 65d07a2aed44..4ca81ce4fc50 100755 > --- a/CryptoPkg/Library/OpensslLib/process_files.pl > +++ b/CryptoPkg/Library/OpensslLib/process_files.pl > @@ -111,8 +111,8 @@ BEGIN { > # Generate dso_conf.h per config data > system( > "perl -I. -Mconfigdata util/dofile.pl " . > - "crypto/include/internal/dso_conf.h.in " . > - "> include/internal/dso_conf.h" > + "include/crypto/dso_conf.h.in " . > + "> include/crypto/dso_conf.h" > ) =3D=3D 0 || > die "Failed to generate dso_conf.h!\n"; >=20 > @@ -267,9 +267,9 @@ copy($OPENSSL_PATH . > "/include/openssl/opensslconf.h", > $OPENSSL_PATH . "/../../Include/openssl/") || > die "Cannot copy opensslconf.h!"; > print "Done!"; > -print "\n--> Duplicating dso_conf.h into Include/internal ... "; > -copy($OPENSSL_PATH . "/include/internal/dso_conf.h", > - $OPENSSL_PATH . "/../../Include/internal/") || > +print "\n--> Duplicating dso_conf.h into Include/crypto ... "; > +copy($OPENSSL_PATH . "/include/crypto/dso_conf.h", > + $OPENSSL_PATH . "/../../Include/crypto/") || > die "Cannot copy dso_conf.h!"; > print "Done!\n"; >=20 > -- > 2.25.1.windows.1