From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id 2236274003E for ; Mon, 6 May 2024 18:07:56 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=lFfhMB9xFD1+007iBaNTZIS7uBKrGIxmTR9gE9goQgk=; c=relaxed/simple; d=groups.io; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From:To:Cc:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type; s=20240206; t=1715018875; v=1; b=ZO7s/4xNM5bU++Qn4XlxhWoDnwGcTntDtUA4gwl666Rx9dRhDgIw4Mp6BnTShvZ7oYJtciHx fAH+RM1JGs9pLlnPIOiKv01cTct4E8e7iEBwp+Ni40X6rB3hWhcoPm5OxDzdf8ZPggoQIghSen8 LtLzgYFWQF9SHor4m/S+rmmvZHRqWUSVoJb5yk7rDd4Wh8HiiWW+wLoHYmF1g1JgHsN3jr7h8qL 4/3H8PyQ6Yu617H182Nly3YX7171ZJiLaF3MXYRUfcHhlrcl1dJ/T+0gVZfZ3e9PtXgQiR604HT mHVDEwrWZ4P3QxC0ECGsZBGVHmNHBoPhit9YUO1sO5Hjw== X-Received: by 127.0.0.2 with SMTP id 9BpuYY7687511xBsZPF0tmTl; Mon, 06 May 2024 11:07:55 -0700 X-Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by mx.groups.io with SMTP id smtpd.web10.1452.1715018875063731303 for ; Mon, 06 May 2024 11:07:55 -0700 X-Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-de61a10141fso3164275276.1 for ; Mon, 06 May 2024 11:07:54 -0700 (PDT) X-Gm-Message-State: SuIuri3IyZtAkc0rciE75ozPx7686176AA= X-Google-Smtp-Source: AGHT+IGUUbgEA4PBXhkwpSijPVE5t3Rm7D8Hr7fEZ/ERtuMJWBrsnnQaVMtuW86Nr2j0tpRPDuDyOa0lHDUflWa/MA== X-Received: from dionnaglaze.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:2ee6]) (user=dionnaglaze job=sendgmr) by 2002:a25:d309:0:b0:de5:5be3:709f with SMTP id e9-20020a25d309000000b00de55be3709fmr1232647ybf.6.1715018874190; Mon, 06 May 2024 11:07:54 -0700 (PDT) Date: Mon, 6 May 2024 18:07:44 +0000 In-Reply-To: <20240506180745.2139164-1-dionnaglaze@google.com> Mime-Version: 1.0 References: <20240506180745.2139164-1-dionnaglaze@google.com> Message-ID: <20240506180745.2139164-3-dionnaglaze@google.com> Subject: [edk2-devel] [PATCH v4 2/3] SecurityPkg: Recognize sp800155Event3 event From: "Dionna Glaze via groups.io" To: devel@edk2.groups.io Cc: Dionna Glaze , Jiewen Yao , Rahul Kumar Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Mon, 06 May 2024 11:07:55 -0700 Resent-From: dionnaglaze@google.com Reply-To: devel@edk2.groups.io,dionnaglaze@google.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Type: text/plain; charset="UTF-8" X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b="ZO7s/4xN"; dmarc=pass (policy=none) header.from=groups.io; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io The signatures for event2 or event3 are now valid TCG SP800155 event types. Fixes uncrustify formatting. Cc: Jiewen Yao Cc: Rahul Kumar Reviewed-by: Jiewen Yao Signed-off-by: Dionna Glaze --- SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c index b8f50e25df..b55b6c12d2 100644 --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c @@ -812,11 +812,16 @@ Is800155Event ( { if ((((TCG_PCR_EVENT2_HDR *)NewEventHdr)->EventType == EV_NO_ACTION) && (NewEventSize >= sizeof (TCG_Sp800_155_PlatformId_Event2)) && - (CompareMem ( - NewEventData, - TCG_Sp800_155_PlatformId_Event2_SIGNATURE, - sizeof (TCG_Sp800_155_PlatformId_Event2_SIGNATURE) - 1 - ) == 0)) + ((CompareMem ( + NewEventData, + TCG_Sp800_155_PlatformId_Event2_SIGNATURE, + sizeof (TCG_Sp800_155_PlatformId_Event2_SIGNATURE) - 1 + ) == 0) || + (CompareMem ( + NewEventData, + TCG_Sp800_155_PlatformId_Event3_SIGNATURE, + sizeof (TCG_Sp800_155_PlatformId_Event3_SIGNATURE) - 1 + ) == 0))) { return TRUE; } -- 2.45.0.rc1.225.g2a3ae87e7f-goog -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#118612): https://edk2.groups.io/g/devel/message/118612 Mute This Topic: https://groups.io/mt/105945152/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-