From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) by mx.groups.io with SMTP id smtpd.web11.9873.1661854491102284391 for ; Tue, 30 Aug 2022 03:14:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=V5/BG7Fg; spf=pass (domain: gmail.com, ip: 209.85.208.176, mailfrom: aladyshev22@gmail.com) Received: by mail-lj1-f176.google.com with SMTP id k22so10817494ljg.2 for ; Tue, 30 Aug 2022 03:14:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=olCWXhsgK8/6hX45bZR2xQ94VxQ1qtl8YYt+Nwq/Oec=; b=V5/BG7FgT+aO1XR267aThQSiuwqpfU/a0sOmTRE0PQEC568KwJqXnWoXXvxXgF99a7 j9AnG+TIlRJzWPoTTwnOMvNgx2SG6g0hozL4MJmydwV7KQn0InmJ016ST/+YyVuZlCns kozgxXkYiFYAh67TqTrLUSfx83OnmCqc/juTq3gzTOllXTfdsB1G9ySLg7ARDmUg8jnC HnIauWq3+TgotwdMnTmYJeT95OSk3Yq/HYW7zY9TDRgAyojNsRJDukzv3/XQtaC0ghvS 4rpm5IzufPfznS8LZp8Fo7qZogXJtmJvSOp+wfNaudjNkKA02j3YG39Vv/7IONhF9jmF /bdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=olCWXhsgK8/6hX45bZR2xQ94VxQ1qtl8YYt+Nwq/Oec=; b=K6CugwlSIxRBOP5m00gZBRNobvdA91Pw9XmJjQw7LaUwkccCJK8AGJpcO8ufU0a+o6 Yd4/3bvT04bKxAQzFVISzKxiOwP1PYgkEDBXwbHzUrjb68dEyIz7t3pZ/ftPynM4HWrB pjHYn/SvYVbDR2EN7hm62TiLpCd15Z984cpCfDqW4uN1DRTOGlQFRx0kqiHkQ5y245Gx AfuK48VdxPdx53XhaZZchv4LyvRDqJo+R5n3lf+0164SKwI7RWbNvB9zOtouGjNCjGOl ak1E3YKB9D4AiP26AJLg3zzCkr3OBCUxkw+wZ498uVCDOjM3Q5xbYfAvirD0v9Vo5Ym6 SFNg== X-Gm-Message-State: ACgBeo05W8/QFkYjNJnyzF9atRowzM+4RpYBMWuWBr4ns5PtC7at3GNC PgKDdgr/r5sQFEykhQvihfjjdDNh0Fo= X-Google-Smtp-Source: AA6agR5gGSBOY81916XMd3FmHt4+aEH6SqlrsvOe0HAd7o/upqP9J3t3CIe7QL0TmfJIOx3GqhCdnw== X-Received: by 2002:a2e:84ca:0:b0:25d:77e0:2566 with SMTP id q10-20020a2e84ca000000b0025d77e02566mr7222136ljh.78.1661854488864; Tue, 30 Aug 2022 03:14:48 -0700 (PDT) Return-Path: Received: from PC10319.67 ([82.97.198.254]) by smtp.googlemail.com with ESMTPSA id u9-20020a05651c130900b0026008acb55asm1716755lja.113.2022.08.30.03.14.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 03:14:48 -0700 (PDT) From: "Konstantin Aladyshev" To: devel@edk2.groups.io Cc: bob.c.feng@intel.com, gaoliming@byosoft.com.cn, yuwei.chen@intel.com, Konstantin Aladyshev Subject: [PATCH 2/6] BaseTools/VolInfo: Correct buffer for GenCrc32 tool Date: Tue, 30 Aug 2022 13:14:41 +0300 Message-Id: <20220830101445.18110-2-aladyshev22@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220830101445.18110-1-aladyshev22@gmail.com> References: <20220830101445.18110-1-aladyshev22@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable If the guided section was encoded with GenCrc32 tool the resulting 'EFI_GUID_DEFINED_SECTION.DataOffset' field points to the start of the meaningfull data that follows the CRC32 value. But if we want to decode the section with GenCrc32 tool we need to provide a buffer that includes the CRC32 value itself. Signed-off-by: Konstantin Aladyshev --- BaseTools/Source/C/VolInfo/VolInfo.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/BaseTools/Source/C/VolInfo/VolInfo.c b/BaseTools/Source/C/VolI= nfo/VolInfo.c index b5760d185e..4628e756d7 100644 --- a/BaseTools/Source/C/VolInfo/VolInfo.c +++ b/BaseTools/Source/C/VolInfo/VolInfo.c @@ -2009,6 +2009,13 @@ Returns: );=0D free (ExtractionTool);=0D =0D + if (!CompareGuid (=0D + EfiGuid,=0D + &gEfiCrc32GuidedSectionExtractionProtocolGuid=0D + )=0D + ) {=0D + DataOffset -=3D 4;=0D + }=0D Status =3D=0D PutFileImage (=0D ToolInputFile,=0D --=20 2.25.1