From patchwork Fri Jul 26 18:19:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 169930 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp384207ilk; Fri, 26 Jul 2019 11:19:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqzyMxurW73crZW8kKPmoHDuQErhK+29B1JUpIJ4lbzB9GxnnbhleouGFCuIrqVHjklbMe37 X-Received: by 2002:aa7:8641:: with SMTP id a1mr23736690pfo.177.1564165162332; Fri, 26 Jul 2019 11:19:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564165162; cv=none; d=google.com; s=arc-20160816; b=UOAA/iAtWhgBXPOhUqhufiaa7yklO52VkgwgAe/cCYI9aU5QYHYuzs8G8+H0jCAcmy eup6UerrcsJ6UbZqwbiSKsqSZuwJ+f7jcFxk4HsCndKZ6IJ0sDfMie7fi0xMEQjN4nxZ k+blMFe986V782m7+9mvY28qDTMdEazy5+o5frFhLFZO5EXefk3jLmnGAAg4zZ/inHHH vgnnmPGj/mIaSlGGPND4H9YiBfhm0LBLmRetO7N7iZ4uIEhrgWvn/oOO8H8d+v5WTMAu jNcbi/XLzN5q0IHTRAVQ5B0niDp0DpAuSqj5FxRDmxXL2hQANsKx5SF8d6/p9hXta0XD pvaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=DYue9Ta5QZ05sip6xPS5AmvFZdGwY9ycVH6bVBUVWxo=; b=yY+UshLhL+/UgFpFaWKh60f5WhA+YycYGjqRlLjocib3KS7rhohqUZ2ETRBhp+osir i5m4VqkSX9rhnQMoUQ3NaXu0WfOfO+vUIsNGIZq8Rq181ufnknZVJEO7YnvtpuNacUUs TPQ1diF0Jza9Suv2WJ6ArMqkNJlr3UfQL6k5/tlWe1+87K5yo//zfDJCmyoTc3Df8gYu hXcYGXKXEf4OVq6bcE/OH4WlrqWiIvjieMztp2IrzDtcttZt+t8aU5EtVtBRuZr8fiR+ 1YqlcUp+m1HGEJry1wvXC9CmkeV1Pusw6NpLdLPc1/SVD2gZD+rYHfrYvIpLkaXPXoEB uDLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ctubbg/s"; 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 i95si20288324plb.106.2019.07.26.11.19.22; Fri, 26 Jul 2019 11:19:22 -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="Ctubbg/s"; 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 S1727083AbfGZSTV (ORCPT + 3 others); Fri, 26 Jul 2019 14:19:21 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:35481 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726781AbfGZSTU (ORCPT ); Fri, 26 Jul 2019 14:19:20 -0400 Received: by mail-ed1-f65.google.com with SMTP id w20so54005823edd.2 for ; Fri, 26 Jul 2019 11:19:20 -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; bh=DYue9Ta5QZ05sip6xPS5AmvFZdGwY9ycVH6bVBUVWxo=; b=Ctubbg/sTubmXjKAUBG4q0hYoHE86fWYO8Yuav0AfLA3zVtNhSbFzQB3+n+9c+69zX IQunjDfDwUesk5Vm5X9D+HPdopLGdW79+9MD4O8GLfYk2ujIV0qeio6wKJq9CBi80ixx +zKlZZ8gFVrqWVfyxViifUbX6Lll+dZRypkN5jTHlY9NLwlObDnIgr29A6bSz5VzbUAv lFRdaNu2YHO9UIsPUBy+ACABNC0e2sZAewrBE5zkLrwIyrKN09WeMtcFv8wp57RnqXrV agLNpgDvYBtFXdRUKF5Gx9I+iQuhG5pRgw3y1NYN6qZVJU1fml/aVLs+dC2VJ6Tj69CH sVmw== 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; bh=DYue9Ta5QZ05sip6xPS5AmvFZdGwY9ycVH6bVBUVWxo=; b=Oa8AC/+Pcsf/VDX4GNPPa8i6Lt9XOA6uuJDmQWln/pA46s0glxK9YtKWlvKKuMfp8l pTLT5Plcv2oaIbIx/VG3jThxLahKg1a/C+3nMmq1PRfBqigUG2oENu5gYJbDR9f8BwK5 8njB2op+CbxVQ5eniW0T8Y5Clt19ERb97qAJjkZshmf/6/QeMZ8zVr5KZYEYUOM11vI1 Pohcn6c1FHHPsbN2lZfHbimkqF8dIjYXFfpWjyx7raniYtjzudkUrpGxc+5crwu+C/pB eSMg7nKw5h4x4JLKs9fp7Sipd9qmwtVuV0YH8iJkw856KO4aVDCjfmJW9Ug7POW+VVv2 GiUQ== X-Gm-Message-State: APjAAAXynwkmcH1QfgZpZOA9/S7xXYxnlnpEi8tnAyjHqgv22AtpMr4u QDqUnYHe6CvjZKzM4QcWh/vpimtlgiM0ipa7 X-Received: by 2002:aa7:d781:: with SMTP id s1mr38585866edq.20.1564165159271; Fri, 26 Jul 2019 11:19:19 -0700 (PDT) Received: from localhost.localdomain ([212.92.122.86]) by smtp.gmail.com with ESMTPSA id x10sm14329152edd.73.2019.07.26.11.19.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jul 2019 11:19:18 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, Ard Biesheuvel Subject: [PATCH] crypto: s390/aes - fix name clash after AES library refactor Date: Fri, 26 Jul 2019 21:19:04 +0300 Message-Id: <20190726181904.22467-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org The newly introduced AES library exposes aes_encrypt/aes_decrypt routines so rename existing occurrences of those identifiers in the s390 driver. Signed-off-by: Ard Biesheuvel --- arch/s390/crypto/aes_s390.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c index d00f84add5f4..dc0f72dd6e03 100644 --- a/arch/s390/crypto/aes_s390.c +++ b/arch/s390/crypto/aes_s390.c @@ -108,7 +108,7 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key, return 0; } -static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) +static void crypto_aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) { struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm); @@ -119,7 +119,7 @@ static void aes_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) cpacf_km(sctx->fc, &sctx->key, out, in, AES_BLOCK_SIZE); } -static void aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) +static void crypto_aes_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in) { struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm); @@ -172,8 +172,8 @@ static struct crypto_alg aes_alg = { .cia_min_keysize = AES_MIN_KEY_SIZE, .cia_max_keysize = AES_MAX_KEY_SIZE, .cia_setkey = aes_set_key, - .cia_encrypt = aes_encrypt, - .cia_decrypt = aes_decrypt, + .cia_encrypt = crypto_aes_encrypt, + .cia_decrypt = crypto_aes_decrypt, } } };