From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web11.8938.1580833917589419526 for ; Tue, 04 Feb 2020 08:31:57 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: michael.d.kinney@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Feb 2020 08:31:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,402,1574150400"; d="scan'208";a="279102878" Received: from orsmsx105.amr.corp.intel.com ([10.22.225.132]) by FMSMGA003.fm.intel.com with ESMTP; 04 Feb 2020 08:31:57 -0800 Received: from orsmsx153.amr.corp.intel.com (10.22.226.247) by ORSMSX105.amr.corp.intel.com (10.22.225.132) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 4 Feb 2020 08:31:56 -0800 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.57]) by ORSMSX153.amr.corp.intel.com ([169.254.12.111]) with mapi id 14.03.0439.000; Tue, 4 Feb 2020 08:31:56 -0800 From: "Michael D Kinney" To: "Wang, Jian J" , "devel@edk2.groups.io" , "Kinney, Michael D" CC: "Lu, XiaoyuX" Subject: Re: [edk2-devel] [Patch] CryptoPkg/BaseCryptLibNull: Add missing HkdfSha256ExtractAndExpand() Thread-Topic: [edk2-devel] [Patch] CryptoPkg/BaseCryptLibNull: Add missing HkdfSha256ExtractAndExpand() Thread-Index: AQHV1wKeoiLFfSL+RUC+/e0m/mIU+6gLq9GA//+XHOA= Date: Tue, 4 Feb 2020 16:31:56 +0000 Message-ID: References: <20200130001706.12756-1-michael.d.kinney@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.22.254.140] MIME-Version: 1.0 Return-Path: michael.d.kinney@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Jian, Thanks for the review. I did not modify that file at all. I just copied it from another directory. That is why I left the Copyright year unmodified. Mike > -----Original Message----- > From: Wang, Jian J > Sent: Tuesday, February 4, 2020 6:46 AM > To: devel@edk2.groups.io; Kinney, Michael D > > Cc: Lu, XiaoyuX > Subject: RE: [edk2-devel] [Patch] > CryptoPkg/BaseCryptLibNull: Add missing > HkdfSha256ExtractAndExpand() >=20 > The copyright year of file CryptHkdfNull.c was not > updated. With it addressed, >=20 > Reviewed-by: Jian J Wang >=20 > Regards, > Jian >=20 > > -----Original Message----- > > From: devel@edk2.groups.io On > Behalf Of Michael D > > Kinney > > Sent: Thursday, January 30, 2020 8:17 AM > > To: devel@edk2.groups.io > > Cc: Wang, Jian J ; Lu, XiaoyuX > > > Subject: [edk2-devel] [Patch] > CryptoPkg/BaseCryptLibNull: Add missing > > HkdfSha256ExtractAndExpand() > > > > https://bugzilla.tianocore.org/show_bug.cgi?id=3D2493 > > > > The BaseCryptLib was expanded to add the > HkdfSha256ExtractAndExpand() > > service in the following commit: > > > > > https://github.com/tianocore/edk2/commit/4b1b7c1913092d > 73d689d8086dcfa > > 579c0217dc8 > > > > When BaseCryptLibNull was added in the commit below, > this new > > service was not included. > > > > > https://github.com/tianocore/edk2/commit/d95de082da01f4 > a4cb3ebf87e1597 > > 2a12d0f8d53 > > > > Cc: Jian J Wang > > Cc: Xiaoyu Lu > > Signed-off-by: Michael D Kinney > > > --- > > .../BaseCryptLibNull/BaseCryptLibNull.inf | 3 > +- > > .../BaseCryptLibNull/Kdf/CryptHkdfNull.c | 43 > +++++++++++++++++++ > > 2 files changed, 45 insertions(+), 1 deletion(-) > > create mode 100644 > CryptoPkg/Library/BaseCryptLibNull/Kdf/CryptHkdfNull.c > > > > diff --git > a/CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.i > nf > > > b/CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.i > nf > > index 1e4807968a..8f53b0dfd0 100644 > > --- > a/CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.i > nf > > +++ > b/CryptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.i > nf > > @@ -6,7 +6,7 @@ > > # This external input must be validated carefully > to avoid security issues such as > > # buffer overflow or integer overflow. > > # > > -# Copyright (c) 2009 - 2019, Intel Corporation. All > rights reserved.
> > +# Copyright (c) 2009 - 2020, Intel Corporation. All > rights reserved.
> > # SPDX-License-Identifier: BSD-2-Clause-Patent > > # > > ## > > @@ -37,6 +37,7 @@ [Sources] > > Hmac/CryptHmacMd5Null.c > > Hmac/CryptHmacSha1Null.c > > Hmac/CryptHmacSha256Null.c > > + Kdf/CryptHkdfNull.c > > Cipher/CryptAesNull.c > > Cipher/CryptTdesNull.c > > Cipher/CryptArc4Null.c > > diff --git > a/CryptoPkg/Library/BaseCryptLibNull/Kdf/CryptHkdfNull. > c > > > b/CryptoPkg/Library/BaseCryptLibNull/Kdf/CryptHkdfNull. > c > > new file mode 100644 > > index 0000000000..19d795a4cc > > --- /dev/null > > +++ > b/CryptoPkg/Library/BaseCryptLibNull/Kdf/CryptHkdfNull. > c > > @@ -0,0 +1,43 @@ > > +/** @file > > + HMAC-SHA256 KDF Wrapper Implementation which does > not provide real > > capabilities. > > + > > +Copyright (c) 2018 - 2019, Intel Corporation. All > rights reserved.
> > +SPDX-License-Identifier: BSD-2-Clause-Patent > > + > > +**/ > > + > > +#include > > +#include > > + > > +/** > > + Derive key data using HMAC-SHA256 based KDF. > > + > > + @param[in] Key Pointer to the user- > supplied key. > > + @param[in] KeySize Key size in bytes. > > + @param[in] Salt Pointer to the > salt(non-secret) value. > > + @param[in] SaltSize Salt size in bytes. > > + @param[in] Info Pointer to the > application specific info. > > + @param[in] InfoSize Info size in bytes. > > + @param[out] Out Pointer to buffer to > receive hkdf value. > > + @param[in] OutSize Size of hkdf bytes > to generate. > > + > > + @retval TRUE Hkdf generated successfully. > > + @retval FALSE Hkdf generation failed. > > + > > +**/ > > +BOOLEAN > > +EFIAPI > > +HkdfSha256ExtractAndExpand ( > > + IN CONST UINT8 *Key, > > + IN UINTN KeySize, > > + IN CONST UINT8 *Salt, > > + IN UINTN SaltSize, > > + IN CONST UINT8 *Info, > > + IN UINTN InfoSize, > > + OUT UINT8 *Out, > > + IN UINTN OutSize > > + ) > > +{ > > + ASSERT (FALSE); > > + return FALSE; > > +} > > -- > > 2.21.0.windows.1 > > > > > >=20