From nobody Sat Apr 27 08:04:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+73005+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+73005+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1616046717; cv=none; d=zohomail.com; s=zohoarc; b=bnpWRMGd43uboE9mwVYykQO8+GZeFeZ8dlGrptEs9QC7/Mw4g7JOTEb5JQMdYJy6uyQ8q2K9JiC5MQoV5rXQbvDcj1o9G928sdD24l+SBG9H56TMGV9VEr9YzjmCZCkdpFV2hrdl28iDgwoB5xOdI/QYAsMcLHZif8Uw9Fjhhhs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616046717; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=dE/gM193w2w1YUiLp0P86A54VKa2kvsgh0F+NNdq9rs=; b=J0SpK52JKqlUXdZlzZtZsQ8c/ujlb0asGcQV4nO4MwKtXy7IwHuiUkWbDHNKi0yGUUnJjHyEVz5hTMwjYXgT2KqNDYGkGjhMJiacimb3+0psufoZP30LLAuYw1vv60oe07kv1kZ/wHdIFqhjocIDL/hyip1jRTvH046FNIOiyX8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+73005+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1616046717703648.8837747084264; Wed, 17 Mar 2021 22:51:57 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id uj5dYY1788612xyac6idoCy5; Wed, 17 Mar 2021 22:51:55 -0700 X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web08.5351.1616046714766082358 for ; Wed, 17 Mar 2021 22:51:54 -0700 IronPort-SDR: BRmrf2kr7KN8L4SSQEyxXyTIg7hdzG82INyJ9NfM7kk64ddgtPhM8xLILdfjjQn+IkgHYjbDcV xhIW0yosk3GQ== X-IronPort-AV: E=McAfee;i="6000,8403,9926"; a="168889746" X-IronPort-AV: E=Sophos;i="5.81,257,1610438400"; d="scan'208";a="168889746" X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2021 22:51:54 -0700 IronPort-SDR: hrXIyyUqwz9+ta2EGL5ZmfjDmLAAROGsWE1GS1bYLBh2vaKtlCvyRmvl4dNSCboH2wkkbur/GV 55LAd614N6jQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,257,1610438400"; d="scan'208";a="411747238" X-Received: from shwdeopenpsi138.ccr.corp.intel.com ([10.239.49.183]) by orsmga007.jf.intel.com with ESMTP; 17 Mar 2021 22:51:53 -0700 From: "Liu, WeiX C" To: devel@edk2.groups.io Cc: Liu Wei , Jian J Wang Subject: [edk2-devel] [PATCH] CryptoPkg/OpensslLib: Upgrade OpenSSL to 1.1.1j Date: Thu, 18 Mar 2021 13:51:17 +0800 Message-Id: <20210318055117.2059-1-weix.c.liu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,weix.c.liu@intel.com X-Gm-Message-State: NqFazlSuQCPSqGfilB0GAQ2Px1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1616046715; bh=oBTFDEunoywUN4A7behusotH+yX4vPKPkM7mo0jCL58=; h=Cc:Date:From:Reply-To:Subject:To; b=rBE3Tua1LCKrUd5i2zSlRZ9xf9fCkEbxoWRiR2JrwgCpCW/7jWHB3DBXhiKvgwlMUfW BIem33E9jDh1QaUrr6JEscOZMfkRkoBDfEb4kglVuHis1WKEVRBAKFeunlY+dogNjT4vR y3UxUOILdUuTnmlalOQtz3Pb4zJcoEVubyA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Liu Wei Update openssl from 1.1.1g to 1.1.1j. Current OpenSSL version 1.1.1g contains the vulnerabilities of CVE-2021-23841 and CVE-2021-23840. The related vulnerable API EVP_DecryptUpdate are used in drivers. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3266 Besides, the opensslconf.h automatically generated in UNIX format by process_files.pl. Cc: Jian J Wang Signed-off-by: Liu Wei Reviewed-by: Jian J Wang --- CryptoPkg/Library/Include/openssl/opensslconf.h | 7 ++++++- CryptoPkg/Library/OpensslLib/openssl | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CryptoPkg/Library/Include/openssl/opensslconf.h b/CryptoPkg/Li= brary/Include/openssl/opensslconf.h index 3a2544e..f9a73e9 100644 --- a/CryptoPkg/Library/Include/openssl/opensslconf.h +++ b/CryptoPkg/Library/Include/openssl/opensslconf.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated from include/openssl/opensslconf.h.in * - * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2020 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 copy @@ -268,6 +268,11 @@ extern "C" { # undef DECLARE_DEPRECATED # define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); # endif +# elif defined(__SUNPRO_C) +# if (__SUNPRO_C >=3D 0x5130) +# undef DECLARE_DEPRECATED +# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated)); +# endif # endif #endif =20 diff --git a/CryptoPkg/Library/OpensslLib/openssl b/CryptoPkg/Library/Opens= slLib/openssl index e2e09d9..52c587d 160000 --- a/CryptoPkg/Library/OpensslLib/openssl +++ b/CryptoPkg/Library/OpensslLib/openssl @@ -1 +1 @@ -Subproject commit e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72 +Subproject commit 52c587d60be67c337364b830dd3fdc15404a2f04 --=20 2.7.4 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#73005): https://edk2.groups.io/g/devel/message/73005 Mute This Topic: https://groups.io/mt/81423270/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-