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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62FA3C7EE29 for ; Tue, 13 Jun 2023 12:51:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239520AbjFMMvI (ORCPT ); Tue, 13 Jun 2023 08:51:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242303AbjFMMvF (ORCPT ); Tue, 13 Jun 2023 08:51:05 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52D5AAD for ; Tue, 13 Jun 2023 05:50:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686660614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=20Lf5295TWtm62Iju1bXn1VBh8WPuMBDvoGA4YjEjKU=; b=DYBHyYktIo5DFZNltQ2Th0AoiSwRrCLMjnDuZ9ZJM0Rumw735pqm4PRSj2xoyswUvfnSkl rmh221X90KlS8FjA1a7uTIOW98zjo4GrYCG4Rvdpah6qFvFUER1bxDY/nJhAC0jQYNgzxT mNlci8hRVOgzTad6UUamTngapDCN0ow= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-529-fwNeCGTiPHqfbGFZQwuqag-1; Tue, 13 Jun 2023 08:50:11 -0400 X-MC-Unique: fwNeCGTiPHqfbGFZQwuqag-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BB21985A5A8; Tue, 13 Jun 2023 12:50:10 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 93B5E1121318; Tue, 13 Jun 2023 12:50:06 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: References: To: "Herbert Xu" Cc: dhowells@redhat.com, Linus Torvalds , Roberto Sassu , Eric Biggers , Stefan Berger , Mimi Zohar , dmitry.kasatkin@gmail.com, Jarkko Sakkinen , Ard Biesheuvel , keyrings@vger.kernel.org, Linux Crypto Mailing List Subject: Re: [PATCH 4/5] KEYS: asymmetric: Move sm2 code into x509_public_key MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <570723.1686660603.1@warthog.procyon.org.uk> Date: Tue, 13 Jun 2023 13:50:03 +0100 Message-ID: <570724.1686660603@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Herbert Xu wrote: > +#include > +#include > +#include > +#include > +#include > #include > #include > #include > -#include > -#include > -#include > -#include > +#include Why rearrage the order? Why not leave the linux/ headers first? Then the keys/ and then the crypto/. > + if (strcmp(cert->pub->pkey_algo, "sm2") == 0) { > + ret = strcmp(sig->hash_algo, "sm3") != 0 ? -EINVAL : > + crypto_shash_init(desc) ?: > + sm2_compute_z_digest(desc, cert->pub->key, > + cert->pub->keylen, sig->digest) ?: > + crypto_shash_init(desc) ?: > + crypto_shash_update(desc, sig->digest, > + sig->digest_size) ?: > + crypto_shash_finup(desc, cert->tbs, cert->tbs_size, > + sig->digest); Ewww... That's really quite hard to comprehend at a glance. :-) Should sm2_compute_z_digest() be something accessible through the crypto hooks rather than being called directly? > + } else "} else {" please. > + ret = crypto_shash_digest(desc, cert->tbs, cert->tbs_size, > + sig->digest); > + David