From patchwork Fri Jun 28 15:21:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 11022617 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 A157D17D2 for ; Fri, 28 Jun 2019 15:21:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91AF928797 for ; Fri, 28 Jun 2019 15:21:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83F6A287BE; Fri, 28 Jun 2019 15:21:27 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 5582328797 for ; Fri, 28 Jun 2019 15:21:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726770AbfF1PV0 (ORCPT ); Fri, 28 Jun 2019 11:21:26 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:40911 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726686AbfF1PVZ (ORCPT ); Fri, 28 Jun 2019 11:21:25 -0400 Received: by mail-wr1-f67.google.com with SMTP id p11so6714621wre.7 for ; Fri, 28 Jun 2019 08:21:22 -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:mime-version :content-transfer-encoding; bh=XOIwfAg0pfX5uU+CB6t/hcz3d84PyIAK/4pF8+uLHVs=; b=tKL6Jcbxs9SfQry1sHEBVRB4ea8ApJkcJCIWjpC0kPHkcjAcaGgIs3NaAVCtV7j0Z5 F+LB9QwBOnRNjgPtXleh342m0ZKs7csogSL1BDdCu1bKznvDss1bQd1H97LXyzgTFHno T8JsqrPzzS8fogwizCTa0pX8VunVF30TGztzM2iiPsFqQDht3PqLAr0u/xOHv0o32cad jZ44qI4/jrobNEBWcp+VrkzLtda64eJpHbemC0uu5q9+xWBJOG7f8/E3cZS+OZYH9Srz abMG6hifLw+KIJximm51LR8rlm2TWZ0sFU+Ijf/I/0QNIdn1xGHOQjP163m0aWthLsIJ laMA== 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:mime-version :content-transfer-encoding; bh=XOIwfAg0pfX5uU+CB6t/hcz3d84PyIAK/4pF8+uLHVs=; b=YtvsxatAcUcnAHjkP0G9EHeGRBbckYQL6MQtVomaIcJd2A9n9H34TD97MAgDq+b6V8 JT32F70hN377jXgVUWKfzyL+nt6BeMQEMoOOt7acJTkCiO2eRo0zmvPi940EzMSsu8zt XkkaGMCczcd4bk6gaGfm85rO+07158J07ystiGmPf/Mm7wE26D/5q6ltxGDfkFZWqB4y MOBMuOaWS7Mh+XCr3pckvW2CCslwy2mjLoolcVpZeY0iVa4kqPvC9jiyujv0XCY4Xu2U AA0QcV8wdl2EiRW+uVVZAlBMobO1dwC6+TrXiByipbaynWmh4zWkeW+PzM3z+ERpkliF ih7w== X-Gm-Message-State: APjAAAX6cVtIWbzTJ9LASAxe2ImpG+jgoLWwF6XVnvgmPrKOgaUUHIC3 zbT4H5hGB9zI0teZuRkwaGGngw== X-Google-Smtp-Source: APXvYqyOctxPXioBhYpUoXxbQG6RIPm4nkqn+rlmlYT1A/5PHrDKw50VBpdd5tZY1znDFzGKzSYZIQ== X-Received: by 2002:adf:e691:: with SMTP id r17mr8554269wrm.67.1561735281891; Fri, 28 Jun 2019 08:21:21 -0700 (PDT) Received: from localhost.localdomain (91-167-84-221.subs.proxad.net. [91.167.84.221]) by smtp.gmail.com with ESMTPSA id u13sm2734319wrq.62.2019.06.28.08.21.19 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 28 Jun 2019 08:21:20 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: Ard Biesheuvel , Herbert Xu , Eric Biggers , dm-devel@redhat.com, linux-fscrypt@vger.kernel.org, Gilad Ben-Yossef , Milan Broz Subject: [PATCH v6 0/7] crypto: switch to crypto API for ESSIV generation Date: Fri, 28 Jun 2019 17:21:05 +0200 Message-Id: <20190628152112.914-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-fscrypt-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This series creates an ESSIV template that produces a skcipher or AEAD transform based on a tuple of the form ',,' (or ',,' for the AEAD case). It exposes the encapsulated sync or async skcipher/aead by passing through all operations, while using the cipher/shash pair to transform the input IV into an ESSIV output IV. This matches what both users of ESSIV in the kernel do, and so it is proposed as a replacement for those, in patches #2 and #4. This code has been tested using the fscrypt test suggested by Eric (generic/549), as well as the mode-test script suggested by Milan for the dm-crypt case. I also tested the aead case in a virtual machine, but it definitely needs some wider testing from the dm-crypt experts. The consensus appears to be that it would be useful if the crypto API encapsulates the handling of multiple subsequent blocks that are encrypted using a 64-bit LE counter as IV, and makes it the duty of the algo to increment the counter between blocks. However, this is equally suitable for non-ESSIV transforms (or even more so), and so this is left as a future enhancement to be applied on top. Changes since v5: - drop redundant #includes and drop some unneeded braces (#2) - add test case for essiv(authenc(hmac(sha256),cbc(aes)),aes,sha256) - make ESSIV driver deal with assoc data that is described by more than two scatterlist entries - this only happens when the extended tests are being performed, so don't optimize for it - clarify that both fscrypt and dm-crypt only use ESSIV in special cases (#7) Changes since v4: - make the ESSIV template IV size equal the IV size of the encapsulated cipher - defining it as 8 bytes was needlessly restrictive, and also complicated the code for no reason - add a missing kfree() spotted by Smatch - add additional algo length name checks when constructing the essiv() cipher name - reinstate the 'essiv' IV generation implementation in dm-crypt, but make its generation function identical to plain64le (and drop the other methods) - fix a bug in the arm64 CE/NEON code - simplify the arm64 code by reusing more of the existing CBC implementation (patch #6 is new to this series and was added for this reason) Changes since v3: - address various review comments from Eric on patch #1 - use Kconfig's 'imply' instead of 'select' to permit CRYPTO_ESSIV to be enabled as a module or disabled entirely even if fscrypt is compiled in (#2) - fix an issue in the AEAD encrypt path caused by the IV being clobbered by the inner skcipher before the hmac was being calculated Changes since v2: - fixed a couple of bugs that snuck in after I'd done the bulk of my testing - some cosmetic tweaks to the ESSIV template skcipher setkey function to align it with the aead one - add a test case for essiv(cbc(aes),aes,sha256) - add an accelerated implementation for arm64 that combines the IV derivation and the actual en/decryption in a single asm routine Scroll down for tcrypt speed test result comparing the essiv template with the asm implementation. Bare cbc(aes) tests included for reference as well. Taken on a 2GHz Cortex-A57 (AMD Seattle) Code can be found here https://git.kernel.org/pub/scm/linux/kernel/git/ardb/linux.git/log/?h=essiv-v6 Cc: Herbert Xu Cc: Eric Biggers Cc: dm-devel@redhat.com Cc: linux-fscrypt@vger.kernel.org Cc: Gilad Ben-Yossef Cc: Milan Broz Ard Biesheuvel (7): crypto: essiv - create wrapper template for ESSIV generation fs: crypto: invoke crypto API for ESSIV handling md: dm-crypt: infer ESSIV block cipher from cipher string directly md: dm-crypt: switch to ESSIV crypto API template crypto: essiv - add test vector for essiv(cbc(aes),aes,sha256) crypto: arm64/aes-cts-cbc - factor out CBC en/decryption of a walk crypto: arm64/aes - implement accelerated ESSIV/CBC mode arch/arm64/crypto/aes-glue.c | 205 +++++-- arch/arm64/crypto/aes-modes.S | 29 +- crypto/Kconfig | 4 + crypto/Makefile | 1 + crypto/essiv.c | 640 ++++++++++++++++++++ crypto/tcrypt.c | 9 + crypto/testmgr.c | 14 + crypto/testmgr.h | 497 +++++++++++++++ drivers/md/Kconfig | 1 + drivers/md/dm-crypt.c | 229 ++----- fs/crypto/Kconfig | 1 + fs/crypto/crypto.c | 5 - fs/crypto/fscrypt_private.h | 9 - fs/crypto/keyinfo.c | 95 +-- 14 files changed, 1409 insertions(+), 330 deletions(-) create mode 100644 crypto/essiv.c