From patchwork Wed Jun 12 12:48:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 166548 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3640593ilk; Wed, 12 Jun 2019 05:48:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqxpvV4LPKo8XPC2wKikp9Dvus0Z2IRxf5I5lDhI8A/Ts2930h8kXWSwFL0FqiMGHNfmg/9T X-Received: by 2002:a62:a509:: with SMTP id v9mr84977160pfm.82.1560343732383; Wed, 12 Jun 2019 05:48:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560343732; cv=none; d=google.com; s=arc-20160816; b=vtbj8jo2Emy2/wnh0AoIuF099gH0wICGsnpUylDLHM0lgm0vsJq+GfAZlX2ZlV9vyy JBb/Te6IachDq8Pqw/cb1iRkQS1JCSEt96N1uLUXm0BcJBmZeUd1L61npspi7lC9iuqt +8dkFVaG8S1c9zPeYuWiCWr85FmROT5J1UC5oORLkkvo1l+xULPwW9mGOkLWyR0eC5Pt d7y42p8l9SxX2k/nkcNhwGrZHQL1bk3g9Y2/aApBJPyAE+7mPqShpLgPRuhhW/2fcS24 rOtlL/gOZ9bOETmDSBEtukYDmbOyhd0cPYrBnTjWjepFA9f0xi9SiZVSPAgvqSiFmxad akKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BVjKB83CGDhuLXJgz703gQuRW2ORbNsUnSLW3NNqkVc=; b=uey6F+MiPIqGutfB6pnHR6cmPRitblrhIzEbpfE3YhWe9JHjj+n1Qr9qpFEuyMI0I8 CtM7do8P8ZULMpXxi73yvVf/Az4YvCshbAUdEMzQorxI6G6HG3Y/gWcIXw0ILGeuM2to zkWhvzkX0Dm3G/IGHawn7Y4+kgMAjueker3vhgqsq4QzemzjfDLuW73M2rraCfnrYJzw coOzvQxJdYjqvlLMj/nQ5PYIzWdnnuW/WjOlgwNelTqj8nqDwWrVjVoiiAJEsh4F49ih Gi0aJhGZMpKmmUsTSiiA7Y4VcN/mHLxIEehkkNQpspSfiv/dzbOj4zR724Ml6UYDBqH1 MDXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PEO+oml8; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b14si16011497pgk.423.2019.06.12.05.48.52; Wed, 12 Jun 2019 05:48:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PEO+oml8; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405620AbfFLMsv (ORCPT + 3 others); Wed, 12 Jun 2019 08:48:51 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:53398 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2409156AbfFLMsv (ORCPT ); Wed, 12 Jun 2019 08:48:51 -0400 Received: by mail-wm1-f67.google.com with SMTP id x15so6449787wmj.3 for ; Wed, 12 Jun 2019 05:48:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BVjKB83CGDhuLXJgz703gQuRW2ORbNsUnSLW3NNqkVc=; b=PEO+oml8sbOBJnA2JgN8yi8oG/YrG3PgZZ8hW5sCEhx3zRADsH4VIEc+C2lfQ9ID4H eY9GZRlCgvsU0wxkPjtYKurKi14Rwj+DRDWE5oP+/0q36mRyX/k3sDFFnSiZE2Z2nS0N +Kud0bquyc5memcL6tJI5k53Dc0KTcwBECh4fbh95l/UH5bVDnHpvKUrUpnU4RnoFI4L 7LQInRcFEOUc0RY3Rqu2aZd9JT/CfvDaI9GHC64ZuKEWbsGse3uAe12zj3oQt93Bvb9s 09IQH3BbPVewj67JRu9AQsvb5o2yVlE10C7OWjfdt2XooE/6wBQgQGtBQvGua0WYTjl1 d+iQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=BVjKB83CGDhuLXJgz703gQuRW2ORbNsUnSLW3NNqkVc=; b=i0b/SpltcuyEUX7gYwgtAG3xXL4X3z/NvlvgICYqbmKcZOgVeQ21WbIn7D3GXmdTMR +VNpJEUu+QgNAcZfdeHjFCaGpU74WvE3RjtTpPvwH+LkHdMxYIDmxpXMTeNDlfLq/XUi 40F9JRbGAXMVQbztqNpUT41x/Grx1aC0vX/U/cX0gMOnNZTujoXZDHCHlLJHw3wMkHwI yQ0K62+sVDdEKKj04crdgQ8SbJZxQ7k3fpanxfoVYa8VfIrhL2+l/Dx1aGc0UnuHu28f Kw9OEncqPZGKmzFAN5jw0BKsHRgoT9bkjRTotL4B/aYU3p+9y8PXJIL5vpwooJ6ThDXz SXBg== X-Gm-Message-State: APjAAAXMQGv0nbqzk2YMiS7XYGiAbow/uDqqklauqRpra+K44hbWgdWn ysehGqDCs5IaeX7ewpxd/rUDT4Q+62+Ayg== X-Received: by 2002:a1c:f102:: with SMTP id p2mr20392795wmh.60.1560343728001; Wed, 12 Jun 2019 05:48:48 -0700 (PDT) Received: from sudo.home ([2a01:cb1d:112:6f00:353a:f33a:a393:3ada]) by smtp.gmail.com with ESMTPSA id s8sm28505480wra.55.2019.06.12.05.48.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Jun 2019 05:48:47 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, ebiggers@kernel.org, Ard Biesheuvel Subject: [RFC PATCH 01/20] crypto: arm/aes-ce - cosmetic/whitespace cleanup Date: Wed, 12 Jun 2019 14:48:19 +0200 Message-Id: <20190612124838.2492-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190612124838.2492-1-ard.biesheuvel@linaro.org> References: <20190612124838.2492-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Rearrange the aes_algs[] array for legibility. Signed-off-by: Ard Biesheuvel --- arch/arm/crypto/aes-ce-glue.c | 116 ++++++++++---------- 1 file changed, 56 insertions(+), 60 deletions(-) -- 2.20.1 diff --git a/arch/arm/crypto/aes-ce-glue.c b/arch/arm/crypto/aes-ce-glue.c index 5affb8482379..04ba66903674 100644 --- a/arch/arm/crypto/aes-ce-glue.c +++ b/arch/arm/crypto/aes-ce-glue.c @@ -337,69 +337,65 @@ static int xts_decrypt(struct skcipher_request *req) } static struct skcipher_alg aes_algs[] = { { - .base = { - .cra_name = "__ecb(aes)", - .cra_driver_name = "__ecb-aes-ce", - .cra_priority = 300, - .cra_flags = CRYPTO_ALG_INTERNAL, - .cra_blocksize = AES_BLOCK_SIZE, - .cra_ctxsize = sizeof(struct crypto_aes_ctx), - .cra_module = THIS_MODULE, - }, - .min_keysize = AES_MIN_KEY_SIZE, - .max_keysize = AES_MAX_KEY_SIZE, - .setkey = ce_aes_setkey, - .encrypt = ecb_encrypt, - .decrypt = ecb_decrypt, + .base.cra_name = "__ecb(aes)", + .base.cra_driver_name = "__ecb-aes-ce", + .base.cra_priority = 300, + .base.cra_flags = CRYPTO_ALG_INTERNAL, + .base.cra_blocksize = AES_BLOCK_SIZE, + .base.cra_ctxsize = sizeof(struct crypto_aes_ctx), + .base.cra_module = THIS_MODULE, + + .min_keysize = AES_MIN_KEY_SIZE, + .max_keysize = AES_MAX_KEY_SIZE, + .setkey = ce_aes_setkey, + .encrypt = ecb_encrypt, + .decrypt = ecb_decrypt, }, { - .base = { - .cra_name = "__cbc(aes)", - .cra_driver_name = "__cbc-aes-ce", - .cra_priority = 300, - .cra_flags = CRYPTO_ALG_INTERNAL, - .cra_blocksize = AES_BLOCK_SIZE, - .cra_ctxsize = sizeof(struct crypto_aes_ctx), - .cra_module = THIS_MODULE, - }, - .min_keysize = AES_MIN_KEY_SIZE, - .max_keysize = AES_MAX_KEY_SIZE, - .ivsize = AES_BLOCK_SIZE, - .setkey = ce_aes_setkey, - .encrypt = cbc_encrypt, - .decrypt = cbc_decrypt, + .base.cra_name = "__cbc(aes)", + .base.cra_driver_name = "__cbc-aes-ce", + .base.cra_priority = 300, + .base.cra_flags = CRYPTO_ALG_INTERNAL, + .base.cra_blocksize = AES_BLOCK_SIZE, + .base.cra_ctxsize = sizeof(struct crypto_aes_ctx), + .base.cra_module = THIS_MODULE, + + .min_keysize = AES_MIN_KEY_SIZE, + .max_keysize = AES_MAX_KEY_SIZE, + .ivsize = AES_BLOCK_SIZE, + .setkey = ce_aes_setkey, + .encrypt = cbc_encrypt, + .decrypt = cbc_decrypt, }, { - .base = { - .cra_name = "__ctr(aes)", - .cra_driver_name = "__ctr-aes-ce", - .cra_priority = 300, - .cra_flags = CRYPTO_ALG_INTERNAL, - .cra_blocksize = 1, - .cra_ctxsize = sizeof(struct crypto_aes_ctx), - .cra_module = THIS_MODULE, - }, - .min_keysize = AES_MIN_KEY_SIZE, - .max_keysize = AES_MAX_KEY_SIZE, - .ivsize = AES_BLOCK_SIZE, - .chunksize = AES_BLOCK_SIZE, - .setkey = ce_aes_setkey, - .encrypt = ctr_encrypt, - .decrypt = ctr_encrypt, + .base.cra_name = "__ctr(aes)", + .base.cra_driver_name = "__ctr-aes-ce", + .base.cra_priority = 300, + .base.cra_flags = CRYPTO_ALG_INTERNAL, + .base.cra_blocksize = 1, + .base.cra_ctxsize = sizeof(struct crypto_aes_ctx), + .base.cra_module = THIS_MODULE, + + .min_keysize = AES_MIN_KEY_SIZE, + .max_keysize = AES_MAX_KEY_SIZE, + .ivsize = AES_BLOCK_SIZE, + .chunksize = AES_BLOCK_SIZE, + .setkey = ce_aes_setkey, + .encrypt = ctr_encrypt, + .decrypt = ctr_encrypt, }, { - .base = { - .cra_name = "__xts(aes)", - .cra_driver_name = "__xts-aes-ce", - .cra_priority = 300, - .cra_flags = CRYPTO_ALG_INTERNAL, - .cra_blocksize = AES_BLOCK_SIZE, - .cra_ctxsize = sizeof(struct crypto_aes_xts_ctx), - .cra_module = THIS_MODULE, - }, - .min_keysize = 2 * AES_MIN_KEY_SIZE, - .max_keysize = 2 * AES_MAX_KEY_SIZE, - .ivsize = AES_BLOCK_SIZE, - .setkey = xts_set_key, - .encrypt = xts_encrypt, - .decrypt = xts_decrypt, + .base.cra_name = "__xts(aes)", + .base.cra_driver_name = "__xts-aes-ce", + .base.cra_priority = 300, + .base.cra_flags = CRYPTO_ALG_INTERNAL, + .base.cra_blocksize = AES_BLOCK_SIZE, + .base.cra_ctxsize = sizeof(struct crypto_aes_xts_ctx), + .base.cra_module = THIS_MODULE, + + .min_keysize = 2 * AES_MIN_KEY_SIZE, + .max_keysize = 2 * AES_MAX_KEY_SIZE, + .ivsize = AES_BLOCK_SIZE, + .setkey = xts_set_key, + .encrypt = xts_encrypt, + .decrypt = xts_decrypt, } }; static struct simd_skcipher_alg *aes_simd_algs[ARRAY_SIZE(aes_algs)];