From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63D0EC4338F for ; Mon, 2 Aug 2021 03:30:25 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5EB1760BD3 for ; Mon, 2 Aug 2021 03:30:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5EB1760BD3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CB2BD83327; Mon, 2 Aug 2021 05:30:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="YhSVXmga"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9C2FB8332A; Mon, 2 Aug 2021 05:30:20 +0200 (CEST) Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CE45383327 for ; Mon, 2 Aug 2021 05:30:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=takahiro.akashi@linaro.org Received: by mail-pj1-x1032.google.com with SMTP id mz5-20020a17090b3785b0290176ecf64922so29545927pjb.3 for ; Sun, 01 Aug 2021 20:30:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=R7JRHFSrmakrZRtAgBPFLS3E10GK/g1Sn0Q+Je2pb9E=; b=YhSVXmga2ezopFtZhwnOiIoo5GP+3Av7krBOjdqKV25FQy6n+WuTrtgOTi+TkwJ9Ux 0hbocOhCHL16lYTZd46OWzfYVEVORdvDeDu9S/M4MIEWh1hS9WUYB3R3LMFNUOTYhD3j i7uSghoHHJrw5iNUtAyebcs8svOBYiNwURDzIrviQsT/bMeUGsQc2dDHhSohQPyRPwIa 2678jKvxXJGKkb8N4tovQ/0AugJsFoLgcohfqIV7gJAKHH7uWW+dBU34nm38mjULRv9R 2HM8jD8kGF4n6Ri1DH/SQ6OE3z+sD9gAFUdeyUf7+IM2ORJ1oiDmmAaABCqmQlVFg8c+ 1t8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=R7JRHFSrmakrZRtAgBPFLS3E10GK/g1Sn0Q+Je2pb9E=; b=cfUlNVIsKFIqhvYxyJNoRpeOf0RVGtnnYCSlwT+dK82yfdEqM5lpzA+TlLqJNLigKv 3tbENolgkwhPrFSgf0eaSzzksoautNnu9cB2IgbHMw7a1jSS6+Uc16r4rKaCJ4bJSKQV Bke8avDng879rNDN0ea/OyrCl8/bGricBJDlq7HOuq1pWNWeSs7Glx0JZQMXEhOdRkET RWVY97jAXYEr/i3sjgbi5TF+F+zNRu1uzoY/jkpKs7NfeeWn2A1n/83LrEzFNZh31gSp D1RLKNXmDCNq0gypZiJCYT98vtD+vQF6TFpS2v8Tv80XD0sa6FovDBsUu1NxQq5xLPtn 4PZA== X-Gm-Message-State: AOAM530PTSZ8CxAKkBYGC53M64FNzDbDNmr7UHLFo/EHqaDx4ZcNqIHl IB/GFPF6sobarekgd/dCaxr/8A== X-Google-Smtp-Source: ABdhPJzMKqgSDAoduxD0KBumhH+RD7Df7eKGjM/YQM6UujjiG3eRvOxnX/9UV/Q847Gs/arY1CS/rw== X-Received: by 2002:a17:90a:6a41:: with SMTP id d1mr15383852pjm.67.1627875013595; Sun, 01 Aug 2021 20:30:13 -0700 (PDT) Received: from laputa (pdb6272b1.tkyea130.ap.so-net.ne.jp. [219.98.114.177]) by smtp.gmail.com with ESMTPSA id f4sm11255964pgs.3.2021.08.01.20.30.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Aug 2021 20:30:13 -0700 (PDT) Date: Mon, 2 Aug 2021 12:30:04 +0900 From: AKASHI Takahiro To: Heinrich Schuchardt Cc: agraf@csgraf.de, trini@konsulko.com, sjg@chromium.org, ilias.apalodimas@linaro.org, sughosh.ganu@linaro.org, masami.hiramatsu@linaro.org, u-boot@lists.denx.de Subject: Re: [PATCH v2 1/9] tools: mkeficapsule: add firmwware image signing Message-ID: <20210802033004.GB7965@laputa> Mail-Followup-To: AKASHI Takahiro , Heinrich Schuchardt , agraf@csgraf.de, trini@konsulko.com, sjg@chromium.org, ilias.apalodimas@linaro.org, sughosh.ganu@linaro.org, masami.hiramatsu@linaro.org, u-boot@lists.denx.de References: <20210727091054.512050-1-takahiro.akashi@linaro.org> <20210727091054.512050-2-takahiro.akashi@linaro.org> <73efc93a-0626-8b12-4eb3-bd9d0b54ac8b@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <73efc93a-0626-8b12-4eb3-bd9d0b54ac8b@gmx.de> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Heinrich, On Sun, Aug 01, 2021 at 11:21:55AM +0200, Heinrich Schuchardt wrote: > On 7/27/21 11:10 AM, AKASHI Takahiro wrote: > > With this enhancement, mkeficapsule will be able to sign a capsule > > file when it is created. A signature added will be used later > > in the verification at FMP's SetImage() call. > > > > To do that, We need specify additional command parameters: > > -monotonic-cout : monotonic count > > -private-key : private key file > > -certificate : certificate file > > Only when all of those parameters are given, a signature will be added > > to a capsule file. > > > > Users are expected to maintain and increment the monotonic count at > > every time of the update for each firmware image. > > > > Signed-off-by: AKASHI Takahiro > > --- > > tools/Kconfig | 7 + > > tools/Makefile | 8 +- > > tools/mkeficapsule.c | 332 +++++++++++++++++++++++++++++++++++++++---- > > 3 files changed, 316 insertions(+), 31 deletions(-) > > > > diff --git a/tools/Kconfig b/tools/Kconfig > > index d6f82cd949b5..9a37ed035311 100644 > > --- a/tools/Kconfig > > +++ b/tools/Kconfig > > @@ -20,4 +20,11 @@ config TOOLS_LIBCRYPTO > > This selection does not affect target features, such as runtime FIT > > signature verification. > > > > +config TOOLS_MKEFICAPSULE > > + bool "Build efimkcapsule command" > > + default y if EFI_CAPSULE_ON_DISK > > + help > > + This command allows users to create a UEFI capsule file and, > > + optionally sign that file. If you want to enable UEFI capsule > > + update feature on your target, you certainly need this. > > endmenu > > diff --git a/tools/Makefile b/tools/Makefile > > index bae3f95c4995..af8536489652 100644 > > --- a/tools/Makefile > > +++ b/tools/Makefile > > @@ -245,8 +245,12 @@ hostprogs-$(CONFIG_MIPS) += mips-relocs > > hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler > > HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include > > > > -mkeficapsule-objs := mkeficapsule.o $(LIBFDT_OBJS) > > -hostprogs-$(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) += mkeficapsule > > +HOSTLDLIBS_mkeficapsule += -luuid > > +ifeq ($(CONFIG_TOOLS_LIBCRYPTO),y) > > +HOSTLDLIBS_mkeficapsule += \ > > + $(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto") > > Please, add package pkg-config to the build dependencies enumerated in > doc/build/gcc.rst. Already there: libssl-dev > > +endif > > +hostprogs-$(CONFIG_TOOLS_MKEFICAPSULE) += mkeficapsule > > > > # We build some files with extra pedantic flags to try to minimize things > > # that won't build on some weird host compiler -- though there are lots of > > diff --git a/tools/mkeficapsule.c b/tools/mkeficapsule.c > > index 4995ba4e0c2a..798706c7b5f7 100644 > > --- a/tools/mkeficapsule.c > > +++ b/tools/mkeficapsule.c > > @@ -15,6 +15,16 @@ > > #include > > #include > > > > +#include > > +#ifdef CONFIG_TOOLS_LIBCRYPTO > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#endif > > + > > typedef __u8 u8; > > typedef __u16 u16; > > typedef __u32 u32; > > @@ -38,12 +48,25 @@ efi_guid_t efi_guid_image_type_uboot_fit = > > EFI_FIRMWARE_IMAGE_TYPE_UBOOT_FIT_GUID; > > efi_guid_t efi_guid_image_type_uboot_raw = > > EFI_FIRMWARE_IMAGE_TYPE_UBOOT_RAW_GUID; > > +efi_guid_t efi_guid_cert_type_pkcs7 = EFI_CERT_TYPE_PKCS7_GUID; > > + > > +#ifdef CONFIG_TOOLS_LIBCRYPTO > > +static const char *opts_short = "f:r:i:I:v:p:c:m:dh"; > > +#else > > +static const char *opts_short = "f:r:i:I:v:h"; > > +#endif > > > > static struct option options[] = { > > {"fit", required_argument, NULL, 'f'}, > > {"raw", required_argument, NULL, 'r'}, > > {"index", required_argument, NULL, 'i'}, > > {"instance", required_argument, NULL, 'I'}, > > +#ifdef CONFIG_TOOLS_LIBCRYPTO > > + {"private-key", required_argument, NULL, 'p'}, > > + {"certificate", required_argument, NULL, 'c'}, > > + {"monotonic-count", required_argument, NULL, 'm'}, > > + {"dump-sig", no_argument, NULL, 'd'}, > > +#endif > > {"help", no_argument, NULL, 'h'}, > > {NULL, 0, NULL, 0}, > > }; > > @@ -57,16 +80,195 @@ static void print_usage(void) > > "\t-r, --raw new raw image file\n" > > "\t-i, --index update image index\n" > > "\t-I, --instance update hardware instance\n" > > +#ifdef CONFIG_TOOLS_LIBCRYPTO > > + "\t-p, --private-key private key file\n" > > + "\t-c, --certificate signer's certificate file\n" > > + "\t-m, --monotonic-count monotonic count\n" > > + "\t-d, --dump_sig dump signature (*.p7)\n" > > +#endif > > "\t-h, --help print a help message\n", > > tool_name); > > } > > > > Please, add Sphinx documentation. I added the man page. Why need another different format of doc? I think that doc/develop/uefi/uefi.rst gives you an enough introduction to the command. (Although the doc will have to been updated due to the latest change of mkeficapsule syntax that I'm also proposing.) Actually, there is no sphinx doc for any host tools. > > +struct auth_context { > > + char *key_file; > > + char *cert_file; > > + u8 *image_data; > > + size_t image_size; > > + struct efi_firmware_image_authentication auth; > > + u8 *sig_data; > > + size_t sig_size; > > +}; > > + > > +static int dump_sig; > > + > > +#ifdef CONFIG_TOOLS_LIBCRYPTO > > +static EVP_PKEY *fileio_read_pkey(const char *filename) > > +{ > > + EVP_PKEY *key = NULL; > > + BIO *bio; > > + > > + bio = BIO_new_file(filename, "r"); > > + if (!bio) > > + goto out; > > + > > + key = PEM_read_bio_PrivateKey(bio, NULL, NULL, NULL); > > + > > +out: > > + BIO_free_all(bio); > > + if (!key) { > > + printf("Can't load key from file '%s'\n", filename); > > + ERR_print_errors_fp(stderr); > > + } > > + > > + return key; > > +} > > + > > Please, add Sphinx documentation for all functions. Yeah, but "all" is a too forcible requirement. There is no source code of host tools to meet the requirement. Actually, most don't have even one description of a function. I think that, if it is a really required element in the source, it should be explicitly described somewhere under "doc". > > +static X509 *fileio_read_cert(const char *filename) > > +{ > > + X509 *cert = NULL; > > + BIO *bio; > > + > > + bio = BIO_new_file(filename, "r"); > > + if (!bio) > > + goto out; > > + > > + cert = PEM_read_bio_X509(bio, NULL, NULL, NULL); > > + > > +out: > > + BIO_free_all(bio); > > + if (!cert) { > > + printf("Can't load certificate from file '%s'\n", filename); > > + ERR_print_errors_fp(stderr); > > + } > > + > > + return cert; > > +} > > + > > +static int create_auth_data(struct auth_context *ctx) > > +{ > > + EVP_PKEY *key = NULL; > > + X509 *cert = NULL; > > + BIO *data_bio = NULL; > > + const EVP_MD *md; > > + PKCS7 *p7; > > + int flags, ret = -1; > > + > > + OpenSSL_add_all_digests(); > > + OpenSSL_add_all_ciphers(); > > + ERR_load_crypto_strings(); > > + > > + key = fileio_read_pkey(ctx->key_file); > > + if (!key) > > + goto err; > > + cert = fileio_read_cert(ctx->cert_file); > > + if (!cert) > > + goto err; > > + > > + /* > > + * create a BIO, containing: > > + * * firmware image > > + * * monotonic count > > + * in this order! > > + * See EDK2's FmpAuthenticatedHandlerRsa2048Sha256() > > + */ > > + data_bio = BIO_new(BIO_s_mem()); > > + BIO_write(data_bio, ctx->image_data, ctx->image_size); > > + BIO_write(data_bio, &ctx->auth.monotonic_count, > > + sizeof(ctx->auth.monotonic_count)); > > + > > + md = EVP_get_digestbyname("SHA256"); > > + if (!md) > > + goto err; > > + > > + /* create signature */ > > + /* TODO: maybe add PKCS7_NOATTR and PKCS7_NOSMIMECAP */ > > + flags = PKCS7_BINARY | PKCS7_DETACHED; > > + p7 = PKCS7_sign(NULL, NULL, NULL, data_bio, flags | PKCS7_PARTIAL); > > + if (!p7) > > + goto err; > > + if (!PKCS7_sign_add_signer(p7, cert, key, md, flags)) > > + goto err; > > + if (!PKCS7_final(p7, data_bio, flags)) > > + goto err; > > + > > + /* convert pkcs7 into DER */ > > + ctx->sig_data = NULL; > > + ctx->sig_size = ASN1_item_i2d((ASN1_VALUE *)p7, &ctx->sig_data, > > + ASN1_ITEM_rptr(PKCS7)); > > + if (!ctx->sig_size) > > + goto err; > > + > > + /* fill auth_info */ > > + ctx->auth.auth_info.hdr.dwLength = sizeof(ctx->auth.auth_info) > > + + ctx->sig_size; > > + ctx->auth.auth_info.hdr.wRevision = WIN_CERT_REVISION_2_0; > > + ctx->auth.auth_info.hdr.wCertificateType = WIN_CERT_TYPE_EFI_GUID; > > + memcpy(&ctx->auth.auth_info.cert_type, &efi_guid_cert_type_pkcs7, > > + sizeof(efi_guid_cert_type_pkcs7)); > > + > > + ret = 0; > > +err: > > + BIO_free_all(data_bio); > > + EVP_PKEY_free(key); > > + X509_free(cert); > > + > > + return ret; > > +} > > + > > +static int dump_signature(const char *path, u8 *signature, size_t sig_size) > > +{ > > + char *sig_path; > > + FILE *f; > > + size_t size; > > + int ret = -1; > > + > > + sig_path = malloc(strlen(path) + 3 + 1); > > + if (!sig_path) > > + return ret; > > + > > + sprintf(sig_path, "%s.p7", path); > > + f = fopen(sig_path, "w"); > > + if (!f) > > + goto err; > > + > > + size = fwrite(signature, 1, sig_size, f); > > + if (size == sig_size) > > + ret = 0; > > + > > + fclose(f); > > +err: > > + free(sig_path); > > + return ret; > > +} > > + > > +static void free_sig_data(struct auth_context *ctx) > > +{ > > + if (ctx->sig_size) > > + OPENSSL_free(ctx->sig_data); > > +} > > +#else > > +static int create_auth_data(struct auth_context *ctx) > > +{ > > + return 0; > > +} > > + > > +static int dump_signature(const char *path, u8 *signature, size_t sig_size) > > +{ > > + return 0; > > +} > > + > > +static void free_sig_data(struct auth_context *ctx) {} > > +#endif > > + > > static int create_fwbin(char *path, char *bin, efi_guid_t *guid, > > - unsigned long index, unsigned long instance) > > + unsigned long index, unsigned long instance, > > + uint64_t mcount, char *privkey_file, char *cert_file) > > { > > struct efi_capsule_header header; > > struct efi_firmware_management_capsule_header capsule; > > struct efi_firmware_management_capsule_image_header image; > > + struct auth_context auth_context; > > FILE *f, *g; > > struct stat bin_stat; > > u8 *data; > > @@ -78,6 +280,7 @@ static int create_fwbin(char *path, char *bin, efi_guid_t *guid, > > printf("\tbin: %s\n\ttype: %pUl\n", bin, guid); > > printf("\tindex: %ld\n\tinstance: %ld\n", index, instance); > > [tools/mkeficapsule.c:281] (warning) %ld in format string (no. 1) > requires 'long' but the argument type is 'unsigned long'. Will fix it. -Takahiro Akashi > Best regards > > Heinrich > > > #endif > > + auth_context.sig_size = 0; > > > > g = fopen(bin, "r"); > > if (!g) { > > @@ -93,11 +296,34 @@ static int create_fwbin(char *path, char *bin, efi_guid_t *guid, > > printf("cannot allocate memory: %zx\n", (size_t)bin_stat.st_size); > > goto err_1; > > } > > - f = fopen(path, "w"); > > - if (!f) { > > - printf("cannot open %s\n", path); > > + > > + size = fread(data, 1, bin_stat.st_size, g); > > + if (size < bin_stat.st_size) { > > + printf("read failed (%zx)\n", size); > > goto err_2; > > } > > + > > + /* first, calculate signature to determine its size */ > > + if (privkey_file && cert_file) { > > + auth_context.key_file = privkey_file; > > + auth_context.cert_file = cert_file; > > + auth_context.auth.monotonic_count = mcount; > > + auth_context.image_data = data; > > + auth_context.image_size = bin_stat.st_size; > > + > > + if (create_auth_data(&auth_context)) { > > + printf("Signing firmware image failed\n"); > > + goto err_3; > > + } > > + > > + if (dump_sig && > > + dump_signature(path, auth_context.sig_data, > > + auth_context.sig_size)) { > > + printf("Creating signature file failed\n"); > > + goto err_3; > > + } > > + } > > + > > header.capsule_guid = efi_guid_fm_capsule; > > header.header_size = sizeof(header); > > /* TODO: The current implementation ignores flags */ > > @@ -106,11 +332,20 @@ static int create_fwbin(char *path, char *bin, efi_guid_t *guid, > > + sizeof(capsule) + sizeof(u64) > > + sizeof(image) > > + bin_stat.st_size; > > + if (auth_context.sig_size) > > + header.capsule_image_size += sizeof(auth_context.auth) > > + + auth_context.sig_size; > > + > > + f = fopen(path, "w"); > > + if (!f) { > > + printf("cannot open %s\n", path); > > + goto err_3; > > + } > > > > size = fwrite(&header, 1, sizeof(header), f); > > if (size < sizeof(header)) { > > printf("write failed (%zx)\n", size); > > - goto err_3; > > + goto err_4; > > } > > > > capsule.version = 0x00000001; > > @@ -119,13 +354,13 @@ static int create_fwbin(char *path, char *bin, efi_guid_t *guid, > > size = fwrite(&capsule, 1, sizeof(capsule), f); > > if (size < (sizeof(capsule))) { > > printf("write failed (%zx)\n", size); > > - goto err_3; > > + goto err_4; > > } > > offset = sizeof(capsule) + sizeof(u64); > > size = fwrite(&offset, 1, sizeof(offset), f); > > if (size < sizeof(offset)) { > > printf("write failed (%zx)\n", size); > > - goto err_3; > > + goto err_4; > > } > > > > image.version = 0x00000003; > > @@ -135,34 +370,53 @@ static int create_fwbin(char *path, char *bin, efi_guid_t *guid, > > image.reserved[1] = 0; > > image.reserved[2] = 0; > > image.update_image_size = bin_stat.st_size; > > + if (auth_context.sig_size) > > + image.update_image_size += sizeof(auth_context.auth) > > + + auth_context.sig_size; > > image.update_vendor_code_size = 0; /* none */ > > image.update_hardware_instance = instance; > > image.image_capsule_support = 0; > > + if (auth_context.sig_size) > > + image.image_capsule_support |= CAPSULE_SUPPORT_AUTHENTICATION; > > > > size = fwrite(&image, 1, sizeof(image), f); > > if (size < sizeof(image)) { > > printf("write failed (%zx)\n", size); > > - goto err_3; > > + goto err_4; > > } > > - size = fread(data, 1, bin_stat.st_size, g); > > - if (size < bin_stat.st_size) { > > - printf("read failed (%zx)\n", size); > > - goto err_3; > > + > > + if (auth_context.sig_size) { > > + size = fwrite(&auth_context.auth, 1, > > + sizeof(auth_context.auth), f); > > + if (size < sizeof(auth_context.auth)) { > > + printf("write failed (%zx)\n", size); > > + goto err_4; > > + } > > + size = fwrite(auth_context.sig_data, 1, > > + auth_context.sig_size, f); > > + if (size < auth_context.sig_size) { > > + printf("write failed (%zx)\n", size); > > + goto err_4; > > + } > > } > > + > > size = fwrite(data, 1, bin_stat.st_size, f); > > if (size < bin_stat.st_size) { > > printf("write failed (%zx)\n", size); > > - goto err_3; > > + goto err_4; > > } > > > > fclose(f); > > fclose(g); > > free(data); > > + free_sig_data(&auth_context); > > > > return 0; > > > > -err_3: > > +err_4: > > fclose(f); > > +err_3: > > + free_sig_data(&auth_context); > > err_2: > > free(data); > > err_1: > > @@ -171,23 +425,25 @@ err_1: > > return -1; > > } > > > > -/* > > - * Usage: > > - * $ mkeficapsule -f > > - */ > > int main(int argc, char **argv) > > { > > char *file; > > efi_guid_t *guid; > > unsigned long index, instance; > > + uint64_t mcount; > > + char *privkey_file, *cert_file; > > int c, idx; > > > > file = NULL; > > guid = NULL; > > index = 0; > > instance = 0; > > + mcount = 0; > > + privkey_file = NULL; > > + cert_file = NULL; > > + dump_sig = 0; > > for (;;) { > > - c = getopt_long(argc, argv, "f:r:i:I:v:h", options, &idx); > > + c = getopt_long(argc, argv, opts_short, options, &idx); > > if (c == -1) > > break; > > > > @@ -214,26 +470,44 @@ int main(int argc, char **argv) > > case 'I': > > instance = strtoul(optarg, NULL, 0); > > break; > > +#ifdef CONFIG_TOOLS_LIBCRYPTO > > + case 'p': > > + if (privkey_file) { > > + printf("Private Key already specified\n"); > > + return -1; > > + } > > + privkey_file = optarg; > > + break; > > + case 'c': > > + if (cert_file) { > > + printf("Certificate file already specified\n"); > > + return -1; > > + } > > + cert_file = optarg; > > + break; > > + case 'm': > > + mcount = strtoul(optarg, NULL, 0); > > + break; > > + case 'd': > > + dump_sig = 1; > > + break; > > +#endif /* CONFIG_TOOLS_LIBCRYPTO */ > > case 'h': > > print_usage(); > > return 0; > > } > > } > > > > - /* need an output file */ > > - if (argc != optind + 1) { > > + /* check necessary parameters */ > > + if ((argc != optind + 1) || !file || > > + ((privkey_file && !cert_file) || > > + (!privkey_file && cert_file))) { > > print_usage(); > > exit(EXIT_FAILURE); > > } > > > > - /* need a fit image file or raw image file */ > > - if (!file) { > > - print_usage(); > > - exit(EXIT_SUCCESS); > > - } > > - > > - if (create_fwbin(argv[optind], file, guid, index, instance) > > - < 0) { > > + if (create_fwbin(argv[optind], file, guid, index, instance, > > + mcount, privkey_file, cert_file) < 0) { > > printf("Creating firmware capsule failed\n"); > > exit(EXIT_FAILURE); > > } > > >