From patchwork Sun Jul 9 13:59:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 700837 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp4742280wrs; Sun, 9 Jul 2023 07:04:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlFtzbnWm8iTqUa/ghwDrcin7RxP24EFxEst0vcSO2argrhv3uGTbQPQcqqJbvLDiznx9TN+ X-Received: by 2002:a37:2c81:0:b0:767:3f2a:cfe7 with SMTP id s123-20020a372c81000000b007673f2acfe7mr8586165qkh.56.1688911491511; Sun, 09 Jul 2023 07:04:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688911491; cv=none; d=google.com; s=arc-20160816; b=GfX6tZcR0xrlPpo0ozQYnCazaiC/TiuJwCK+6sHBxnGhasPr2KGUkhvleRnoB40RMa jRkvjqdEwYs75BL/y+1UxbNTQFnDc4WcJlloKkFgPEy1lzn8+DNd59qMXdl3Po+W4BYc AITQg/s2ZVw7VedXpvjQtVYx4BwsiLp04LkeK6NOFBqL/iBmjOofVePVZeC9g8dndx1T DUxmpngEs+CDJwdIazHO9lmxgscxKmeuYpxvQRtNe/X0Twj0MywLc9XeXNmescfMoiQ7 xwEmjYK74BplYt2SouhR33o9MBmX7G4piqp/oxek80Xy42Ue63L3BD+t9PrZDf/EAiPN scoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TOF0YX3biOvYXBmYgvIyMISz7K/doCgseRX4BopoSYk=; fh=NDeJ2wqT+fijtWONfLVnciqd4z0YwE/p9OnFcWQIM00=; b=XML6r24tCes5GQVKmkVdtksPZtj7LJ3A4QlAbDnlwPW0aAo8qyl/5AtiGebfg8WHfn g5PoQPZQ8oVCV2DO1Cw3wuejC46Lk4juXYik6U4fuHk8YMvl5EzqbN+kA0v1dJYlp3Uj iU+I2S5fix1hUfW015IbZReZHT4A6a41baXAhGxC64NKmLa/d8GhCKVE/deEcZIuazn6 sQ4WfcVvin6hYmG6934xqylhrfE8rsni4IrzyYnIG/DsRrs6xtmzepBSZ9zLnVGgASjy sCqvs+dvO1gUSUBn7zGJhdcNQZ6OfIrsitH+2z1zTuWBZEG7JvmfGz4S8e/Baz2mlTkL 3arA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f08Z9gWd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ow8-20020a05620a820800b007655a4d2ab0si4739006qkn.85.2023.07.09.07.04.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Jul 2023 07:04:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f08Z9gWd; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qIUxW-0000T8-Jt; Sun, 09 Jul 2023 10:00:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qIUxA-0000K2-UF for qemu-devel@nongnu.org; Sun, 09 Jul 2023 09:59:56 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qIUx7-0000Mk-ST for qemu-devel@nongnu.org; Sun, 09 Jul 2023 09:59:56 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3fbd33a57ddso36453795e9.1 for ; Sun, 09 Jul 2023 06:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688911192; x=1691503192; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TOF0YX3biOvYXBmYgvIyMISz7K/doCgseRX4BopoSYk=; b=f08Z9gWdkij8P8089LPhohEkOUYXudqWQkpFnKEDzG2176Jjv+WOPHRDIe8EcK8elp aOpHkYQPXlyj06FGBhqqqhIVmUWo3XreVEuMV/xgJWZK5czx00F/x9erPiVn8eD+F8+e QQugMhGwiZzZ3ggJslVGYvvv7wpmrTNVj0zr5I6SO8kJriCWFOZYhGoMPb0gqEn/M5S5 u4cz2aH1HWZBsLc+ofWmJTnAsHxCounZeadd9z/c9CLxHVM3yf+Th+drvtONOi0QOh7j BGmJUd9twxN4X7IIywRpmt5njAia9iwaVtwP8LlgM5Uqjk2MFdxtfNFnT/ABv629JFwQ rLMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688911192; x=1691503192; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TOF0YX3biOvYXBmYgvIyMISz7K/doCgseRX4BopoSYk=; b=i4aYxFWFJwFrUjLrkTWzBLCseP532fVWxkCMAKCiupIT1Ea2OGO+4MGwufKWlrLL77 kRiXgwIqhMotlmMXA8kfyhq5Ftkhl3wtsabLGv+fY3Qbtv2ggBZjky1cixWCVd+9SQcj r+f+annlAnrc9k/1lhaQTx9yO9bLhTQQrQ9lsblr0uy1ntiQahJicvFVUDlolRaNT36i e7sKStbtZ1Fe3sPkL31XEoX5T7u+jGQC3EqqDg4Uzs6NhxYKgoL+V4PZtj+C//9pteMV Funvd94efxl/wnxU0+kSjTJKWO99OZCKKHY8OMn/omx33ajdqA/2EPZM7uiku4WTw2p6 jZ+Q== X-Gm-Message-State: ABy/qLa0t8rrwg9TV9gin4KXoioyj3iji/FGvha9vvn4UiOk40gf9V2t 89A+l47JBAONXXOGctSSZTzBOgSj++gtK3LE/eEKwg== X-Received: by 2002:a05:6000:1cc2:b0:311:9a5:2d63 with SMTP id bf2-20020a0560001cc200b0031109a52d63mr7200703wrb.42.1688911192600; Sun, 09 Jul 2023 06:59:52 -0700 (PDT) Received: from stoup.. ([148.252.133.210]) by smtp.gmail.com with ESMTPSA id v18-20020a5d6792000000b003063a92bbf5sm9239422wru.70.2023.07.09.06.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jul 2023 06:59:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Subject: [PULL 06/37] crypto: Add aesdec_ISB_ISR_AK Date: Sun, 9 Jul 2023 14:59:14 +0100 Message-Id: <20230709135945.250311-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230709135945.250311-1-richard.henderson@linaro.org> References: <20230709135945.250311-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Add a primitive for InvSubBytes + InvShiftRows + AddRoundKey. Reviewed-by: Daniel P. Berrangé Signed-off-by: Richard Henderson --- host/include/generic/host/crypto/aes-round.h | 4 ++ include/crypto/aes-round.h | 21 +++++++++ crypto/aes.c | 45 ++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/host/include/generic/host/crypto/aes-round.h b/host/include/generic/host/crypto/aes-round.h index c5d8066179..c9b9d732f0 100644 --- a/host/include/generic/host/crypto/aes-round.h +++ b/host/include/generic/host/crypto/aes-round.h @@ -13,4 +13,8 @@ void aesenc_SB_SR_AK_accel(AESState *, const AESState *, const AESState *, bool) QEMU_ERROR("unsupported accel"); +void aesdec_ISB_ISR_AK_accel(AESState *, const AESState *, + const AESState *, bool) + QEMU_ERROR("unsupported accel"); + #endif /* GENERIC_HOST_CRYPTO_AES_ROUND_H */ diff --git a/include/crypto/aes-round.h b/include/crypto/aes-round.h index b85db1a30e..dcf098b97b 100644 --- a/include/crypto/aes-round.h +++ b/include/crypto/aes-round.h @@ -41,4 +41,25 @@ static inline void aesenc_SB_SR_AK(AESState *r, const AESState *st, } } +/* + * Perform InvSubBytes + InvShiftRows + AddRoundKey. + */ + +void aesdec_ISB_ISR_AK_gen(AESState *ret, const AESState *st, + const AESState *rk); +void aesdec_ISB_ISR_AK_genrev(AESState *ret, const AESState *st, + const AESState *rk); + +static inline void aesdec_ISB_ISR_AK(AESState *r, const AESState *st, + const AESState *rk, bool be) +{ + if (HAVE_AES_ACCEL) { + aesdec_ISB_ISR_AK_accel(r, st, rk, be); + } else if (HOST_BIG_ENDIAN == be) { + aesdec_ISB_ISR_AK_gen(r, st, rk); + } else { + aesdec_ISB_ISR_AK_genrev(r, st, rk); + } +} + #endif /* CRYPTO_AES_ROUND_H */ diff --git a/crypto/aes.c b/crypto/aes.c index 408d92b81f..90274c3706 100644 --- a/crypto/aes.c +++ b/crypto/aes.c @@ -1261,6 +1261,51 @@ void aesenc_SB_SR_AK_genrev(AESState *r, const AESState *s, const AESState *k) aesenc_SB_SR_AK_swap(r, s, k, true); } +/* + * Perform InvSubBytes + InvShiftRows + AddRoundKey. + */ +static inline void +aesdec_ISB_ISR_AK_swap(AESState *ret, const AESState *st, + const AESState *rk, bool swap) +{ + const int swap_b = swap ? 15 : 0; + AESState t; + + t.b[swap_b ^ 0x0] = AES_isbox[st->b[swap_b ^ AES_ISH(0x0)]]; + t.b[swap_b ^ 0x1] = AES_isbox[st->b[swap_b ^ AES_ISH(0x1)]]; + t.b[swap_b ^ 0x2] = AES_isbox[st->b[swap_b ^ AES_ISH(0x2)]]; + t.b[swap_b ^ 0x3] = AES_isbox[st->b[swap_b ^ AES_ISH(0x3)]]; + t.b[swap_b ^ 0x4] = AES_isbox[st->b[swap_b ^ AES_ISH(0x4)]]; + t.b[swap_b ^ 0x5] = AES_isbox[st->b[swap_b ^ AES_ISH(0x5)]]; + t.b[swap_b ^ 0x6] = AES_isbox[st->b[swap_b ^ AES_ISH(0x6)]]; + t.b[swap_b ^ 0x7] = AES_isbox[st->b[swap_b ^ AES_ISH(0x7)]]; + t.b[swap_b ^ 0x8] = AES_isbox[st->b[swap_b ^ AES_ISH(0x8)]]; + t.b[swap_b ^ 0x9] = AES_isbox[st->b[swap_b ^ AES_ISH(0x9)]]; + t.b[swap_b ^ 0xa] = AES_isbox[st->b[swap_b ^ AES_ISH(0xA)]]; + t.b[swap_b ^ 0xb] = AES_isbox[st->b[swap_b ^ AES_ISH(0xB)]]; + t.b[swap_b ^ 0xc] = AES_isbox[st->b[swap_b ^ AES_ISH(0xC)]]; + t.b[swap_b ^ 0xd] = AES_isbox[st->b[swap_b ^ AES_ISH(0xD)]]; + t.b[swap_b ^ 0xe] = AES_isbox[st->b[swap_b ^ AES_ISH(0xE)]]; + t.b[swap_b ^ 0xf] = AES_isbox[st->b[swap_b ^ AES_ISH(0xF)]]; + + /* + * Perform the AddRoundKey with generic vectors. + * This may be expanded to either host integer or host vector code. + * The key and output endianness match, so no bswap required. + */ + ret->v = t.v ^ rk->v; +} + +void aesdec_ISB_ISR_AK_gen(AESState *r, const AESState *s, const AESState *k) +{ + aesdec_ISB_ISR_AK_swap(r, s, k, false); +} + +void aesdec_ISB_ISR_AK_genrev(AESState *r, const AESState *s, const AESState *k) +{ + aesdec_ISB_ISR_AK_swap(r, s, k, true); +} + /** * Expand the cipher key into the encryption key schedule. */