From patchwork Tue Nov 26 00:51:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 1200685 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="hNMXRM2g"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 47MQMk1sV1z9s3Z for ; Tue, 26 Nov 2019 11:51:46 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E9F36C21E15; Tue, 26 Nov 2019 00:50:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id AC035C21EA7; Tue, 26 Nov 2019 00:50:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7D3C8C21E50; Tue, 26 Nov 2019 00:50:40 +0000 (UTC) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by lists.denx.de (Postfix) with ESMTPS id 13EA0C21E02 for ; Tue, 26 Nov 2019 00:50:34 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id b137so5769368pga.6 for ; Mon, 25 Nov 2019 16:50:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AH2/VKPxEvroFLCdgqcfrSy3aC6UP3CQ/cPkgUbwMe8=; b=hNMXRM2gH3q2RjaWHYHlD6fVrLK8rBQYvjr90n9tAD5LEeqVhiGuSrJ+Dld7Xy6r7w G2A5R1D529w2Awi7GferIGikRIucD3xOr1izveVXBhr2YHS3GACC7BVoiVIdz/hQ1N4O E2f+U/bltgfym8AxKyyg9hIQWVOKsHJioSNlbs+i2Y3Puk05RulRCyzzlhhydQCl8bLc IDhCqUzLqGy8iheDmT4PCdy0yeTbBHcaTuIEFR7eDMeJIua8EOvjQ32+iIm7Jh2jXeo0 onbONguNmY2gQi7LNaSt2BxSSfSOSP2UCK3cBb9w8Q4SPA2+CjWsLhS63y/CX2PjSFU+ v+CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AH2/VKPxEvroFLCdgqcfrSy3aC6UP3CQ/cPkgUbwMe8=; b=owbQLGieq2zj60+LFiI+Kmu+EHi2jnowtT5h1kPXuviSyHRkLCuIWW9XlPdvovJsP6 1ofEgX7U3xy0ulWxEAVONPy40ySPcLKqQSntNvPVvBO0cg1jHjSIVQ1Wisgq45oytLeN JpRvkYjr1yOn4Fxy8jR8mw/YodC8Cmlt8YRTu2psMyNywW2kaTr1iemFhWuSq7AbCHBM 2sToHIGj2TibguHXy3jpib1qArSjurEg1AfD6IVEks+S7Aox4SACAzcbnA4/t3nAA2yT A49sn0RzDnXOeDxJIwwwS3sBnll+3cokxhA7zrAM37ur0/egDSRmbFZstynLDOvfd41t A7FA== X-Gm-Message-State: APjAAAXdAcjE5zmCeZjDKYgzg2W4RhHfx3YjIdri+N4L+Z3tTnTK0NAK FuuA8mqdoLNh/Zc79WdUGwkYJg== X-Google-Smtp-Source: APXvYqyfK0dzyemCeKaD6W65NmXbbWm1zmd/Ow3teK4S6S4M1fC49hvoAUzE/BuvWy8Pjmfv1OGPbg== X-Received: by 2002:a62:7543:: with SMTP id q64mr16123950pfc.144.1574729432346; Mon, 25 Nov 2019 16:50:32 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id o20sm10028134pfp.16.2019.11.25.16.50.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Nov 2019 16:50:31 -0800 (PST) From: AKASHI Takahiro To: xypron.glpk@gmx.de, agraf@csgraf.de, trini@konsulko.com Date: Tue, 26 Nov 2019 09:51:05 +0900 Message-Id: <20191126005120.31156-2-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191126005120.31156-1-takahiro.akashi@linaro.org> References: <20191126005120.31156-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de, mail@patrick-wildt.de Subject: [U-Boot] [PATCH v2 01/16] include: pe.h: add signature-related definitions X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The index (IMAGE_DIRECTORY_ENTRY_SECURITY) in a table points to a region containing authentication information (image's signature) in PE format. WIN_CERTIFICATE structure defines an embedded signature format. Those definitions will be used in my UEFI secure boot patch. Signed-off-by: AKASHI Takahiro Reviewed-by: Heinrich Schuchardt --- include/pe.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/pe.h b/include/pe.h index bff3b0aa7a6c..086f2b860e99 100644 --- a/include/pe.h +++ b/include/pe.h @@ -155,6 +155,8 @@ typedef struct _IMAGE_SECTION_HEADER { uint32_t Characteristics; } IMAGE_SECTION_HEADER, *PIMAGE_SECTION_HEADER; +/* Indices for Optional Header Data Directories */ +#define IMAGE_DIRECTORY_ENTRY_SECURITY 4 #define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 typedef struct _IMAGE_BASE_RELOCATION @@ -252,4 +254,20 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_AMD64_PAIR 0x000F #define IMAGE_REL_AMD64_SSPAN32 0x0010 +/* certificate appended to PE image */ +typedef struct _WIN_CERTIFICATE { + uint32_t dwLength; + uint16_t wRevision; + uint16_t wCertificateType; + uint8_t bCertificate[]; +} WIN_CERTIFICATE, *LPWIN_CERTIFICATE; + +/* Definitions for the contents of the certs data block */ +#define WIN_CERT_TYPE_PKCS_SIGNED_DATA 0x0002 +#define WIN_CERT_TYPE_EFI_OKCS115 0x0EF0 +#define WIN_CERT_TYPE_EFI_GUID 0x0EF1 + +#define WIN_CERT_REVISION_1_0 0x0100 +#define WIN_CERT_REVISION_2_0 0x0200 + #endif /* _PE_H */