Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jeWMB-0003Y3-4p for mharc-grub-devel@gnu.org; Fri, 29 May 2020 00:10:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeWM9-0003Xw-Lw for grub-devel@gnu.org; Fri, 29 May 2020 00:10:53 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:45443) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jeWM8-0000mK-Al for grub-devel@gnu.org; Fri, 29 May 2020 00:10:53 -0400 Received: by mail-pf1-x442.google.com with SMTP id z26so583759pfk.12 for ; Thu, 28 May 2020 21:10:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=PnM2mhbmLU6e0ZhvSk9+dWsLH+XZ/vvNITrckEZMrD0=; b=RL5Jl7HOWmASVd/HXy3HHSZC1uUcoUkCTkyLWqMdqC0ccn8/z1FrAS+bFnKvYbdhqk Fy7ZePpvvJV/QeD0OrPVEsjtMXX/Y0qVp+gE9wdz3AkNBsZexbCqhjSwait9M/GKvKm8 wR085WOYzZmM3qgFK66FW7yxImwuT1ixwRpK0= 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:in-reply-to:references:date :message-id:mime-version; bh=PnM2mhbmLU6e0ZhvSk9+dWsLH+XZ/vvNITrckEZMrD0=; b=jcn9H752Es/U2K9Oosb1aUtAAGbECAdP2OMJNG/bkpe3H3kYPDnSxo0aIvj3LnGaGS wQHgg10gTTVZg7LHFJ7sc7vfxt2PZFe4PUrohjt4sBeWlU+/+E/OIY8GPToFkdO0iB0D XQno0krjAV1hcdPXw4u2JRmnWBFyLumW6oDzYfeDcXLqVvAAW3QoUiCmI9Kep20Q9DsL Jx8+sA/xwhLMqzNeBeOzmBMpyzp9yt2fQAeAWIg3fwTcFWQnaA69Bbma0tr/zyFX6X32 VtL8TPIspnpT1zeeVq17iver7W2thyj3z+J+DxNvIjzlNKhC5NeIMkdX9dGyV96dN/AY W7Xg== X-Gm-Message-State: AOAM531p0BET2dDfABQkt/d9hZXQKkv2jUaH8sxIasKUDn4fr8WD6VTu GoqWMxDEnieU9QM+1tztghoFHg== X-Google-Smtp-Source: ABdhPJwaswuvYNvaGHLuyFQaGx+513n4m8tpGGoUJfm/1LaDoy79duOj5yztVj2DvQ6NoH5QSzGZ2A== X-Received: by 2002:a63:e54d:: with SMTP id z13mr4408005pgj.78.1590725450538; Thu, 28 May 2020 21:10:50 -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 w65sm5911412pfb.160.2020.05.28.21.10.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 May 2020 21:10:49 -0700 (PDT) From: Daniel Axtens To: Charles Duffy Cc: grub-devel@gnu.org, Ignat Korchagin Subject: Re: [PATCH REBASED] verify: search keyid in hashed signature subpackets In-Reply-To: References: <20200529030558.29851-1-dja@axtens.net> Date: Fri, 29 May 2020 14:10:46 +1000 Message-ID: <875zcf1iux.fsf@dja-thinkpad.axtens.net> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::442; envelope-from=dja@axtens.net; helo=mail-pf1-x442.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 04:10:53 -0000 Charles Duffy writes: > Amended the test repo to apply this patch; it applies and works-as-intended > on both 2.04 and current master. > > As for the DCO assertions, my portion of the contribution was implemented > strictly on personal time/equipment, so I'm able to to make the relevant > assertions in my individual capacity; amended below thusly. Awesome, me too. >> (Add further description per thread at >> https://lists.gnu.org/archive/html/grub-devel/2016-11/msg00073.html) I will leave doing further revisions to you - looking through the thread from 2016 it looks like the commit message needs more details and maybe some variable names and constants need to be cleaned up etc. Now that we have all the relevant Signed-off-bys, that should all be just a matter of programming. My understanding is that you should maintain all three S-O-Bs in the commit message for future spins, but I've never been clear on what order they should be in if you make further revisions. >> >> Signed-off-by: Ignat Korchagin >> > Signed-off-by: Charles Duffy > [ modified by Charles Duffy: rebase from pre-2.02 release to 2.02 final ] > >> [ 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 ] Signed-off-by: Daniel Axtens >> --- >> 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 >> >>