From patchwork Sun Jun 23 09:00:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Chikunov X-Patchwork-Id: 11011625 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 898E414B6 for ; Sun, 23 Jun 2019 09:01:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7726C28AF8 for ; Sun, 23 Jun 2019 09:01:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6BAE228B2A; Sun, 23 Jun 2019 09:01:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 145F328AF8 for ; Sun, 23 Jun 2019 09:01:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726387AbfFWJBG (ORCPT ); Sun, 23 Jun 2019 05:01:06 -0400 Received: from vmicros1.altlinux.org ([194.107.17.57]:41638 "EHLO vmicros1.altlinux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726386AbfFWJBG (ORCPT ); Sun, 23 Jun 2019 05:01:06 -0400 Received: from imap.altlinux.org (imap.altlinux.org [194.107.17.38]) by vmicros1.altlinux.org (Postfix) with ESMTP id D4A4072CC6C; Sun, 23 Jun 2019 12:01:04 +0300 (MSK) Received: from beacon.altlinux.org (unknown [185.6.174.98]) by imap.altlinux.org (Postfix) with ESMTPSA id 9754E4A4A29; Sun, 23 Jun 2019 12:01:04 +0300 (MSK) From: Vitaly Chikunov To: Mimi Zohar , Dmitry Kasatkin , linux-integrity@vger.kernel.org Subject: [PATCH v7 06/11] ima-evm-utils: Replace find_keyid with find_keyid_pkey Date: Sun, 23 Jun 2019 12:00:22 +0300 Message-Id: <20190623090027.11852-7-vt@altlinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190623090027.11852-1-vt@altlinux.org> References: <20190623090027.11852-1-vt@altlinux.org> MIME-Version: 1.0 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Finish conversion of find_keyid to EVP_PKEY API. After verify_hash_v2() is switched to EVP_PKEY API (in previous commit) old RSA-specific find_keyid() does not needed anymore and can be replaced with find_keyid_pkey(). Signed-off-by: Vitaly Chikunov --- src/libimaevm.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/libimaevm.c b/src/libimaevm.c index c24c67f..d8223e0 100644 --- a/src/libimaevm.c +++ b/src/libimaevm.c @@ -456,7 +456,7 @@ struct public_key_entry { }; static struct public_key_entry *public_keys = NULL; -static EVP_PKEY *find_keyid_pkey(uint32_t keyid) +static EVP_PKEY *find_keyid(uint32_t keyid) { struct public_key_entry *entry; @@ -467,22 +467,6 @@ static EVP_PKEY *find_keyid_pkey(uint32_t keyid) return NULL; } -static RSA *find_keyid(uint32_t keyid) -{ - EVP_PKEY *pkey; - RSA *key; - - pkey = find_keyid_pkey(keyid); - if (!pkey) - return NULL; - key = EVP_PKEY_get0_RSA(pkey); - if (!key) { - log_err("find_keyid: unsupported key type\n"); - return NULL; - } - return key; -} - void init_public_keys(const char *keyfiles) { struct public_key_entry *entry; @@ -537,7 +521,7 @@ int verify_hash_v2(const char *file, const unsigned char *hash, int size, } if (public_keys) { - pkey = find_keyid_pkey(hdr->keyid); + pkey = find_keyid(hdr->keyid); if (!pkey) { log_err("%s: unknown keyid: %x\n", file, __be32_to_cpup(&hdr->keyid));