From patchwork Thu Aug 22 10:24:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 172021 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp677797ily; Thu, 22 Aug 2019 03:25:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqzAfEINvpy+4faXRgIbjEOIVWNYmOZtBhLr+ujFKFyQyoeyih044nXPwoxH61m4xtBBpZXv X-Received: by 2002:a17:902:9b94:: with SMTP id y20mr38722251plp.260.1566469502253; Thu, 22 Aug 2019 03:25:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566469502; cv=none; d=google.com; s=arc-20160816; b=hpWxWZCXMnw/ZpmvPEOiF4AD9tcP0Yd/DtUAeY28qVyH5XMI0GvimrCO6Z9aWBVQ+/ W8F2MUzUyhaGrqNXf3rGjX7H+ZUdSZQpkppRGuGSQkgZ8XDW2O546ZfTqUSO5nDPPNqO XbnGIPy8eFBpD0l6SjIPT6VTI/X1xM84+ECDan77JltkBrkEPxQC78ssbbHjNANq3SDJ /00idWf9OynLmW/zQO3yqzrt7r/0EXIk1guK7zP4R7DNIsbgfXkAHmdB0AWWoOoSN1xv zkmqu3aTIlxNKBBbAMGYI6UPx1BVaxDKKK6SsPDsNSpWs96QXAH5Iz3oGWUgex1RZReR AWXA== 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=o7be3La0xqbM1+XB6BOf/tB1xXnCIEmRWtI29Pxo614=; b=UKUnb+xFSTuO7+ZiNXP29w0UE8Q8QvL3PKanaj7qEG6bV0teRHRP219e8U5vCkznw2 9JM1sDgl+O5V4zFcBe88CGmKhrL9reynevkRsvBrqM9rkXiybUHdL9iLRLJ+CFRzbaC7 K0k+EhVdn4LWCfRpoz7xyibwOt+rYtgilbQBWlWyhKCmaAJ+AEZZ8LbfBFO38Xi/zXjQ evkgEYjFd+DHRFkD7QkyeNJiI8d3pLNBmcfGQQOKSeDwMgWetdef7XhRtrZ97Xhj65wN ivDm1qlNvBoH+DrPcNuDgX5pub0xZXAR83chy5PbJtm52tP0SA854dlUxuYiSbuSlMR9 /APg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uXSt5Sht; 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 n2si16504173pgq.586.2019.08.22.03.25.01; Thu, 22 Aug 2019 03:25:02 -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=uXSt5Sht; 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 S2387552AbfHVKZB (ORCPT + 3 others); Thu, 22 Aug 2019 06:25:01 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:47095 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387545AbfHVKZB (ORCPT ); Thu, 22 Aug 2019 06:25:01 -0400 Received: by mail-wr1-f65.google.com with SMTP id z1so4853934wru.13 for ; Thu, 22 Aug 2019 03:24:59 -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=o7be3La0xqbM1+XB6BOf/tB1xXnCIEmRWtI29Pxo614=; b=uXSt5ShtItflxlygNLbhRNaSWt6v6rjDyWIlF6x60PoJSj3IbAM+MxYrX0mgxEAyQw ijHnLoocwsJWI6fMAubiIVemkd6Z9DeY0xQqBu1amh/6PvwteSBphdNS/J+mt839WsN6 /Q5YIofXWemnErL7oA2SjCDfnSz47Is4Ad/MLdp2QcnlsBWyhcY5re85tXIqXUt4c9KA m7sl2lKTb3u5hFuZPk6gd+rXABYTBgHgBMQfBm87V0ktaWu6MfNQNOLulnjs/M6j53fl WxKNRMWJIRSicWB+dxy1QStmSESah2UgOD/NC8ZzHFRfnqUTY0sfOjXMih4CO5qPQZ1p rPpA== 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=o7be3La0xqbM1+XB6BOf/tB1xXnCIEmRWtI29Pxo614=; b=i1U0yZw5biWodQab9yrwyc+tTdvC7kiDh4MgRrYSzCXXQZkklrxZEF1rmV0t22nkWI ooLnc80qNJZD5hN6b8nVvzE6/JYzbCuO67MIVXr3J7GKbpdJ7arHxMliI833RhGD4Xd6 6noAmia/sGt8WeeEfa0INO+4rm1ur5GLSkQm9I54cdJ//ao6dCrLj4OaJcMBfxOXkxDs HCwlU8jv7fO8m0EzNpLKigNHyZvGgzugtoaUcWr7U0T0znUJi0anQTNA+krbW6C24xDb no8BC9rWbTEpXWhlyb1kML5W7slw+NpGmo1QXQ4FQm0UC8lPB3zevRtuXfPAoj1zM8M7 CjHA== X-Gm-Message-State: APjAAAX1nKUoUWHrVnlXMpuDbMwqjnEQAQG6algbVQVRR8PXWuRB/qhm YzxAhs9M8TMv7etrijiTHxZ1o4EVoRPm5A== X-Received: by 2002:adf:f481:: with SMTP id l1mr47301012wro.123.1566469498955; Thu, 22 Aug 2019 03:24:58 -0700 (PDT) Received: from mba13.lan (adsl-91.109.242.50.tellas.gr. [109.242.50.91]) by smtp.gmail.com with ESMTPSA id f17sm3700130wmj.27.2019.08.22.03.24.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Aug 2019 03:24:58 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, Ard Biesheuvel Subject: [PATCH cryptodev buildfix] crypto: s390/aes - fix typo in XTS_BLOCK_SIZE identifier Date: Thu, 22 Aug 2019 13:24:54 +0300 Message-Id: <20190822102454.4549-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 Fix a typo XTS_BLOCKSIZE -> XTS_BLOCK_SIZE, causing the build to break. Signed-off-by: Ard Biesheuvel --- Apologies for the sloppiness. Herbert, could we please merge this before cryptodev hits -next? arch/s390/crypto/aes_s390.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c index a34faadc757e..d4f6fd42a105 100644 --- a/arch/s390/crypto/aes_s390.c +++ b/arch/s390/crypto/aes_s390.c @@ -586,7 +586,7 @@ static int xts_aes_encrypt(struct blkcipher_desc *desc, struct s390_xts_ctx *xts_ctx = crypto_blkcipher_ctx(desc->tfm); struct blkcipher_walk walk; - if (unlikely(!xts_ctx->fc || (nbytes % XTS_BLOCKSIZE) != 0)) + if (unlikely(!xts_ctx->fc || (nbytes % XTS_BLOCK_SIZE) != 0)) return xts_fallback_encrypt(desc, dst, src, nbytes); blkcipher_walk_init(&walk, dst, src, nbytes); @@ -600,7 +600,7 @@ static int xts_aes_decrypt(struct blkcipher_desc *desc, struct s390_xts_ctx *xts_ctx = crypto_blkcipher_ctx(desc->tfm); struct blkcipher_walk walk; - if (unlikely(!xts_ctx->fc || (nbytes % XTS_BLOCKSIZE) != 0)) + if (unlikely(!xts_ctx->fc || (nbytes % XTS_BLOCK_SIZE) != 0)) return xts_fallback_decrypt(desc, dst, src, nbytes); blkcipher_walk_init(&walk, dst, src, nbytes);