Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jeVLU-0007b0-IC for mharc-grub-devel@gnu.org; Thu, 28 May 2020 23:06:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeVLT-0007Zv-DK for grub-devel@gnu.org; Thu, 28 May 2020 23:06:07 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:43174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jeVLS-00088P-6h for grub-devel@gnu.org; Thu, 28 May 2020 23:06:07 -0400 Received: by mail-pf1-x443.google.com with SMTP id g5so496299pfm.10 for ; Thu, 28 May 2020 20:06:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0cxt9mnZkFL+73wmwA1x1aDnC6o8vsvun0xcWiT+K+Y=; b=hDsaYzhGPFw3pMPtpwZU7uQH0sVzwwcwc/1EBGOSgO4AD+sMS1DejdEVV30n9F1LYy 6BPH5nvzoKwzEbnL9iAsvRnXAZ90RE7akZMVgIksKpL3gfetf6DeOrL0mzkqiFyqaCaL Ml5MYdYxKGq2hb6ZQtY01iD8RxgDcdbVZMmbU= 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:mime-version :content-transfer-encoding; bh=0cxt9mnZkFL+73wmwA1x1aDnC6o8vsvun0xcWiT+K+Y=; b=kZCFSqdheElqURXrOlQERdv53r+0J9jnHBvV9zXWuO8GJW94E3aAnVi6hD3P7VTdEb Gm19MtWopJY87KZA4CopSKkTljV6h+G/xgy15d9xBOJIF5WByk3uovwnn2OL3vZN0H4D itaZ/7PDDBat5nFOYaeksfyZj5YkU9JCQBExPzm7neoSrm49Ol2g95dhDRk3/JrknBCC qlLHdM4Lgvu2Ot6A8xCO+EDB2MTh/yFUVo2tV0U0zH3GKSX6Lubk0R55D+R80YixJJgF D51CMfPPqFe3pDl8VL4KN31q9i4JEAu5lmo7KwZUV0NniConAHFkDX6iX+HDqcDqntHv l/dg== X-Gm-Message-State: AOAM532oajFhKyn4i6XgKiVRIGLNMoQ7n/y/l4GQNokwf6c1jld+YMg0 qA6ZWaSaP9ionarkL1NwxRealDIBCeH/tg== X-Google-Smtp-Source: ABdhPJxYVHgYLYVbYr8wXgyIV+pX2jo0pGPd0kPlGwqHo+4ozrbe/+IXuWFsNNvqnSED2Xl3WA1j7w== X-Received: by 2002:a63:5360:: with SMTP id t32mr6113857pgl.352.1590721564095; Thu, 28 May 2020 20:06:04 -0700 (PDT) Received: from localhost (2001-44b8-111e-5c00-55e9-59ce-4be0-c805.static.ipv6.internode.on.net. [2001:44b8:111e:5c00:55e9:59ce:4be0:c805]) by smtp.gmail.com with ESMTPSA id x21sm2800510pff.6.2020.05.28.20.06.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 May 2020 20:06:03 -0700 (PDT) From: Daniel Axtens To: grub-devel@gnu.org, charles@dyfis.net Cc: Daniel Axtens , Ignat Korchagin Subject: [PATCH REBASED] verify: search keyid in hashed signature subpackets Date: Fri, 29 May 2020 13:05:58 +1000 Message-Id: <20200529030558.29851-1-dja@axtens.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::443; envelope-from=dja@axtens.net; helo=mail-pf1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2020 03:06:07 -0000 Currently GRUB2 verify logic searches PGP keyid only in unhashed subpackets of PGP signature packet. As a result, signatures generated with GoLang openpgp package (https://godoc.org/golang.org/x/crypto/openpgp) could not be verified, because this package puts keyid in hashed subpackets and GRUB code never initializes the keyid variable, therefore is not able to find "verification key" with id 0x0. (Add further description per thread at https://lists.gnu.org/archive/html/grub-devel/2016-11/msg00073.html) Signed-off-by: Ignat Korchagin [ modified by Charles Duffy , needs his Signed-off-by before merging ] [ modified by dja: rebase, split out 'readbuf' to both readbuf and subpacket_buf for clarity signature_test still passes but I have not run any other tests ] [ Under DCO rules I cannot provied a signed-off-by until Charles certifies his work can be redistributed ] --- grub-core/commands/pgp.c | 117 ++++++++++++++++++++++++++------------- 1 file changed, 77 insertions(+), 40 deletions(-) diff --git a/grub-core/commands/pgp.c b/grub-core/commands/pgp.c index bbf6871fe71f..ad91f462bb91 100644 --- a/grub-core/commands/pgp.c +++ b/grub-core/commands/pgp.c @@ -448,6 +448,38 @@ struct grub_pubkey_context void *hash_context; }; +static grub_uint64_t +grub_subpacket_keyid_search (const grub_uint8_t * sub, grub_ssize_t sub_len) +{ + const grub_uint8_t *ptr; + grub_uint32_t l; + grub_uint64_t keyid = 0; + + for (ptr = sub; ptr < sub + sub_len; ptr += l) + { + if (*ptr < 192) + l = *ptr++; + else if (*ptr < 255) + { + if (ptr + 1 >= sub + sub_len) + break; + l = (((ptr[0] & ~192) << GRUB_CHAR_BIT) | ptr[1]) + 192; + ptr += 2; + } + else + { + if (ptr + 5 >= sub + sub_len) + break; + l = grub_be_to_cpu32 (grub_get_unaligned32 (ptr + 1)); + ptr += 5; + } + if (*ptr == 0x10 && l >= 8) + keyid = grub_get_unaligned64 (ptr + 1); + } + + return keyid; +} + static grub_err_t grub_verify_signature_init (struct grub_pubkey_context *ctxt, grub_file_t sig) { @@ -520,7 +552,7 @@ grub_verify_signature_real (struct grub_pubkey_context *ctxt, gcry_mpi_t mpis[10]; grub_uint8_t pk = ctxt->v4.pkeyalgo; grub_size_t i; - grub_uint8_t *readbuf = NULL; + grub_uint8_t *readbuf = NULL, *subpacket_buf = NULL; unsigned char *hval; grub_ssize_t rem = grub_be_to_cpu16 (ctxt->v4.hashed_sub); grub_uint32_t headlen = grub_cpu_to_be32 (rem + 6); @@ -538,17 +570,29 @@ grub_verify_signature_real (struct grub_pubkey_context *ctxt, ctxt->hash->write (ctxt->hash_context, &ctxt->v, sizeof (ctxt->v)); ctxt->hash->write (ctxt->hash_context, &ctxt->v4, sizeof (ctxt->v4)); - while (rem) + + subpacket_buf = grub_malloc (rem); + if (!subpacket_buf) + goto fail; + + r = 0; + while (r < rem) { - r = grub_file_read (ctxt->sig, readbuf, - rem < READBUF_SIZE ? rem : READBUF_SIZE); - if (r < 0) - goto fail; - if (r == 0) + grub_ssize_t rr = grub_file_read (ctxt->sig, subpacket_buf + r, rem - r); + if (rr < 0) + goto fail; + if (rr == 0) break; - ctxt->hash->write (ctxt->hash_context, readbuf, r); - rem -= r; + r += rr; } + if (r != rem) + goto fail; + ctxt->hash->write (ctxt->hash_context, subpacket_buf, rem); + + keyid = grub_subpacket_keyid_search (subpacket_buf, rem); + grub_free (subpacket_buf); + subpacket_buf = NULL; + ctxt->hash->write (ctxt->hash_context, &ctxt->v, sizeof (ctxt->v)); s = 0xff; ctxt->hash->write (ctxt->hash_context, &s, sizeof (s)); @@ -556,37 +600,27 @@ grub_verify_signature_real (struct grub_pubkey_context *ctxt, r = grub_file_read (ctxt->sig, &unhashed_sub, sizeof (unhashed_sub)); if (r != sizeof (unhashed_sub)) goto fail; - { - grub_uint8_t *ptr; - grub_uint32_t l; - rem = grub_be_to_cpu16 (unhashed_sub); - if (rem > READBUF_SIZE) - goto fail; - r = grub_file_read (ctxt->sig, readbuf, rem); - if (r != rem) - goto fail; - for (ptr = readbuf; ptr < readbuf + rem; ptr += l) - { - if (*ptr < 192) - l = *ptr++; - else if (*ptr < 255) - { - if (ptr + 1 >= readbuf + rem) - break; - l = (((ptr[0] & ~192) << GRUB_CHAR_BIT) | ptr[1]) + 192; - ptr += 2; - } - else - { - if (ptr + 5 >= readbuf + rem) - break; - l = grub_be_to_cpu32 (grub_get_unaligned32 (ptr + 1)); - ptr += 5; - } - if (*ptr == 0x10 && l >= 8) - keyid = grub_get_unaligned64 (ptr + 1); - } - } + + rem = grub_be_to_cpu16 (unhashed_sub); + subpacket_buf = grub_malloc (rem); + if (!subpacket_buf) + goto fail; + + r = 0; + while (r < rem) + { + grub_ssize_t rr = grub_file_read (ctxt->sig, subpacket_buf + r, rem - r); + if (rr < 0) + goto fail; + if (rr == 0) + break; + r += rr; + } + if (r != rem) + goto fail; + + if (keyid == 0) + keyid = grub_subpacket_keyid_search (subpacket_buf, rem); ctxt->hash->final (ctxt->hash_context); @@ -656,10 +690,13 @@ grub_verify_signature_real (struct grub_pubkey_context *ctxt, goto fail; grub_free (readbuf); + grub_free (subpacket_buf); return GRUB_ERR_NONE; fail: + if (subpacket_buf) + grub_free (subpacket_buf); grub_free (readbuf); if (!grub_errno) return grub_error (GRUB_ERR_BAD_SIGNATURE, N_("bad signature")); -- 2.20.1