From patchwork Fri Jul 16 15:15:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Chikunov X-Patchwork-Id: 12382423 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=-11.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 A7491C07E95 for ; Fri, 16 Jul 2021 15:16:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D8FE61357 for ; Fri, 16 Jul 2021 15:16:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240251AbhGPPTE (ORCPT ); Fri, 16 Jul 2021 11:19:04 -0400 Received: from vmicros1.altlinux.org ([194.107.17.57]:57192 "EHLO vmicros1.altlinux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237326AbhGPPTE (ORCPT ); Fri, 16 Jul 2021 11:19:04 -0400 Received: from imap.altlinux.org (imap.altlinux.org [194.107.17.38]) by vmicros1.altlinux.org (Postfix) with ESMTP id 7684E72C8B4; Fri, 16 Jul 2021 18:16:08 +0300 (MSK) Received: from beacon.altlinux.org (unknown [193.43.10.9]) by imap.altlinux.org (Postfix) with ESMTPSA id 5AFD04A46E9; Fri, 16 Jul 2021 18:16:08 +0300 (MSK) From: Vitaly Chikunov To: Mimi Zohar , Dmitry Kasatkin , linux-integrity@vger.kernel.org Subject: [PATCH ima-evm-utils v9 0/3] ima-evm-utils: Add --keyid option Date: Fri, 16 Jul 2021 18:15:59 +0300 Message-Id: <20210716151602.3575106-1-vt@altlinux.org> X-Mailer: git-send-email 2.29.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org Allow user to set signature's keyid using `--keyid' option. Keyid should correspond to SKID in certificate. When keyid is calculated using SHA-1 in libimaevm it may mismatch keyid extracted by the kernel from SKID of certificate (the way public key is presented to the kernel), thus making signatures not verifiable. This may happen when certificate is using non SHA-1 SKID (see rfc7093) or just 'unique number' (see rfc5280 4.2.1.2). As a last resort user may specify arbitrary keyid using the new option. Certificate filename could be used instead of the hex number with `--keyid-from-cert' option. And, third option is to read keyid from the cert appended to the key file. These commits create backward incompatible ABI change for libimaevm, thus soname should be incremented on release. Changes from v8: - Regenerate test's keys & openssl conf on gen-keys.sh update. - Fix noprefix git setting that was broken in v8. Changes from v7: - Multiple functions are merged back into read_keyid_from_cert(). - OpenSSL portable way of reading of SKID. - Fixed 'unaligned pointer' access bug (introduced in v7). - Fixed incorrect return value of imaevm_read_keyid() (in v7). - Remove kerneldoc markers from comments. - Tested on GA CI. Changes from v6: - Applied changes requested by Mimi Zohar (intermediate variable for if, annotation update, new option '--keyid-from-cert' instead of '@'). Added more comments for questioned cases. - Read_keyid functions are reworked in hopefully more understandable way (two new static functions: extract_keyid and read_cert). - Test for key+cert case added. Changes from v5: - ima_read_keyid renamed to imaevm_read_keyid and its return value inverted to match other API functions. Suggested by Stefan Berger - Rebased over next-testing. Noticed by Mimi Zohar. Changes from v4: - ima_read_keyid() API changed. As suggested by Stefan Berger. Changes from v3: - ima_read_keyid() is improved to better support both use cases. Changes from v2: - Add ima_read_keyid() function to libemaevm and use it in both evmctl (for --keyid) and sign_hash_v2() (for concatenated PEMs). Suggested by Stefan Berger. - Autodetect PEM by openssl reading it instead of magic string. Suggested by Stefan Berger. - Trivial change: s/unsigned long int/unsigned long/ for keyid type. Changes from v1: - Extract keyid from cert associated to key file. - Use sizeof instead of constant. Vitaly Chikunov (3): Allow manual setting keyid for signing Allow manual setting keyid from a cert file Read keyid from the cert appended to the key file README | 6 ++ src/evmctl.c | 34 +++++++++++ src/imaevm.h | 2 + src/libimaevm.c | 124 ++++++++++++++++++++++++++++++++++++++++- tests/gen-keys.sh | 31 +++++++++-- tests/sign_verify.test | 3 + 6 files changed, 193 insertions(+), 7 deletions(-)