From nobody Mon Feb 9 02:38:09 2026 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+93369+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+93369+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1662539405; cv=none; d=zohomail.com; s=zohoarc; b=b8o4uCl+HAbsuM99dJGkIhdMNDC0dkwXEg/JMAYE1XlntHyfbfUbNgLPWL9B1qeNECI6r94ivs0wjgTawL1dziOew+gtgzi+OHfWNb11qbZEJ0IHX5oIeuOcleLrH6xxCcOTkAedbf5KH+DZTKq7ocCfOuO3DfsBi2mhHEjw8uA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662539405; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Jz9RHRdRF/MudVq/0IMDCrIsZTUiKezzzr1GHix427I=; b=CLFcfA8efuY4YG7Maz9JPQXR+KHvnph2GwNuu8kBpS6Ri1nRX0t9wZGLTGdVj1zNecUUGkMLCGqiqw9abHuErjafzCR+C1stz+SOH5+cYVdc4pTOmrZnLmjQOXpVpNzlbR6JDoli5GUm/tOdKHHQHFtnFgimUemGcugFidJLeZ0= 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+93369+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1662539405161964.9873866153174; Wed, 7 Sep 2022 01:30:05 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id whDTYY1788612xBoBRDnLNFt; Wed, 07 Sep 2022 01:30:04 -0700 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web09.5425.1662539386710725423 for ; Wed, 07 Sep 2022 01:30:04 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10462"; a="322998994" X-IronPort-AV: E=Sophos;i="5.93,296,1654585200"; d="scan'208";a="322998994" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2022 01:30:03 -0700 X-IronPort-AV: E=Sophos;i="5.93,296,1654585200"; d="scan'208";a="591599775" X-Received: from liyi4-desktop.ccr.corp.intel.com ([10.239.153.82]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2022 01:30:01 -0700 From: "yi1 li" To: devel@edk2.groups.io Cc: Yi Li , Jiewen Yao , Jian J Wang , Xiaoyu Lu , Guomin Jiang Subject: [edk2-devel] [PATCH 7/7] CryptoPkg: Run uncrustify tools on EC and BN change Date: Wed, 7 Sep 2022 16:29:24 +0800 Message-Id: <6a2d188dd969ac2ca134779147867ca715269470.1662539080.git.yi1.li@intel.com> In-Reply-To: References: MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,yi1.li@intel.com X-Gm-Message-State: 9H7bW9QfXkHpopezk9yf7f0Qx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1662539404; bh=JHJ5vQci8qmMoFCzuNQbh2ZlZcCXSgcUnTqfaK8t+QA=; h=Cc:Date:From:Reply-To:Subject:To; b=O1ACmUU24VpR4inyVyboiiTgLfoxVoUATsTZNVfTNuSU3w8J1HVSphxM6ci9EPie5+S tS6Xf/uKYT4IctrL5P96ExYh1v4HrQtht57R1JFyVWv8MKkfIQ6faMCB3xOFSD/JjAXd7 evqNrrdQsVu2Rk6XMGJQk5MPEsb7Tox8c/I= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1662539407034100005 Content-Type: text/plain; charset="utf-8" Run uncrustify tools on EC and BN change to meet UEFI code style. Cc: Jiewen Yao Cc: Jian J Wang Cc: Xiaoyu Lu Cc: Guomin Jiang Signed-off-by: Yi Li --- CryptoPkg/Driver/Crypto.c | 2 +- CryptoPkg/Include/Library/BaseCryptLib.h | 8 +- CryptoPkg/Library/BaseCryptLib/Bn/CryptBn.c | 54 +-- CryptoPkg/Library/BaseCryptLib/Pk/CryptEc.c | 156 ++++---- CryptoPkg/Private/Protocol/Crypto.h | 368 +++++++++--------- .../UnitTest/Library/BaseCryptLib/BnTests.c | 109 +++--- .../UnitTest/Library/BaseCryptLib/EcTests.c | 93 ++--- 7 files changed, 405 insertions(+), 385 deletions(-) diff --git a/CryptoPkg/Driver/Crypto.c b/CryptoPkg/Driver/Crypto.c index f7b9287218..9682a46778 100644 --- a/CryptoPkg/Driver/Crypto.c +++ b/CryptoPkg/Driver/Crypto.c @@ -5546,7 +5546,7 @@ CryptoServiceEcDhComputeKey ( IN OUT UINTN *KeySize ) { - return CALL_BASECRYPTLIB (Ec.Services.DhComputeKey, EcDhComputeKey, (EcC= ontext, PeerPublic, PeerPublicSize, CompressFlag ,Key, KeySize), FALSE); + return CALL_BASECRYPTLIB (Ec.Services.DhComputeKey, EcDhComputeKey, (EcC= ontext, PeerPublic, PeerPublicSize, CompressFlag, Key, KeySize), FALSE); } =20 const EDKII_CRYPTO_PROTOCOL mEdkiiCrypto =3D { diff --git a/CryptoPkg/Include/Library/BaseCryptLib.h b/CryptoPkg/Include/L= ibrary/BaseCryptLib.h index ea3ed5270f..d74fc21c1e 100644 --- a/CryptoPkg/Include/Library/BaseCryptLib.h +++ b/CryptoPkg/Include/Library/BaseCryptLib.h @@ -14,12 +14,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include =20 -#define CRYPTO_NID_NULL 0x0000 +#define CRYPTO_NID_NULL 0x0000 =20 // Key Exchange -#define CRYPTO_NID_SECP256R1 0x0204 -#define CRYPTO_NID_SECP384R1 0x0205 -#define CRYPTO_NID_SECP521R1 0x0206 +#define CRYPTO_NID_SECP256R1 0x0204 +#define CRYPTO_NID_SECP384R1 0x0205 +#define CRYPTO_NID_SECP521R1 0x0206 =20 /// /// MD5 digest size in bytes diff --git a/CryptoPkg/Library/BaseCryptLib/Bn/CryptBn.c b/CryptoPkg/Librar= y/BaseCryptLib/Bn/CryptBn.c index 7a3043b1de..282926ddcc 100644 --- a/CryptoPkg/Library/BaseCryptLib/Bn/CryptBn.c +++ b/CryptoPkg/Library/BaseCryptLib/Bn/CryptBn.c @@ -99,7 +99,7 @@ BigNumAdd ( OUT VOID *BnRes ) { - return (BOOLEAN) BN_add (BnRes, BnA, BnB); + return (BOOLEAN)BN_add (BnRes, BnA, BnB); } =20 /** @@ -122,7 +122,7 @@ BigNumSub ( OUT VOID *BnRes ) { - return (BOOLEAN) BN_sub (BnRes, BnA, BnB); + return (BOOLEAN)BN_sub (BnRes, BnA, BnB); } =20 /** @@ -145,15 +145,15 @@ BigNumMod ( OUT VOID *BnRes ) { - BOOLEAN RetVal; - BN_CTX *Ctx; + BOOLEAN RetVal; + BN_CTX *Ctx; =20 Ctx =3D BN_CTX_new (); if (Ctx =3D=3D NULL) { return FALSE; } =20 - RetVal =3D (BOOLEAN) BN_mod (BnRes, BnA, BnB, Ctx); + RetVal =3D (BOOLEAN)BN_mod (BnRes, BnA, BnB, Ctx); BN_CTX_free (Ctx); =20 return RetVal; @@ -181,15 +181,15 @@ BigNumExpMod ( OUT VOID *BnRes ) { - BOOLEAN RetVal; - BN_CTX *Ctx; + BOOLEAN RetVal; + BN_CTX *Ctx; =20 Ctx =3D BN_CTX_new (); if (Ctx =3D=3D NULL) { return FALSE; } =20 - RetVal =3D (BOOLEAN) BN_mod_exp (BnRes, BnA, BnP, BnM, Ctx); + RetVal =3D (BOOLEAN)BN_mod_exp (BnRes, BnA, BnP, BnM, Ctx); =20 BN_CTX_free (Ctx); return RetVal; @@ -215,8 +215,8 @@ BigNumInverseMod ( OUT VOID *BnRes ) { - BOOLEAN RetVal; - BN_CTX *Ctx; + BOOLEAN RetVal; + BN_CTX *Ctx; =20 Ctx =3D BN_CTX_new (); if (Ctx =3D=3D NULL) { @@ -226,7 +226,7 @@ BigNumInverseMod ( RetVal =3D FALSE; if (BN_mod_inverse (BnRes, BnA, BnM, Ctx) !=3D NULL) { RetVal =3D TRUE; - }; + } =20 BN_CTX_free (Ctx); return RetVal; @@ -252,15 +252,15 @@ BigNumDiv ( OUT VOID *BnRes ) { - BOOLEAN RetVal; - BN_CTX *Ctx; + BOOLEAN RetVal; + BN_CTX *Ctx; =20 Ctx =3D BN_CTX_new (); if (Ctx =3D=3D NULL) { return FALSE; } =20 - RetVal =3D (BOOLEAN) BN_div (BnRes, NULL, BnA, BnB, Ctx); + RetVal =3D (BOOLEAN)BN_div (BnRes, NULL, BnA, BnB, Ctx); BN_CTX_free (Ctx); =20 return RetVal; @@ -288,15 +288,15 @@ BigNumMulMod ( OUT VOID *BnRes ) { - BOOLEAN RetVal; - BN_CTX *Ctx; + BOOLEAN RetVal; + BN_CTX *Ctx; =20 Ctx =3D BN_CTX_new (); if (Ctx =3D=3D NULL) { return FALSE; } =20 - RetVal =3D (BOOLEAN) BN_mod_mul (BnRes, BnA, BnB, BnM, Ctx); + RetVal =3D (BOOLEAN)BN_mod_mul (BnRes, BnA, BnB, BnM, Ctx); BN_CTX_free (Ctx); =20 return RetVal; @@ -370,7 +370,7 @@ BigNumIsWord ( IN UINTN Num ) { - return (BOOLEAN) BN_is_word (Bn, Num); + return (BOOLEAN)BN_is_word (Bn, Num); } =20 /** @@ -387,7 +387,7 @@ BigNumIsOdd ( IN CONST VOID *Bn ) { - return (BOOLEAN) BN_is_odd (Bn); + return (BOOLEAN)BN_is_odd (Bn); } =20 /** @@ -444,7 +444,7 @@ BigNumRShift ( OUT VOID *BnRes ) { - return (BOOLEAN) BN_rshift (BnRes, Bn, (INT32) N); + return (BOOLEAN)BN_rshift (BnRes, Bn, (INT32)N); } =20 /** @@ -483,15 +483,15 @@ BigNumSqrMod ( OUT VOID *BnRes ) { - BOOLEAN RetVal; - BN_CTX *Ctx; + BOOLEAN RetVal; + BN_CTX *Ctx; =20 Ctx =3D BN_CTX_new (); if (Ctx =3D=3D NULL) { return FALSE; } =20 - RetVal =3D (BOOLEAN) BN_mod_sqr (BnRes, BnA, BnM, Ctx); + RetVal =3D (BOOLEAN)BN_mod_sqr (BnRes, BnA, BnM, Ctx); BN_CTX_free (Ctx); =20 return RetVal; @@ -543,7 +543,7 @@ BigNumSetUint ( IN UINTN Val ) { - return (BOOLEAN) BN_set_word (Bn, Val); + return (BOOLEAN)BN_set_word (Bn, Val); } =20 /** @@ -566,15 +566,15 @@ BigNumAddMod ( OUT VOID *BnRes ) { - BOOLEAN RetVal; - BN_CTX *Ctx; + BOOLEAN RetVal; + BN_CTX *Ctx; =20 Ctx =3D BN_CTX_new (); if (Ctx =3D=3D NULL) { return FALSE; } =20 - RetVal =3D (BOOLEAN) BN_mod_add (BnRes, BnA, BnB, BnM, Ctx); + RetVal =3D (BOOLEAN)BN_mod_add (BnRes, BnA, BnB, BnM, Ctx); BN_CTX_free (Ctx); =20 return RetVal; diff --git a/CryptoPkg/Library/BaseCryptLib/Pk/CryptEc.c b/CryptoPkg/Librar= y/BaseCryptLib/Pk/CryptEc.c index e9b0391a56..396c819834 100644 --- a/CryptoPkg/Library/BaseCryptLib/Pk/CryptEc.c +++ b/CryptoPkg/Library/BaseCryptLib/Pk/CryptEc.c @@ -27,8 +27,8 @@ STATIC INT32 CryptoNidToOpensslNid ( - IN UINTN CryptoNid -) + IN UINTN CryptoNid + ) { INT32 Nid; =20 @@ -102,7 +102,7 @@ EcGroupGetCurve ( IN VOID *BnCtx ) { - return (BOOLEAN) EC_GROUP_get_curve (EcGroup, BnPrime, BnA, BnB, BnCtx); + return (BOOLEAN)EC_GROUP_get_curve (EcGroup, BnPrime, BnA, BnB, BnCtx); } =20 /** @@ -124,7 +124,7 @@ EcGroupGetOrder ( OUT VOID *BnOrder ) { - return (BOOLEAN) EC_GROUP_get_order (EcGroup, BnOrder, NULL); + return (BOOLEAN)EC_GROUP_get_order (EcGroup, BnOrder, NULL); } =20 /** @@ -204,7 +204,7 @@ EcPointGetAffineCoordinates ( IN VOID *BnCtx ) { - return (BOOLEAN) EC_POINT_get_affine_coordinates (EcGroup, EcPoint, BnX,= BnY, BnCtx); + return (BOOLEAN)EC_POINT_get_affine_coordinates (EcGroup, EcPoint, BnX, = BnY, BnCtx); } =20 /** @@ -229,7 +229,7 @@ EcPointSetAffineCoordinates ( IN VOID *BnCtx ) { - return (BOOLEAN) EC_POINT_set_affine_coordinates (EcGroup, EcPoint, BnX,= BnY, BnCtx); + return (BOOLEAN)EC_POINT_set_affine_coordinates (EcGroup, EcPoint, BnX, = BnY, BnCtx); } =20 /** @@ -255,7 +255,7 @@ EcPointAdd ( IN VOID *BnCtx ) { - return (BOOLEAN) EC_POINT_add (EcGroup, EcPointResult, EcPointA, EcPoint= B, BnCtx); + return (BOOLEAN)EC_POINT_add (EcGroup, EcPointResult, EcPointA, EcPointB= , BnCtx); } =20 /** @@ -281,7 +281,7 @@ EcPointMul ( IN VOID *BnCtx ) { - return (BOOLEAN) EC_POINT_mul (EcGroup, EcPointResult, NULL, EcPoint, Bn= PScalar, BnCtx); + return (BOOLEAN)EC_POINT_mul (EcGroup, EcPointResult, NULL, EcPoint, BnP= Scalar, BnCtx); } =20 /** @@ -302,7 +302,7 @@ EcPointInvert ( IN VOID *BnCtx ) { - return (BOOLEAN) EC_POINT_invert (EcGroup, EcPoint, BnCtx); + return (BOOLEAN)EC_POINT_invert (EcGroup, EcPoint, BnCtx); } =20 /** @@ -395,7 +395,7 @@ EcPointSetCompressedCoordinates ( IN VOID *BnCtx ) { - return (BOOLEAN) EC_POINT_set_compressed_coordinates (EcGroup, EcPoint, = BnX, YBit, BnCtx); + return (BOOLEAN)EC_POINT_set_compressed_coordinates (EcGroup, EcPoint, B= nX, YBit, BnCtx); } =20 // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -417,7 +417,7 @@ EcNewByNid ( IN UINTN Nid ) { - INT32 OpenSslNid; + INT32 OpenSslNid; =20 OpenSslNid =3D CryptoNidToOpensslNid (Nid); if (OpenSslNid < 0) { @@ -438,7 +438,7 @@ EcFree ( IN VOID *EcContext ) { - EC_KEY_free ((EC_KEY *) EcContext); + EC_KEY_free ((EC_KEY *)EcContext); } =20 /** @@ -475,26 +475,26 @@ EcGenerateKey ( IN OUT UINTN *PublicKeySize ) { - EC_KEY *EcKey; - CONST EC_GROUP *Group; - CONST EC_POINT *EcPoint; - BOOLEAN RetVal; - BIGNUM *BnX; - BIGNUM *BnY; - UINTN HalfSize; - INTN XSize; - INTN YSize; - - if (EcContext =3D=3D NULL || PublicKeySize =3D=3D NULL) { + EC_KEY *EcKey; + CONST EC_GROUP *Group; + CONST EC_POINT *EcPoint; + BOOLEAN RetVal; + BIGNUM *BnX; + BIGNUM *BnY; + UINTN HalfSize; + INTN XSize; + INTN YSize; + + if ((EcContext =3D=3D NULL) || (PublicKeySize =3D=3D NULL)) { return FALSE; } =20 - if (PublicKey =3D=3D NULL && *PublicKeySize !=3D 0) { + if ((PublicKey =3D=3D NULL) && (*PublicKeySize !=3D 0)) { return FALSE; } =20 - EcKey =3D (EC_KEY *)EcContext; - Group =3D EC_KEY_get0_group (EcKey); + EcKey =3D (EC_KEY *)EcContext; + Group =3D EC_KEY_get0_group (EcKey); HalfSize =3D (EC_GROUP_get_degree (Group) + 7) / 8; =20 // Assume RAND_seed was called @@ -506,6 +506,7 @@ EcGenerateKey ( *PublicKeySize =3D HalfSize * 2; return FALSE; } + *PublicKeySize =3D HalfSize * 2; =20 EcPoint =3D EC_KEY_get0_public_key (EcKey); @@ -514,9 +515,9 @@ EcGenerateKey ( } =20 RetVal =3D FALSE; - BnX =3D BN_new(); - BnY =3D BN_new(); - if (BnX =3D=3D NULL || BnY =3D=3D NULL) { + BnX =3D BN_new (); + BnY =3D BN_new (); + if ((BnX =3D=3D NULL) || (BnY =3D=3D NULL)) { goto fail; } =20 @@ -526,9 +527,10 @@ EcGenerateKey ( =20 XSize =3D BN_num_bytes (BnX); YSize =3D BN_num_bytes (BnY); - if (XSize <=3D 0 || YSize <=3D 0) { + if ((XSize <=3D 0) || (YSize <=3D 0)) { goto fail; } + ASSERT ((UINTN)XSize <=3D HalfSize && (UINTN)YSize <=3D HalfSize); =20 ZeroMem (PublicKey, *PublicKeySize); @@ -565,31 +567,32 @@ EcGetPubKey ( IN OUT UINTN *PublicKeySize ) { - EC_KEY *EcKey; - CONST EC_GROUP *Group; - CONST EC_POINT *EcPoint; - BIGNUM *BnX; - BIGNUM *BnY; - UINTN HalfSize; - INTN XSize; - INTN YSize; - BOOLEAN RetVal; - - if (EcContext =3D=3D NULL || PublicKeySize =3D=3D NULL) { + EC_KEY *EcKey; + CONST EC_GROUP *Group; + CONST EC_POINT *EcPoint; + BIGNUM *BnX; + BIGNUM *BnY; + UINTN HalfSize; + INTN XSize; + INTN YSize; + BOOLEAN RetVal; + + if ((EcContext =3D=3D NULL) || (PublicKeySize =3D=3D NULL)) { return FALSE; } =20 - if (PublicKey =3D=3D NULL && *PublicKeySize !=3D 0) { + if ((PublicKey =3D=3D NULL) && (*PublicKeySize !=3D 0)) { return FALSE; } =20 - EcKey =3D (EC_KEY *)EcContext; - Group =3D EC_KEY_get0_group (EcKey); + EcKey =3D (EC_KEY *)EcContext; + Group =3D EC_KEY_get0_group (EcKey); HalfSize =3D (EC_GROUP_get_degree (Group) + 7) / 8; if (*PublicKeySize < HalfSize * 2) { *PublicKeySize =3D HalfSize * 2; return FALSE; } + *PublicKeySize =3D HalfSize * 2; =20 EcPoint =3D EC_KEY_get0_public_key (EcKey); @@ -598,9 +601,9 @@ EcGetPubKey ( } =20 RetVal =3D FALSE; - BnX =3D BN_new(); - BnY =3D BN_new(); - if (BnX =3D=3D NULL || BnY =3D=3D NULL) { + BnX =3D BN_new (); + BnY =3D BN_new (); + if ((BnX =3D=3D NULL) || (BnY =3D=3D NULL)) { goto fail; } =20 @@ -610,9 +613,10 @@ EcGetPubKey ( =20 XSize =3D BN_num_bytes (BnX); YSize =3D BN_num_bytes (BnY); - if (XSize <=3D 0 || YSize <=3D 0) { + if ((XSize <=3D 0) || (YSize <=3D 0)) { goto fail; } + ASSERT ((UINTN)XSize <=3D HalfSize && (UINTN)YSize <=3D HalfSize); =20 if (PublicKey !=3D NULL) { @@ -666,21 +670,21 @@ EcDhComputeKey ( IN OUT UINTN *KeySize ) { - EC_KEY *EcKey; - EC_KEY *PeerEcKey; - CONST EC_GROUP *Group; - BOOLEAN RetVal; - BIGNUM *BnX; - BIGNUM *BnY; - EC_POINT *Point; - INT32 OpenSslNid; - UINTN HalfSize; - - if (EcContext =3D=3D NULL || PeerPublic =3D=3D NULL || KeySize =3D=3D NU= LL) { + EC_KEY *EcKey; + EC_KEY *PeerEcKey; + CONST EC_GROUP *Group; + BOOLEAN RetVal; + BIGNUM *BnX; + BIGNUM *BnY; + EC_POINT *Point; + INT32 OpenSslNid; + UINTN HalfSize; + + if ((EcContext =3D=3D NULL) || (PeerPublic =3D=3D NULL) || (KeySize =3D= =3D NULL)) { return FALSE; } =20 - if (Key =3D=3D NULL && *KeySize !=3D 0) { + if ((Key =3D=3D NULL) && (*KeySize !=3D 0)) { return FALSE; } =20 @@ -688,36 +692,40 @@ EcDhComputeKey ( return FALSE; } =20 - EcKey =3D (EC_KEY *) EcContext; - Group =3D EC_KEY_get0_group (EcKey); + EcKey =3D (EC_KEY *)EcContext; + Group =3D EC_KEY_get0_group (EcKey); HalfSize =3D (EC_GROUP_get_degree (Group) + 7) / 8; - if (CompressFlag =3D=3D NULL && PeerPublicSize !=3D HalfSize * 2) { + if ((CompressFlag =3D=3D NULL) && (PeerPublicSize !=3D HalfSize * 2)) { return FALSE; } - if (CompressFlag !=3D NULL && PeerPublicSize !=3D HalfSize) { + + if ((CompressFlag !=3D NULL) && (PeerPublicSize !=3D HalfSize)) { return FALSE; } + if (*KeySize < HalfSize) { *KeySize =3D HalfSize; return FALSE; } + *KeySize =3D HalfSize; =20 - RetVal =3D FALSE; - Point =3D NULL; - BnX =3D BN_bin2bn (PeerPublic, (INT32) HalfSize, NULL); - BnY =3D NULL; - Point =3D EC_POINT_new (Group); + RetVal =3D FALSE; + Point =3D NULL; + BnX =3D BN_bin2bn (PeerPublic, (INT32)HalfSize, NULL); + BnY =3D NULL; + Point =3D EC_POINT_new (Group); PeerEcKey =3D NULL; - if (BnX =3D=3D NULL || Point =3D=3D NULL) { + if ((BnX =3D=3D NULL) || (Point =3D=3D NULL)) { goto fail; } =20 if (CompressFlag =3D=3D NULL) { - BnY =3D BN_bin2bn (PeerPublic + HalfSize, (INT32) HalfSize, NULL); + BnY =3D BN_bin2bn (PeerPublic + HalfSize, (INT32)HalfSize, NULL); if (BnY =3D=3D NULL) { goto fail; } + if (EC_POINT_set_affine_coordinates (Group, Point, BnX, BnY, NULL) != =3D 1) { goto fail; } @@ -729,13 +737,15 @@ EcDhComputeKey ( =20 // Validate NIST ECDH public key OpenSslNid =3D EC_GROUP_get_curve_name (Group); - PeerEcKey =3D EC_KEY_new_by_curve_name (OpenSslNid); + PeerEcKey =3D EC_KEY_new_by_curve_name (OpenSslNid); if (PeerEcKey =3D=3D NULL) { goto fail; } + if (EC_KEY_set_public_key (PeerEcKey, Point) !=3D 1) { goto fail; } + if (EC_KEY_check_key (PeerEcKey) !=3D 1) { goto fail; } @@ -749,7 +759,7 @@ EcDhComputeKey ( fail: BN_free (BnX); BN_free (BnY); - EC_POINT_free(Point); + EC_POINT_free (Point); EC_KEY_free (PeerEcKey); return RetVal; } diff --git a/CryptoPkg/Private/Protocol/Crypto.h b/CryptoPkg/Private/Protoc= ol/Crypto.h index 84d9fbba32..a91f97b0c0 100644 --- a/CryptoPkg/Private/Protocol/Crypto.h +++ b/CryptoPkg/Private/Protocol/Crypto.h @@ -4302,216 +4302,216 @@ BOOLEAN /// struct _EDKII_CRYPTO_PROTOCOL { /// Version - EDKII_CRYPTO_GET_VERSION GetVersion; + EDKII_CRYPTO_GET_VERSION GetVersion; /// HMAC MD5 - deprecated and unsupported - DEPRECATED_EDKII_CRYPTO_HMAC_MD5_NEW DeprecatedHmacMd5New; - DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FREE DeprecatedHmacMd5Free; - DEPRECATED_EDKII_CRYPTO_HMAC_MD5_SET_KEY DeprecatedHmacMd5SetK= ey; - DEPRECATED_EDKII_CRYPTO_HMAC_MD5_DUPLICATE DeprecatedHmacMd5Dupl= icate; - DEPRECATED_EDKII_CRYPTO_HMAC_MD5_UPDATE DeprecatedHmacMd5Upda= te; - DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FINAL DeprecatedHmacMd5Fina= l; + DEPRECATED_EDKII_CRYPTO_HMAC_MD5_NEW DeprecatedHmacMd5New; + DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FREE DeprecatedHmacMd5Fre= e; + DEPRECATED_EDKII_CRYPTO_HMAC_MD5_SET_KEY DeprecatedHmacMd5Set= Key; + DEPRECATED_EDKII_CRYPTO_HMAC_MD5_DUPLICATE DeprecatedHmacMd5Dup= licate; + DEPRECATED_EDKII_CRYPTO_HMAC_MD5_UPDATE DeprecatedHmacMd5Upd= ate; + DEPRECATED_EDKII_CRYPTO_HMAC_MD5_FINAL DeprecatedHmacMd5Fin= al; /// HMAC SHA1 - deprecated and unsupported - DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_NEW DeprecatedHmacSha1New; - DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FREE DeprecatedHmacSha1Fre= e; - DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_SET_KEY DeprecatedHmacSha1Set= Key; - DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_DUPLICATE DeprecatedHmacSha1Dup= licate; - DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_UPDATE DeprecatedHmacSha1Upd= ate; - DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FINAL DeprecatedHmacSha1Fin= al; + DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_NEW DeprecatedHmacSha1Ne= w; + DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FREE DeprecatedHmacSha1Fr= ee; + DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_SET_KEY DeprecatedHmacSha1Se= tKey; + DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_DUPLICATE DeprecatedHmacSha1Du= plicate; + DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_UPDATE DeprecatedHmacSha1Up= date; + DEPRECATED_EDKII_CRYPTO_HMAC_SHA1_FINAL DeprecatedHmacSha1Fi= nal; /// HMAC SHA256 - EDKII_CRYPTO_HMAC_SHA256_NEW HmacSha256New; - EDKII_CRYPTO_HMAC_SHA256_FREE HmacSha256Free; - EDKII_CRYPTO_HMAC_SHA256_SET_KEY HmacSha256SetKey; - EDKII_CRYPTO_HMAC_SHA256_DUPLICATE HmacSha256Duplicate; - EDKII_CRYPTO_HMAC_SHA256_UPDATE HmacSha256Update; - EDKII_CRYPTO_HMAC_SHA256_FINAL HmacSha256Final; + EDKII_CRYPTO_HMAC_SHA256_NEW HmacSha256New; + EDKII_CRYPTO_HMAC_SHA256_FREE HmacSha256Free; + EDKII_CRYPTO_HMAC_SHA256_SET_KEY HmacSha256SetKey; + EDKII_CRYPTO_HMAC_SHA256_DUPLICATE HmacSha256Duplicate; + EDKII_CRYPTO_HMAC_SHA256_UPDATE HmacSha256Update; + EDKII_CRYPTO_HMAC_SHA256_FINAL HmacSha256Final; /// Md4 - deprecated and unsupported - DEPRECATED_EDKII_CRYPTO_MD4_GET_CONTEXT_SIZE DeprecatedMd4GetConte= xtSize; - DEPRECATED_EDKII_CRYPTO_MD4_INIT DeprecatedMd4Init; - DEPRECATED_EDKII_CRYPTO_MD4_DUPLICATE DeprecatedMd4Duplicat= e; - DEPRECATED_EDKII_CRYPTO_MD4_UPDATE DeprecatedMd4Update; - DEPRECATED_EDKII_CRYPTO_MD4_FINAL DeprecatedMd4Final; - DEPRECATED_EDKII_CRYPTO_MD4_HASH_ALL DeprecatedMd4HashAll; + DEPRECATED_EDKII_CRYPTO_MD4_GET_CONTEXT_SIZE DeprecatedMd4GetCont= extSize; + DEPRECATED_EDKII_CRYPTO_MD4_INIT DeprecatedMd4Init; + DEPRECATED_EDKII_CRYPTO_MD4_DUPLICATE DeprecatedMd4Duplica= te; + DEPRECATED_EDKII_CRYPTO_MD4_UPDATE DeprecatedMd4Update; + DEPRECATED_EDKII_CRYPTO_MD4_FINAL DeprecatedMd4Final; + DEPRECATED_EDKII_CRYPTO_MD4_HASH_ALL DeprecatedMd4HashAll; /// Md5 - EDKII_CRYPTO_MD5_GET_CONTEXT_SIZE Md5GetContextSize; - EDKII_CRYPTO_MD5_INIT Md5Init; - EDKII_CRYPTO_MD5_DUPLICATE Md5Duplicate; - EDKII_CRYPTO_MD5_UPDATE Md5Update; - EDKII_CRYPTO_MD5_FINAL Md5Final; - EDKII_CRYPTO_MD5_HASH_ALL Md5HashAll; + EDKII_CRYPTO_MD5_GET_CONTEXT_SIZE Md5GetContextSize; + EDKII_CRYPTO_MD5_INIT Md5Init; + EDKII_CRYPTO_MD5_DUPLICATE Md5Duplicate; + EDKII_CRYPTO_MD5_UPDATE Md5Update; + EDKII_CRYPTO_MD5_FINAL Md5Final; + EDKII_CRYPTO_MD5_HASH_ALL Md5HashAll; /// Pkcs - EDKII_CRYPTO_PKCS1_ENCRYPT_V2 Pkcs1v2Encrypt; - EDKII_CRYPTO_PKCS5_PW_HASH Pkcs5HashPassword; - EDKII_CRYPTO_PKCS7_VERIFY Pkcs7Verify; - EDKII_CRYPTO_PKCS7_VERIFY_EKU VerifyEKUsInPkcs7Sign= ature; - EDKII_CRYPTO_PKCS7_GET_SIGNERS Pkcs7GetSigners; - EDKII_CRYPTO_PKCS7_FREE_SIGNERS Pkcs7FreeSigners; - EDKII_CRYPTO_PKCS7_SIGN Pkcs7Sign; - EDKII_CRYPTO_PKCS7_GET_ATTACHED_CONTENT Pkcs7GetAttachedConte= nt; - EDKII_CRYPTO_PKCS7_GET_CERTIFICATES_LIST Pkcs7GetCertificatesL= ist; - EDKII_CRYPTO_AUTHENTICODE_VERIFY AuthenticodeVerify; - EDKII_CRYPTO_IMAGE_TIMESTAMP_VERIFY ImageTimestampVerify; + EDKII_CRYPTO_PKCS1_ENCRYPT_V2 Pkcs1v2Encrypt; + EDKII_CRYPTO_PKCS5_PW_HASH Pkcs5HashPassword; + EDKII_CRYPTO_PKCS7_VERIFY Pkcs7Verify; + EDKII_CRYPTO_PKCS7_VERIFY_EKU VerifyEKUsInPkcs7Sig= nature; + EDKII_CRYPTO_PKCS7_GET_SIGNERS Pkcs7GetSigners; + EDKII_CRYPTO_PKCS7_FREE_SIGNERS Pkcs7FreeSigners; + EDKII_CRYPTO_PKCS7_SIGN Pkcs7Sign; + EDKII_CRYPTO_PKCS7_GET_ATTACHED_CONTENT Pkcs7GetAttachedCont= ent; + EDKII_CRYPTO_PKCS7_GET_CERTIFICATES_LIST Pkcs7GetCertificates= List; + EDKII_CRYPTO_AUTHENTICODE_VERIFY AuthenticodeVerify; + EDKII_CRYPTO_IMAGE_TIMESTAMP_VERIFY ImageTimestampVerify; /// DH - EDKII_CRYPTO_DH_NEW DhNew; - EDKII_CRYPTO_DH_FREE DhFree; - EDKII_CRYPTO_DH_GENERATE_PARAMETER DhGenerateParameter; - EDKII_CRYPTO_DH_SET_PARAMETER DhSetParameter; - EDKII_CRYPTO_DH_GENERATE_KEY DhGenerateKey; - EDKII_CRYPTO_DH_COMPUTE_KEY DhComputeKey; + EDKII_CRYPTO_DH_NEW DhNew; + EDKII_CRYPTO_DH_FREE DhFree; + EDKII_CRYPTO_DH_GENERATE_PARAMETER DhGenerateParameter; + EDKII_CRYPTO_DH_SET_PARAMETER DhSetParameter; + EDKII_CRYPTO_DH_GENERATE_KEY DhGenerateKey; + EDKII_CRYPTO_DH_COMPUTE_KEY DhComputeKey; /// Random - EDKII_CRYPTO_RANDOM_SEED RandomSeed; - EDKII_CRYPTO_RANDOM_BYTES RandomBytes; + EDKII_CRYPTO_RANDOM_SEED RandomSeed; + EDKII_CRYPTO_RANDOM_BYTES RandomBytes; /// RSA - EDKII_CRYPTO_RSA_VERIFY_PKCS1 RsaVerifyPkcs1; - EDKII_CRYPTO_RSA_NEW RsaNew; - EDKII_CRYPTO_RSA_FREE RsaFree; - EDKII_CRYPTO_RSA_SET_KEY RsaSetKey; - EDKII_CRYPTO_RSA_GET_KEY RsaGetKey; - EDKII_CRYPTO_RSA_GENERATE_KEY RsaGenerateKey; - EDKII_CRYPTO_RSA_CHECK_KEY RsaCheckKey; - EDKII_CRYPTO_RSA_PKCS1_SIGN RsaPkcs1Sign; - EDKII_CRYPTO_RSA_PKCS1_VERIFY RsaPkcs1Verify; - EDKII_CRYPTO_RSA_GET_PRIVATE_KEY_FROM_PEM RsaGetPrivateKeyFromP= em; - EDKII_CRYPTO_RSA_GET_PUBLIC_KEY_FROM_X509 RsaGetPublicKeyFromX5= 09; + EDKII_CRYPTO_RSA_VERIFY_PKCS1 RsaVerifyPkcs1; + EDKII_CRYPTO_RSA_NEW RsaNew; + EDKII_CRYPTO_RSA_FREE RsaFree; + EDKII_CRYPTO_RSA_SET_KEY RsaSetKey; + EDKII_CRYPTO_RSA_GET_KEY RsaGetKey; + EDKII_CRYPTO_RSA_GENERATE_KEY RsaGenerateKey; + EDKII_CRYPTO_RSA_CHECK_KEY RsaCheckKey; + EDKII_CRYPTO_RSA_PKCS1_SIGN RsaPkcs1Sign; + EDKII_CRYPTO_RSA_PKCS1_VERIFY RsaPkcs1Verify; + EDKII_CRYPTO_RSA_GET_PRIVATE_KEY_FROM_PEM RsaGetPrivateKeyFrom= Pem; + EDKII_CRYPTO_RSA_GET_PUBLIC_KEY_FROM_X509 RsaGetPublicKeyFromX= 509; /// Sha1 - EDKII_CRYPTO_SHA1_GET_CONTEXT_SIZE Sha1GetContextSize; - EDKII_CRYPTO_SHA1_INIT Sha1Init; - EDKII_CRYPTO_SHA1_DUPLICATE Sha1Duplicate; - EDKII_CRYPTO_SHA1_UPDATE Sha1Update; - EDKII_CRYPTO_SHA1_FINAL Sha1Final; - EDKII_CRYPTO_SHA1_HASH_ALL Sha1HashAll; + EDKII_CRYPTO_SHA1_GET_CONTEXT_SIZE Sha1GetContextSize; + EDKII_CRYPTO_SHA1_INIT Sha1Init; + EDKII_CRYPTO_SHA1_DUPLICATE Sha1Duplicate; + EDKII_CRYPTO_SHA1_UPDATE Sha1Update; + EDKII_CRYPTO_SHA1_FINAL Sha1Final; + EDKII_CRYPTO_SHA1_HASH_ALL Sha1HashAll; /// Sha256 - EDKII_CRYPTO_SHA256_GET_CONTEXT_SIZE Sha256GetContextSize; - EDKII_CRYPTO_SHA256_INIT Sha256Init; - EDKII_CRYPTO_SHA256_DUPLICATE Sha256Duplicate; - EDKII_CRYPTO_SHA256_UPDATE Sha256Update; - EDKII_CRYPTO_SHA256_FINAL Sha256Final; - EDKII_CRYPTO_SHA256_HASH_ALL Sha256HashAll; + EDKII_CRYPTO_SHA256_GET_CONTEXT_SIZE Sha256GetContextSize; + EDKII_CRYPTO_SHA256_INIT Sha256Init; + EDKII_CRYPTO_SHA256_DUPLICATE Sha256Duplicate; + EDKII_CRYPTO_SHA256_UPDATE Sha256Update; + EDKII_CRYPTO_SHA256_FINAL Sha256Final; + EDKII_CRYPTO_SHA256_HASH_ALL Sha256HashAll; /// Sha384 - EDKII_CRYPTO_SHA384_GET_CONTEXT_SIZE Sha384GetContextSize; - EDKII_CRYPTO_SHA384_INIT Sha384Init; - EDKII_CRYPTO_SHA384_DUPLICATE Sha384Duplicate; - EDKII_CRYPTO_SHA384_UPDATE Sha384Update; - EDKII_CRYPTO_SHA384_FINAL Sha384Final; - EDKII_CRYPTO_SHA384_HASH_ALL Sha384HashAll; + EDKII_CRYPTO_SHA384_GET_CONTEXT_SIZE Sha384GetContextSize; + EDKII_CRYPTO_SHA384_INIT Sha384Init; + EDKII_CRYPTO_SHA384_DUPLICATE Sha384Duplicate; + EDKII_CRYPTO_SHA384_UPDATE Sha384Update; + EDKII_CRYPTO_SHA384_FINAL Sha384Final; + EDKII_CRYPTO_SHA384_HASH_ALL Sha384HashAll; /// Sha512 - EDKII_CRYPTO_SHA512_GET_CONTEXT_SIZE Sha512GetContextSize; - EDKII_CRYPTO_SHA512_INIT Sha512Init; - EDKII_CRYPTO_SHA512_DUPLICATE Sha512Duplicate; - EDKII_CRYPTO_SHA512_UPDATE Sha512Update; - EDKII_CRYPTO_SHA512_FINAL Sha512Final; - EDKII_CRYPTO_SHA512_HASH_ALL Sha512HashAll; + EDKII_CRYPTO_SHA512_GET_CONTEXT_SIZE Sha512GetContextSize; + EDKII_CRYPTO_SHA512_INIT Sha512Init; + EDKII_CRYPTO_SHA512_DUPLICATE Sha512Duplicate; + EDKII_CRYPTO_SHA512_UPDATE Sha512Update; + EDKII_CRYPTO_SHA512_FINAL Sha512Final; + EDKII_CRYPTO_SHA512_HASH_ALL Sha512HashAll; /// X509 - EDKII_CRYPTO_X509_GET_SUBJECT_NAME X509GetSubjectName; - EDKII_CRYPTO_X509_GET_COMMON_NAME X509GetCommonName; - EDKII_CRYPTO_X509_GET_ORGANIZATION_NAME X509GetOrganizationNa= me; - EDKII_CRYPTO_X509_VERIFY_CERT X509VerifyCert; - EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE X509ConstructCertific= ate; - EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK X509ConstructCertific= ateStack; - EDKII_CRYPTO_X509_FREE X509Free; - EDKII_CRYPTO_X509_STACK_FREE X509StackFree; - EDKII_CRYPTO_X509_GET_TBS_CERT X509GetTBSCert; + EDKII_CRYPTO_X509_GET_SUBJECT_NAME X509GetSubjectName; + EDKII_CRYPTO_X509_GET_COMMON_NAME X509GetCommonName; + EDKII_CRYPTO_X509_GET_ORGANIZATION_NAME X509GetOrganizationN= ame; + EDKII_CRYPTO_X509_VERIFY_CERT X509VerifyCert; + EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE X509ConstructCertifi= cate; + EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK X509ConstructCertifi= cateStack; + EDKII_CRYPTO_X509_FREE X509Free; + EDKII_CRYPTO_X509_STACK_FREE X509StackFree; + EDKII_CRYPTO_X509_GET_TBS_CERT X509GetTBSCert; /// TDES - deprecated and unsupported - DEPRECATED_EDKII_CRYPTO_TDES_GET_CONTEXT_SIZE DeprecatedTdesGetCont= extSize; - DEPRECATED_EDKII_CRYPTO_TDES_INIT DeprecatedTdesInit; - DEPRECATED_EDKII_CRYPTO_TDES_ECB_ENCRYPT DeprecatedTdesEcbEncr= ypt; - DEPRECATED_EDKII_CRYPTO_TDES_ECB_DECRYPT DeprecatedTdesEcbDecr= ypt; - DEPRECATED_EDKII_CRYPTO_TDES_CBC_ENCRYPT DeprecatedTdesCbcEncr= ypt; - DEPRECATED_EDKII_CRYPTO_TDES_CBC_DECRYPT DeprecatedTdesCbcDecr= ypt; + DEPRECATED_EDKII_CRYPTO_TDES_GET_CONTEXT_SIZE DeprecatedTdesGetCon= textSize; + DEPRECATED_EDKII_CRYPTO_TDES_INIT DeprecatedTdesInit; + DEPRECATED_EDKII_CRYPTO_TDES_ECB_ENCRYPT DeprecatedTdesEcbEnc= rypt; + DEPRECATED_EDKII_CRYPTO_TDES_ECB_DECRYPT DeprecatedTdesEcbDec= rypt; + DEPRECATED_EDKII_CRYPTO_TDES_CBC_ENCRYPT DeprecatedTdesCbcEnc= rypt; + DEPRECATED_EDKII_CRYPTO_TDES_CBC_DECRYPT DeprecatedTdesCbcDec= rypt; /// AES - ECB Mode is deprecated and unsupported - EDKII_CRYPTO_AES_GET_CONTEXT_SIZE AesGetContextSize; - EDKII_CRYPTO_AES_INIT AesInit; - DEPRECATED_EDKII_CRYPTO_AES_ECB_ENCRYPT DeprecatedAesEcbEncry= pt; - DEPRECATED_EDKII_CRYPTO_AES_ECB_DECRYPT DeprecatedAesEcbDecry= pt; - EDKII_CRYPTO_AES_CBC_ENCRYPT AesCbcEncrypt; - EDKII_CRYPTO_AES_CBC_DECRYPT AesCbcDecrypt; + EDKII_CRYPTO_AES_GET_CONTEXT_SIZE AesGetContextSize; + EDKII_CRYPTO_AES_INIT AesInit; + DEPRECATED_EDKII_CRYPTO_AES_ECB_ENCRYPT DeprecatedAesEcbEncr= ypt; + DEPRECATED_EDKII_CRYPTO_AES_ECB_DECRYPT DeprecatedAesEcbDecr= ypt; + EDKII_CRYPTO_AES_CBC_ENCRYPT AesCbcEncrypt; + EDKII_CRYPTO_AES_CBC_DECRYPT AesCbcDecrypt; /// Arc4 - deprecated and unsupported - DEPRECATED_EDKII_CRYPTO_ARC4_GET_CONTEXT_SIZE DeprecatedArc4GetCont= extSize; - DEPRECATED_EDKII_CRYPTO_ARC4_INIT DeprecatedArc4Init; - DEPRECATED_EDKII_CRYPTO_ARC4_ENCRYPT DeprecatedArc4Encrypt; - DEPRECATED_EDKII_CRYPTO_ARC4_DECRYPT DeprecatedArc4Decrypt; - DEPRECATED_EDKII_CRYPTO_ARC4_RESET DeprecatedArc4Reset; + DEPRECATED_EDKII_CRYPTO_ARC4_GET_CONTEXT_SIZE DeprecatedArc4GetCon= textSize; + DEPRECATED_EDKII_CRYPTO_ARC4_INIT DeprecatedArc4Init; + DEPRECATED_EDKII_CRYPTO_ARC4_ENCRYPT DeprecatedArc4Encryp= t; + DEPRECATED_EDKII_CRYPTO_ARC4_DECRYPT DeprecatedArc4Decryp= t; + DEPRECATED_EDKII_CRYPTO_ARC4_RESET DeprecatedArc4Reset; /// SM3 - EDKII_CRYPTO_SM3_GET_CONTEXT_SIZE Sm3GetContextSize; - EDKII_CRYPTO_SM3_INIT Sm3Init; - EDKII_CRYPTO_SM3_DUPLICATE Sm3Duplicate; - EDKII_CRYPTO_SM3_UPDATE Sm3Update; - EDKII_CRYPTO_SM3_FINAL Sm3Final; - EDKII_CRYPTO_SM3_HASH_ALL Sm3HashAll; + EDKII_CRYPTO_SM3_GET_CONTEXT_SIZE Sm3GetContextSize; + EDKII_CRYPTO_SM3_INIT Sm3Init; + EDKII_CRYPTO_SM3_DUPLICATE Sm3Duplicate; + EDKII_CRYPTO_SM3_UPDATE Sm3Update; + EDKII_CRYPTO_SM3_FINAL Sm3Final; + EDKII_CRYPTO_SM3_HASH_ALL Sm3HashAll; /// HKDF - EDKII_CRYPTO_HKDF_SHA_256_EXTRACT_AND_EXPAND HkdfSha256ExtractAndE= xpand; + EDKII_CRYPTO_HKDF_SHA_256_EXTRACT_AND_EXPAND HkdfSha256ExtractAnd= Expand; /// X509 (Continued) - EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK_V X509ConstructCertific= ateStackV; + EDKII_CRYPTO_X509_CONSTRUCT_CERTIFICATE_STACK_V X509ConstructCertifi= cateStackV; /// TLS - EDKII_CRYPTO_TLS_INITIALIZE TlsInitialize; - EDKII_CRYPTO_TLS_CTX_FREE TlsCtxFree; - EDKII_CRYPTO_TLS_CTX_NEW TlsCtxNew; - EDKII_CRYPTO_TLS_FREE TlsFree; - EDKII_CRYPTO_TLS_NEW TlsNew; - EDKII_CRYPTO_TLS_IN_HANDSHAKE TlsInHandshake; - EDKII_CRYPTO_TLS_DO_HANDSHAKE TlsDoHandshake; - EDKII_CRYPTO_TLS_HANDLE_ALERT TlsHandleAlert; - EDKII_CRYPTO_TLS_CLOSE_NOTIFY TlsCloseNotify; - EDKII_CRYPTO_TLS_CTRL_TRAFFIC_OUT TlsCtrlTrafficOut; - EDKII_CRYPTO_TLS_CTRL_TRAFFIC_IN TlsCtrlTrafficIn; - EDKII_CRYPTO_TLS_READ TlsRead; - EDKII_CRYPTO_TLS_WRITE TlsWrite; + EDKII_CRYPTO_TLS_INITIALIZE TlsInitialize; + EDKII_CRYPTO_TLS_CTX_FREE TlsCtxFree; + EDKII_CRYPTO_TLS_CTX_NEW TlsCtxNew; + EDKII_CRYPTO_TLS_FREE TlsFree; + EDKII_CRYPTO_TLS_NEW TlsNew; + EDKII_CRYPTO_TLS_IN_HANDSHAKE TlsInHandshake; + EDKII_CRYPTO_TLS_DO_HANDSHAKE TlsDoHandshake; + EDKII_CRYPTO_TLS_HANDLE_ALERT TlsHandleAlert; + EDKII_CRYPTO_TLS_CLOSE_NOTIFY TlsCloseNotify; + EDKII_CRYPTO_TLS_CTRL_TRAFFIC_OUT TlsCtrlTrafficOut; + EDKII_CRYPTO_TLS_CTRL_TRAFFIC_IN TlsCtrlTrafficIn; + EDKII_CRYPTO_TLS_READ TlsRead; + EDKII_CRYPTO_TLS_WRITE TlsWrite; /// TLS Set - EDKII_CRYPTO_TLS_SET_VERSION TlsSetVersion; - EDKII_CRYPTO_TLS_SET_CONNECTION_END TlsSetConnectionEnd; - EDKII_CRYPTO_TLS_SET_CIPHER_LIST TlsSetCipherList; - EDKII_CRYPTO_TLS_SET_COMPRESSION_METHOD TlsSetCompressionMeth= od; - EDKII_CRYPTO_TLS_SET_VERIFY TlsSetVerify; - EDKII_CRYPTO_TLS_SET_VERIFY_HOST TlsSetVerifyHost; - EDKII_CRYPTO_TLS_SET_SESSIONID TlsSetSessionId; - EDKII_CRYPTO_TLS_SET_CA_CERTIFICATE TlsSetCaCertificate; - EDKII_CRYPTO_TLS_SET_HOST_PUBLIC_CERT TlsSetHostPublicCert; - EDKII_CRYPTO_TLS_SET_HOST_PRIVATE_KEY TlsSetHostPrivateKey; - EDKII_CRYPTO_TLS_SET_CERT_REVOCATION_LIST TlsSetCertRevocationL= ist; + EDKII_CRYPTO_TLS_SET_VERSION TlsSetVersion; + EDKII_CRYPTO_TLS_SET_CONNECTION_END TlsSetConnectionEnd; + EDKII_CRYPTO_TLS_SET_CIPHER_LIST TlsSetCipherList; + EDKII_CRYPTO_TLS_SET_COMPRESSION_METHOD TlsSetCompressionMet= hod; + EDKII_CRYPTO_TLS_SET_VERIFY TlsSetVerify; + EDKII_CRYPTO_TLS_SET_VERIFY_HOST TlsSetVerifyHost; + EDKII_CRYPTO_TLS_SET_SESSIONID TlsSetSessionId; + EDKII_CRYPTO_TLS_SET_CA_CERTIFICATE TlsSetCaCertificate; + EDKII_CRYPTO_TLS_SET_HOST_PUBLIC_CERT TlsSetHostPublicCert; + EDKII_CRYPTO_TLS_SET_HOST_PRIVATE_KEY TlsSetHostPrivateKey; + EDKII_CRYPTO_TLS_SET_CERT_REVOCATION_LIST TlsSetCertRevocation= List; /// TLS Get - EDKII_CRYPTO_TLS_GET_VERSION TlsGetVersion; - EDKII_CRYPTO_TLS_GET_CONNECTION_END TlsGetConnectionEnd; - EDKII_CRYPTO_TLS_GET_CURRENT_CIPHER TlsGetCurrentCipher; - EDKII_CRYPTO_TLS_GET_CURRENT_COMPRESSION_ID TlsGetCurrentCompress= ionId; - EDKII_CRYPTO_TLS_GET_VERIFY TlsGetVerify; - EDKII_CRYPTO_TLS_GET_SESSION_ID TlsGetSessionId; - EDKII_CRYPTO_TLS_GET_CLIENT_RANDOM TlsGetClientRandom; - EDKII_CRYPTO_TLS_GET_SERVER_RANDOM TlsGetServerRandom; - EDKII_CRYPTO_TLS_GET_KEY_MATERIAL TlsGetKeyMaterial; - EDKII_CRYPTO_TLS_GET_CA_CERTIFICATE TlsGetCaCertificate; - EDKII_CRYPTO_TLS_GET_HOST_PUBLIC_CERT TlsGetHostPublicCert; - EDKII_CRYPTO_TLS_GET_HOST_PRIVATE_KEY TlsGetHostPrivateKey; - EDKII_CRYPTO_TLS_GET_CERT_REVOCATION_LIST TlsGetCertRevocationL= ist; + EDKII_CRYPTO_TLS_GET_VERSION TlsGetVersion; + EDKII_CRYPTO_TLS_GET_CONNECTION_END TlsGetConnectionEnd; + EDKII_CRYPTO_TLS_GET_CURRENT_CIPHER TlsGetCurrentCipher; + EDKII_CRYPTO_TLS_GET_CURRENT_COMPRESSION_ID TlsGetCurrentCompres= sionId; + EDKII_CRYPTO_TLS_GET_VERIFY TlsGetVerify; + EDKII_CRYPTO_TLS_GET_SESSION_ID TlsGetSessionId; + EDKII_CRYPTO_TLS_GET_CLIENT_RANDOM TlsGetClientRandom; + EDKII_CRYPTO_TLS_GET_SERVER_RANDOM TlsGetServerRandom; + EDKII_CRYPTO_TLS_GET_KEY_MATERIAL TlsGetKeyMaterial; + EDKII_CRYPTO_TLS_GET_CA_CERTIFICATE TlsGetCaCertificate; + EDKII_CRYPTO_TLS_GET_HOST_PUBLIC_CERT TlsGetHostPublicCert; + EDKII_CRYPTO_TLS_GET_HOST_PRIVATE_KEY TlsGetHostPrivateKey; + EDKII_CRYPTO_TLS_GET_CERT_REVOCATION_LIST TlsGetCertRevocation= List; /// RSA PSS - EDKII_CRYPTO_RSA_PSS_SIGN RsaPssSign; - EDKII_CRYPTO_RSA_PSS_VERIFY RsaPssVerify; + EDKII_CRYPTO_RSA_PSS_SIGN RsaPssSign; + EDKII_CRYPTO_RSA_PSS_VERIFY RsaPssVerify; /// Parallel hash - EDKII_CRYPTO_PARALLEL_HASH_ALL ParallelHash256HashAl= l; + EDKII_CRYPTO_PARALLEL_HASH_ALL ParallelHash256HashA= ll; /// Big Number - EDKII_CRYPTO_BIGNUM_INIT BigNumInit; - EDKII_CRYPTO_BIGNUM_FROM_BIN BigNumFromBin; - EDKII_CRYPTO_BIGNUM_TO_BIN BigNumToBin; - EDKII_CRYPTO_BIGNUM_FREE BigNumFree; - EDKII_CRYPTO_BIGNUM_ADD BigNumAdd; - EDKII_CRYPTO_BIGNUM_SUB BigNumSub; - EDKII_CRYPTO_BIGNUM_MOD BigNumMod; - EDKII_CRYPTO_BIGNUM_EXP_MOD BigNumExpMod; - EDKII_CRYPTO_BIGNUM_INVERSE_MOD BigNumInverseMod; - EDKII_CRYPTO_BIGNUM_DIV BigNumDiv; - EDKII_CRYPTO_BIGNUM_MUL_MOD BigNumMulMod; - EDKII_CRYPTO_BIGNUM_CMP BigNumCmp; - EDKII_CRYPTO_BIGNUM_BITS BigNumBits; - EDKII_CRYPTO_BIGNUM_BYTES BigNumBytes; - EDKII_CRYPTO_BIGNUM_IS_WORD BigNumIsWord; - EDKII_CRYPTO_BIGNUM_IS_ODD BigNumIsOdd; - EDKII_CRYPTO_BIGNUM_COPY BigNumCopy; - EDKII_CRYPTO_BIGNUM_VALUE_ONE BigNumValueOne; - EDKII_CRYPTO_BIGNUM_R_SHIFT BigNumRShift; - EDKII_CRYPTO_BIGNUM_CONST_TIME BigNumConstTime; - EDKII_CRYPTO_BIGNUM_SQR_MOD BigNumSqrMod; - EDKII_CRYPTO_BIGNUM_NEW_CONTEXT BigNumNewContext; - EDKII_CRYPTO_BIGNUM_CONTEXT_FREE BigNumContextFree; - EDKII_CRYPTO_BIGNUM_SET_UINT BigNumSetUint; - EDKII_CRYPTO_BIGNUM_ADD_MOD BigNumAddMod; + EDKII_CRYPTO_BIGNUM_INIT BigNumInit; + EDKII_CRYPTO_BIGNUM_FROM_BIN BigNumFromBin; + EDKII_CRYPTO_BIGNUM_TO_BIN BigNumToBin; + EDKII_CRYPTO_BIGNUM_FREE BigNumFree; + EDKII_CRYPTO_BIGNUM_ADD BigNumAdd; + EDKII_CRYPTO_BIGNUM_SUB BigNumSub; + EDKII_CRYPTO_BIGNUM_MOD BigNumMod; + EDKII_CRYPTO_BIGNUM_EXP_MOD BigNumExpMod; + EDKII_CRYPTO_BIGNUM_INVERSE_MOD BigNumInverseMod; + EDKII_CRYPTO_BIGNUM_DIV BigNumDiv; + EDKII_CRYPTO_BIGNUM_MUL_MOD BigNumMulMod; + EDKII_CRYPTO_BIGNUM_CMP BigNumCmp; + EDKII_CRYPTO_BIGNUM_BITS BigNumBits; + EDKII_CRYPTO_BIGNUM_BYTES BigNumBytes; + EDKII_CRYPTO_BIGNUM_IS_WORD BigNumIsWord; + EDKII_CRYPTO_BIGNUM_IS_ODD BigNumIsOdd; + EDKII_CRYPTO_BIGNUM_COPY BigNumCopy; + EDKII_CRYPTO_BIGNUM_VALUE_ONE BigNumValueOne; + EDKII_CRYPTO_BIGNUM_R_SHIFT BigNumRShift; + EDKII_CRYPTO_BIGNUM_CONST_TIME BigNumConstTime; + EDKII_CRYPTO_BIGNUM_SQR_MOD BigNumSqrMod; + EDKII_CRYPTO_BIGNUM_NEW_CONTEXT BigNumNewContext; + EDKII_CRYPTO_BIGNUM_CONTEXT_FREE BigNumContextFree; + EDKII_CRYPTO_BIGNUM_SET_UINT BigNumSetUint; + EDKII_CRYPTO_BIGNUM_ADD_MOD BigNumAddMod; /// EC EDKII_CRYPTO_EC_GROUP_INIT EcGroupInit; EDKII_CRYPTO_EC_GROUP_GET_CURVE EcGroupGetCurve; diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BnTests.c b/Crypt= oPkg/Test/UnitTest/Library/BaseCryptLib/BnTests.c index df91752c9c..2636bb6318 100644 --- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BnTests.c +++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BnTests.c @@ -11,9 +11,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent // // Debug data // -#define MAX_TEST_DATA_SIZE 512 +#define MAX_TEST_DATA_SIZE 512 #define BYTES_OF_OPERATION_A 60 -#define BITS_OF_OPERATION_A 480 //(8 * 60) +#define BITS_OF_OPERATION_A 480// (8 * 60) =20 GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 BnOperationA[] =3D { 0x00, 0x00, 0x00, 0x00, 0x93, 0x61, 0x7a, 0xba, 0xcc, 0x41, 0x73, 0x49, = 0xae, 0x20, 0x41, 0x31, @@ -88,23 +88,23 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 BnResultExpM= od[] =3D { =20 // BnOperationA >> 128 GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 BnResultRShift[] =3D { - 0x93, 0x61, 0x7a, 0xba, 0xcc, 0x41, 0x73, 0x49, = 0xae, 0x20, 0x41, 0x31, - 0x12, 0xe6, 0xfa, 0x4e, 0x89, 0xa9, 0x7e, 0xa2, 0x0a, 0x9e, 0xee, 0xe6, = 0x4b, 0x55, 0xd3, 0x9a, - 0x21, 0x92, 0x99, 0x2a, 0x27, 0x4f, 0xc1, 0xa8, 0x36, 0xba, 0x3c, 0x23, = 0xa3, 0xfe, 0xeb, 0xbd + 0x93, 0x61, 0x7a, 0xba, 0xcc, 0x41, 0x73, 0x49, 0xae, 0x20, 0x41, 0x31, + 0x12, 0xe6, 0xfa, 0x4e, 0x89, 0xa9, 0x7e, 0xa2, 0x0a, 0x9e, 0xee, 0xe6,0= x4b, 0x55, 0xd3, 0x9a, + 0x21, 0x92, 0x99, 0x2a, 0x27, 0x4f, 0xc1, 0xa8, 0x36, 0xba, 0x3c, 0x23,0= xa3, 0xfe, 0xeb, 0xbd }; =20 // 0x12345678 -GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 BnResultUIntSet[] =3D {0x12, 0= x34, 0x56, 0x78}; +GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 BnResultUIntSet[] =3D { 0x12, = 0x34, 0x56, 0x78 }; =20 typedef struct { - VOID *BnA; - VOID *BnB; - VOID *BnC; - VOID *BnD; - VOID *BnCTX; + VOID *BnA; + VOID *BnB; + VOID *BnC; + VOID *BnD; + VOID *BnCTX; } BN_TEST_CONTEXT; =20 -GLOBAL_REMOVE_IF_UNREFERENCED STATIC BN_TEST_CONTEXT mBnContext =3D {NULL,= NULL, NULL, NULL, NULL}; +GLOBAL_REMOVE_IF_UNREFERENCED STATIC BN_TEST_CONTEXT mBnContext =3D { NUL= L, NULL, NULL, NULL, NULL }; =20 // // Debug function @@ -112,18 +112,23 @@ GLOBAL_REMOVE_IF_UNREFERENCED STATIC BN_TEST_CONTEXT = mBnContext =3D {NULL, NULL, N STATIC BOOLEAN EqualBn2Bn ( - CONST VOID *Expected, CONST VOID *Actual + CONST VOID *Expected, + CONST VOID *Actual ) { - if (BigNumCmp(Expected, Actual) =3D=3D 0) - return TRUE; - return FALSE; + if (BigNumCmp (Expected, Actual) =3D=3D 0) { + return TRUE; + } + + return FALSE; } =20 STATIC BOOLEAN EqualBn2Bin ( - CONST VOID *Bn, CONST UINT8 *Buffer, CONST UINTN BufferSize + CONST VOID *Bn, + CONST UINT8 *Buffer, + CONST UINTN BufferSize ) { UINTN BnTestBufferSize; @@ -135,6 +140,7 @@ EqualBn2Bin ( return TRUE; } } + return FALSE; } =20 @@ -144,22 +150,24 @@ TestVerifyBnPreReq ( UNIT_TEST_CONTEXT Context ) { - BN_TEST_CONTEXT *BnContext; - - BnContext =3D Context; - BnContext->BnCTX =3D BigNumNewContext(); - BnContext->BnA =3D BigNumInit(); - BnContext->BnB =3D BigNumInit(); - BnContext->BnC =3D BigNumInit(); - BnContext->BnD =3D BigNumInit(); - if (BnContext->BnCTX =3D=3D NULL - || BnContext->BnA =3D=3D NULL - || BnContext->BnB =3D=3D NULL - || BnContext->BnC =3D=3D NULL - || BnContext->BnD =3D=3D NULL - ) { + BN_TEST_CONTEXT *BnContext; + + BnContext =3D Context; + BnContext->BnCTX =3D BigNumNewContext (); + BnContext->BnA =3D BigNumInit (); + BnContext->BnB =3D BigNumInit (); + BnContext->BnC =3D BigNumInit (); + BnContext->BnD =3D BigNumInit (); + if ( (BnContext->BnCTX =3D=3D NULL) + || (BnContext->BnA =3D=3D NULL) + || (BnContext->BnB =3D=3D NULL) + || (BnContext->BnC =3D=3D NULL) + || (BnContext->BnD =3D=3D NULL) + ) + { return UNIT_TEST_ERROR_TEST_FAILED; } + return UNIT_TEST_PASSED; } =20 @@ -169,7 +177,7 @@ TestVerifyBnCleanUp ( UNIT_TEST_CONTEXT Context ) { - BN_TEST_CONTEXT *BnContext; + BN_TEST_CONTEXT *BnContext; =20 BnContext =3D Context; BigNumContextFree (BnContext->BnCTX); @@ -185,63 +193,64 @@ TestVerifyBn ( IN UNIT_TEST_CONTEXT Context ) { - BN_TEST_CONTEXT *BnContext; - UINTN Num; - CONST VOID *BnOne; + BN_TEST_CONTEXT *BnContext; + UINTN Num; + CONST VOID *BnOne; =20 BnContext =3D Context; =20 // Calculation tests BnContext->BnA =3D BigNumFromBin (BnOperationA, sizeof (BnOperationA)); BnContext->BnB =3D BigNumFromBin (BnOperationB, sizeof (BnOperationB)); - //C=3DA+B + // C=3DA+B BigNumAdd (BnContext->BnA, BnContext->BnB, BnContext->BnC); UT_ASSERT_TRUE (EqualBn2Bin (BnContext->BnC, BnResultSum, sizeof (BnResu= ltSum))); - //D=3DC-A=3DB + // D=3DC-A=3DB BigNumSub (BnContext->BnC, BnContext->BnA, BnContext->BnD); UT_ASSERT_TRUE (EqualBn2Bn (BnContext->BnB, BnContext->BnD)); - //C=3D(A+B)%D + // C=3D(A+B)%D BnContext->BnD =3D BigNumFromBin (BnOperationMod, sizeof (BnOperationMod= )); BigNumAddMod (BnContext->BnA, BnContext->BnB, BnContext->BnD, BnContext-= >BnC); UT_ASSERT_TRUE (EqualBn2Bin (BnContext->BnC, BnResultSumMod, sizeof (BnR= esultSumMod))); - //C=3D(A*B)%D + // C=3D(A*B)%D BigNumMulMod (BnContext->BnA, BnContext->BnB, BnContext->BnD, BnContext-= >BnC); UT_ASSERT_TRUE (EqualBn2Bin (BnContext->BnC, BnResultMulMod, sizeof (BnR= esultMulMod))); - //C=3DA/D + // C=3DA/D BigNumDiv (BnContext->BnA, BnContext->BnD, BnContext->BnC); UT_ASSERT_TRUE (EqualBn2Bin (BnContext->BnC, BnResultDiv, sizeof (BnResu= ltDiv))); - //C=3DA%D + // C=3DA%D BigNumMod (BnContext->BnA, BnContext->BnD, BnContext->BnC); UT_ASSERT_TRUE (EqualBn2Bin (BnContext->BnC, BnResultMod, sizeof (BnResu= ltMod))); - //1=3D(A*C)%D + // 1=3D(A*C)%D BigNumInverseMod (BnContext->BnA, BnContext->BnD, BnContext->BnC); UT_ASSERT_TRUE (EqualBn2Bin (BnContext->BnC, BnResultInverseMod, sizeof = (BnResultInverseMod))); - //C=3D(A^B)%D + // C=3D(A^B)%D BnContext->BnB =3D BigNumFromBin (BnOperationExp, sizeof (BnOperationExp= )); BigNumExpMod (BnContext->BnA, BnContext->BnB, BnContext->BnD, BnContext-= >BnC); UT_ASSERT_TRUE (EqualBn2Bin (BnContext->BnC, BnResultExpMod, sizeof (BnR= esultExpMod))); - //C=3DA>>128 + // C=3DA>>128 BigNumRShift (BnContext->BnA, 128, BnContext->BnC); UT_ASSERT_TRUE (EqualBn2Bin (BnContext->BnC, BnResultRShift, sizeof (BnR= esultRShift))); - //C=3D0x12345678 + // C=3D0x12345678 BigNumSetUint (BnContext->BnC, 0x12345678); UT_ASSERT_TRUE (EqualBn2Bin (BnContext->BnC, BnResultUIntSet, sizeof (Bn= ResultUIntSet))); - //Bn compare + // Bn compare UT_ASSERT_TRUE (BigNumIsWord (BnContext->BnC, 0x12345678)); UT_ASSERT_FALSE (BigNumIsWord (BnContext->BnC, 0x12345600)); UT_ASSERT_FALSE (BigNumIsOdd (BnContext->BnC)); UT_ASSERT_TRUE (BigNumIsOdd (BnContext->BnA)); =20 - //Other tests + // Other tests BigNumConstTime (BnContext->BnA); Num =3D BigNumBytes (BnContext->BnA); UT_ASSERT_EQUAL (Num, BYTES_OF_OPERATION_A); Num =3D BigNumBits (BnContext->BnA); UT_ASSERT_EQUAL (Num, BITS_OF_OPERATION_A); - BnOne =3D BigNumValueOne(); + BnOne =3D BigNumValueOne (); if (BnOne =3D=3D NULL) { return UNIT_TEST_ERROR_TEST_FAILED; } + UT_ASSERT_TRUE (BigNumIsWord (BnOne, 0x1)); =20 return UNIT_TEST_PASSED; @@ -251,7 +260,7 @@ TEST_DESC mBnTest[] =3D { // // -----Description----------------Class---------------------Function---= --------Pre----------------Post---------Context // - { "TestVerifyBn()", "CryptoPkg.BaseCryptLib.BigNumber", TestVerifyBn, = TestVerifyBnPreReq, TestVerifyBnCleanUp, &mBnContext }, + { "TestVerifyBn()", "CryptoPkg.BaseCryptLib.BigNumber", TestVerifyBn, Te= stVerifyBnPreReq, TestVerifyBnCleanUp, &mBnContext }, }; =20 -UINTN mBnTestNum =3D ARRAY_SIZE(mBnTest); +UINTN mBnTestNum =3D ARRAY_SIZE (mBnTest); diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/EcTests.c b/Crypt= oPkg/Test/UnitTest/Library/BaseCryptLib/EcTests.c index 8008b1dc78..54ce0b22df 100644 --- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/EcTests.c +++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/EcTests.c @@ -8,19 +8,19 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include "TestBaseCryptLib.h" =20 -#define EC_CURVE_NUM_SUPPORTED 3 -UINTN EcCurveList[EC_CURVE_NUM_SUPPORTED] =3D {CRYPTO_NID_SECP256R1, CRYP= TO_NID_SECP384R1, CRYPTO_NID_SECP521R1}; -UINTN EcKeyHalfSize[EC_CURVE_NUM_SUPPORTED] =3D {32, 48, 66}; +#define EC_CURVE_NUM_SUPPORTED 3 +UINTN EcCurveList[EC_CURVE_NUM_SUPPORTED] =3D { CRYPTO_NID_SECP256R1, C= RYPTO_NID_SECP384R1, CRYPTO_NID_SECP521R1 }; +UINTN EcKeyHalfSize[EC_CURVE_NUM_SUPPORTED] =3D { 32, 48, 66 }; =20 -struct Generator -{ - UINT8 X[66]; - UINT8 Y[66]; +struct Generator { + UINT8 X[66]; + UINT8 Y[66]; }; + // Generator points of all ec curve -struct Generator EcCurveGenerator[EC_CURVE_NUM_SUPPORTED] =3D +struct Generator EcCurveGenerator[EC_CURVE_NUM_SUPPORTED] =3D { - //CRYPTO_NID_SECP256R1 + // CRYPTO_NID_SECP256R1 { { 0x6B, 0x17, 0xD1, 0xF2, 0xE1, 0x2C, 0x42, 0x47, 0xF8, 0xBC, 0xE6, 0x= E5, 0x63, 0xA4, 0x40, 0xF2, 0x77, 0x03, 0x7D, 0x81, 0x2D, 0xEB, 0x33, 0x= A0, @@ -30,7 +30,7 @@ struct Generator EcCurveGenerator[EC_CURVE_NUM_SUPPORTED]= =3D 0x7c, 0x0f, 0x9e, 0x16, 0x2b, 0xce, 0x33, 0x57, 0x6b, 0x31, 0x5e, 0x= ce, 0xcb, 0xb6, 0x40, 0x68, 0x37, 0xbf, 0x51, 0xf5 } }, - //CRYPTO_NID_SECP384R1 + // CRYPTO_NID_SECP384R1 { { 0xAA, 0x87, 0xCA, 0x22, 0xBE, 0x8B, 0x05, 0x37, 0x8E, 0xB1, 0xC7, 0x= 1E, 0xF3, 0x20, 0xAD, 0x74, 0x6E, 0x1D, 0x3B, 0x62, 0x8B, 0xA7, 0x9B, 0x= 98, @@ -42,7 +42,7 @@ struct Generator EcCurveGenerator[EC_CURVE_NUM_SUPPORTED]= =3D 0xe9, 0xda, 0x31, 0x13, 0xb5, 0xf0, 0xb8, 0xc0, 0x0a, 0x60, 0xb1, 0x= ce, 0x1d, 0x7e, 0x81, 0x9d, 0x7a, 0x43, 0x1d, 0x7c, 0x90, 0xea, 0x0e, 0x= 5f } }, - //CRYPTO_NID_SECP521R1 + // CRYPTO_NID_SECP521R1 { { 0x00, 0xC6, 0x85, 0x8E, 0x06, 0xB7, 0x04, 0x04, 0xE9, 0xCD, 0x9E, 0x= 3E, 0xCB, 0x66, 0x23, 0x95, 0xB4, 0x42, 0x9C, 0x64, 0x81, 0x39, 0x05, 0x= 3F, @@ -60,16 +60,16 @@ struct Generator EcCurveGenerator[EC_CURVE_NUM_SUPPORTE= D] =3D } }; =20 -VOID *Ec1 ; -VOID *Ec2 ; -VOID *Group ; -VOID *Point1 ; -VOID *Point2 ; -VOID *PointRes; -VOID *BnX ; -VOID *BnY ; -VOID *BnP ; -VOID *BnOrder ; +VOID *Ec1; +VOID *Ec2; +VOID *Group; +VOID *Point1; +VOID *Point2; +VOID *PointRes; +VOID *BnX; +VOID *BnY; +VOID *BnP; +VOID *BnOrder; =20 UNIT_TEST_STATUS EFIAPI @@ -87,9 +87,10 @@ TestVerifyEcPreReq ( BnY =3D NULL; BnP =3D BigNumInit (); BnOrder =3D BigNumInit (); - if (BnP =3D=3D NULL || BnOrder =3D=3D NULL) { + if ((BnP =3D=3D NULL) || (BnOrder =3D=3D NULL)) { return UNIT_TEST_ERROR_TEST_FAILED; } + return UNIT_TEST_PASSED; } =20 @@ -117,8 +118,8 @@ TestVerifyEcBasic ( UNIT_TEST_CONTEXT Context ) { - UINTN CurveCount; - BOOLEAN Status; + UINTN CurveCount; + BOOLEAN Status; =20 // // Initialize BigNumbers @@ -132,12 +133,12 @@ TestVerifyEcBasic ( return UNIT_TEST_ERROR_TEST_FAILED; } =20 - Point1 =3D EcPointInit (Group); - Point2 =3D EcPointInit (Group); + Point1 =3D EcPointInit (Group); + Point2 =3D EcPointInit (Group); PointRes =3D EcPointInit (Group); - BnX =3D BigNumFromBin (EcCurveGenerator[CurveCount].X, EcKeyHalfSize[C= urveCount]); - BnY =3D BigNumFromBin (EcCurveGenerator[CurveCount].Y, EcKeyHalfSize[C= urveCount]); - if (Point1 =3D=3D NULL || Point2 =3D=3D NULL || PointRes =3D=3D NULL |= | BnX =3D=3D NULL || BnY =3D=3D NULL) { + BnX =3D BigNumFromBin (EcCurveGenerator[CurveCount].X, EcKeyHalfS= ize[CurveCount]); + BnY =3D BigNumFromBin (EcCurveGenerator[CurveCount].Y, EcKeyHalfS= ize[CurveCount]); + if ((Point1 =3D=3D NULL) || (Point2 =3D=3D NULL) || (PointRes =3D=3D N= ULL) || (BnX =3D=3D NULL) || (BnY =3D=3D NULL)) { return UNIT_TEST_ERROR_TEST_FAILED; } =20 @@ -147,7 +148,7 @@ TestVerifyEcBasic ( Status =3D EcGroupGetOrder (Group, BnOrder); UT_ASSERT_TRUE (Status); =20 - //Point G should on curve + // Point G should on curve Status =3D EcPointSetAffineCoordinates (Group, Point1, BnX, BnY, NULL); UT_ASSERT_TRUE (Status); =20 @@ -163,21 +164,21 @@ TestVerifyEcBasic ( Status =3D EcPointIsAtInfinity (Group, Point1); UT_ASSERT_FALSE (Status); =20 - //Point 2G should on curve + // Point 2G should on curve Status =3D EcPointAdd (Group, PointRes, Point1, Point1, NULL); UT_ASSERT_TRUE (Status); =20 Status =3D EcPointIsOnCurve (Group, PointRes, NULL); UT_ASSERT_TRUE (Status); =20 - //Point Order * G should at infinity + // Point Order * G should at infinity Status =3D EcPointMul (Group, PointRes, Point1, BnOrder, NULL); UT_ASSERT_TRUE (Status); =20 Status =3D EcPointIsAtInfinity (Group, PointRes); UT_ASSERT_TRUE (Status); =20 - //-(-G) =3D=3D G + // -(-G) =3D=3D G Status =3D EcPointInvert (Group, Point2, NULL); UT_ASSERT_TRUE (Status); =20 @@ -190,7 +191,7 @@ TestVerifyEcBasic ( Status =3D EcPointEqual (Group, Point2, Point1, NULL); UT_ASSERT_TRUE (Status); =20 - //Compress point test + // Compress point test Status =3D EcPointSetCompressedCoordinates (Group, Point1, BnX, 0, NUL= L); UT_ASSERT_TRUE (Status); =20 @@ -216,16 +217,16 @@ TestVerifyEcDh ( UNIT_TEST_CONTEXT Context ) { - UINT8 Public1[66 * 2]; - UINTN Public1Length; - UINT8 Public2[66 * 2]; - UINTN Public2Length; - UINT8 Key1[66]; - UINTN Key1Length; - UINT8 Key2[66]; - UINTN Key2Length; - UINTN CurveCount; - BOOLEAN Status; + UINT8 Public1[66 * 2]; + UINTN Public1Length; + UINT8 Public2[66 * 2]; + UINTN Public2Length; + UINT8 Key1[66]; + UINTN Key1Length; + UINT8 Key2[66]; + UINTN Key2Length; + UINTN CurveCount; + BOOLEAN Status; =20 for (CurveCount =3D 0; CurveCount < EC_CURVE_NUM_SUPPORTED; CurveCount++= ) { // @@ -233,8 +234,8 @@ TestVerifyEcDh ( // Public1Length =3D sizeof (Public1); Public2Length =3D sizeof (Public2); - Key1Length =3D sizeof (Key1); - Key2Length =3D sizeof (Key2); + Key1Length =3D sizeof (Key1); + Key2Length =3D sizeof (Key2); // // ECDH functions unit test // --=20 2.31.1.windows.1 -=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 (#93369): https://edk2.groups.io/g/devel/message/93369 Mute This Topic: https://groups.io/mt/93520792/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-