From patchwork Mon Jul 3 10:04:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 698662 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp1666661wrs; Mon, 3 Jul 2023 03:14:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7OZdP5PHEC1ES/kWGRK25kbVUUn3wgdzN7ytj/lvhtxZ9EQme6LXP6Se78fFRDY2sS0H2p X-Received: by 2002:ac8:7d8f:0:b0:401:dff1:75fe with SMTP id c15-20020ac87d8f000000b00401dff175femr12531559qtd.12.1688379284770; Mon, 03 Jul 2023 03:14:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688379284; cv=none; d=google.com; s=arc-20160816; b=BVeZ7abSzP3IQORXxlB6pFVwqwW+fJsuhgZWxvxwkK3dvKrelZYsACgJSpVqUnpSt3 cwt0hLZWnS+q5X3XJJnlDAq5zTT+YZoVLDApYnm3OKjOscdPuI7HTJJ6cy/Eqb6o3Pft 9VL6wtayGlImuT2LNRTqSsg8cYY0vGiY7lYfGFYQZq/7Io7eug9HKOYhogydIe/VjtdO F9IsJgbqhFT18cju0FS4brpB4bldoJ8ynsqdqv3Jm+V2pM0MjYf4xKCpz83MxkKyCI8i 4E05OihCvHuMaT2vsNAST4KIcUllWLjc/DMs5s6lkMqk4nZ/s5h3b61cNoR+0VFCZ3bu lVQQ== 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=1lNVmzIrZ20vaRM4z3bBKO9neuQ8i1reH4ftvygdvPI=; fh=yGBgCIAdw0xhdK58ttTTG5yX3hLvrsJsvO63zqD4x2E=; b=A8rvsBPcdp+u9nfdz80NL41NcHL2d5yk9VMCy0QGSyPbes+OO5xlZPPeX3E0/PEztM stFmZQQWIZcIQWE6ir/mGgojCYkg1rQ7vmNBfCb2xA2DCxJL+Db8dUudzkWiyWt9YzUK +tFDLsdR2UWd0UtTSuQmtsNI4A9QsQaDzrmix4EkJqOK45KMz6DldTgCK2i/rTdsIP1N mLfHKolOXq6Hwq6JR6PT9xT1fpaERGWU4enesoJHEvChLBwbY22Wqmy2kSl4IXfsmxg/ q3JpYUz8gsA9g9QQVo870gQx8bSU88S+rbSvLNOsEi53YOpzBdwJAzX20o/HnWcv1Bj6 lmMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Oq2U6BJt; 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 v34-20020a05622a18a200b0040320c76d80si7967614qtc.560.2023.07.03.03.14.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jul 2023 03:14:44 -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=Oq2U6BJt; 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 1qGGRb-00030k-BS; Mon, 03 Jul 2023 06:06:07 -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 1qGGRO-0002mD-5D for qemu-devel@nongnu.org; Mon, 03 Jul 2023 06:05:54 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qGGRG-0005lP-5i for qemu-devel@nongnu.org; Mon, 03 Jul 2023 06:05:53 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-314313f127fso1700374f8f.1 for ; Mon, 03 Jul 2023 03:05:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688378730; x=1690970730; 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=1lNVmzIrZ20vaRM4z3bBKO9neuQ8i1reH4ftvygdvPI=; b=Oq2U6BJtvZCWo/QGlpNyqGQkg4vJHq1IlhWRHI4sTjAp+jUkyM03l1u0bgm80DJDbk i76G67C32odZpKtUQZx6d8WbV8+D2zrsPekVKzfTMBwTf8uIc9oqfsTQKbfq+YAG7OP2 iF2j95Sig0j0Jk4BDy62R1m78hwKVP6ZfRcI51M2pqjFnPNlxRj9D57geagCSxHQqAxL aJMSf8G9hs3Ey13eRXnFJCpWd0BJ5Pp10ganplvv0UJJfg1A8h68XSus21hycZmBoAsQ G77Jb+xX8NEJL7Jo1OjHY/8hh8Rb47CDRB4mWOeAqkgLQcPJw6uFG08jKnf4g1y3hOdX nTkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688378730; x=1690970730; 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=1lNVmzIrZ20vaRM4z3bBKO9neuQ8i1reH4ftvygdvPI=; b=Tak+DKL1JrvovfKs3SQo0+F2b3qulKVsoRthAIuQqYx7BRvjLywk/KhKkfuRQ/SKOU xLyvaXF3CHN3OLlzKxACyy77NEPmeKhwk5OnAiCCL4Kfjk8Hv/2SnbkN7bXFXq7tV8MV P1X3REyxknsfzPo088zI/laJtZ0vtKBzGH/Z1dw5oeTQ2ueXqhYSjOc9f6LHRQMgIprp LMvK1qD5yzcbpQXtVDrSkLToCW0ypcgitagTBEer6awXdrM0n0BS80zshdfciWAlgtd1 9zZcbQ/+S/ntnMdtYM6P69rqLeLSzF/OTopow4+KEDr3wpiEQkILBs0IwYIdXCIJQcsn UBrg== X-Gm-Message-State: ABy/qLbUhPt0glLKJqgraEZ2FwsB8rAMY1YdhFC1ZbAAABkWwLCfsDJ/ Xb7FHrQMugnb7/lOglvhQ9K9f5i6Ija2zxg/is0wjQ== X-Received: by 2002:adf:e4cd:0:b0:314:367f:15f3 with SMTP id v13-20020adfe4cd000000b00314367f15f3mr3271427wrm.9.1688378730536; Mon, 03 Jul 2023 03:05:30 -0700 (PDT) Received: from stoup.home (91.232.79.188.dynamic.jazztel.es. [188.79.232.91]) by smtp.gmail.com with ESMTPSA id t5-20020a05600001c500b00313f7b077fesm18446562wrx.59.2023.07.03.03.05.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jul 2023 03:05:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-riscv@nongnu.org, pbonzini@redhat.com, eduardo@habkost.net, alistair.francis@wdc.com, danielhb413@gmail.com, =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Subject: [PATCH v4 08/37] crypto: Add aesdec_IMC Date: Mon, 3 Jul 2023 12:04:51 +0200 Message-Id: <20230703100520.68224-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230703100520.68224-1-richard.henderson@linaro.org> References: <20230703100520.68224-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x42a.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=unavailable 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 InvMixColumns. Acked-by: Daniel P. Berrangé Signed-off-by: Richard Henderson --- host/include/generic/host/crypto/aes-round.h | 2 + include/crypto/aes-round.h | 18 ++++++ crypto/aes.c | 59 ++++++++++++++++++++ 3 files changed, 79 insertions(+) diff --git a/host/include/generic/host/crypto/aes-round.h b/host/include/generic/host/crypto/aes-round.h index 1b82afc629..335ec3f11e 100644 --- a/host/include/generic/host/crypto/aes-round.h +++ b/host/include/generic/host/crypto/aes-round.h @@ -15,6 +15,8 @@ void aesenc_SB_SR_AK_accel(AESState *, const AESState *, const AESState *, bool) QEMU_ERROR("unsupported accel"); +void aesdec_IMC_accel(AESState *, const AESState *, bool) + QEMU_ERROR("unsupported accel"); void aesdec_ISB_ISR_AK_accel(AESState *, const AESState *, const AESState *, bool) QEMU_ERROR("unsupported accel"); diff --git a/include/crypto/aes-round.h b/include/crypto/aes-round.h index 7d2be40a67..7be2cc0d8e 100644 --- a/include/crypto/aes-round.h +++ b/include/crypto/aes-round.h @@ -59,6 +59,24 @@ static inline void aesenc_SB_SR_AK(AESState *r, const AESState *st, } } +/* + * Perform InvMixColumns. + */ + +void aesdec_IMC_gen(AESState *ret, const AESState *st); +void aesdec_IMC_genrev(AESState *ret, const AESState *st); + +static inline void aesdec_IMC(AESState *r, const AESState *st, bool be) +{ + if (HAVE_AES_ACCEL) { + aesdec_IMC_accel(r, st, be); + } else if (HOST_BIG_ENDIAN == be) { + aesdec_IMC_gen(r, st); + } else { + aesdec_IMC_genrev(r, st); + } +} + /* * Perform InvSubBytes + InvShiftRows + AddRoundKey. */ diff --git a/crypto/aes.c b/crypto/aes.c index ec300cda0c..6c05d731f4 100644 --- a/crypto/aes.c +++ b/crypto/aes.c @@ -1322,6 +1322,65 @@ void aesenc_SB_SR_AK_genrev(AESState *r, const AESState *s, const AESState *k) aesenc_SB_SR_AK_swap(r, s, k, true); } +/* + * Perform InvMixColumns. + */ +static inline void +aesdec_IMC_swap(AESState *r, const AESState *st, bool swap) +{ + int swap_b = swap * 0xf; + int swap_w = swap * 0x3; + bool be = HOST_BIG_ENDIAN ^ swap; + uint32_t t; + + /* Note that AES_imc is encoded for big-endian. */ + t = (AES_imc[st->b[swap_b ^ 0x0]][0] ^ + AES_imc[st->b[swap_b ^ 0x1]][1] ^ + AES_imc[st->b[swap_b ^ 0x2]][2] ^ + AES_imc[st->b[swap_b ^ 0x3]][3]); + if (!be) { + t = bswap32(t); + } + r->w[swap_w ^ 0] = t; + + t = (AES_imc[st->b[swap_b ^ 0x4]][0] ^ + AES_imc[st->b[swap_b ^ 0x5]][1] ^ + AES_imc[st->b[swap_b ^ 0x6]][2] ^ + AES_imc[st->b[swap_b ^ 0x7]][3]); + if (!be) { + t = bswap32(t); + } + r->w[swap_w ^ 1] = t; + + t = (AES_imc[st->b[swap_b ^ 0x8]][0] ^ + AES_imc[st->b[swap_b ^ 0x9]][1] ^ + AES_imc[st->b[swap_b ^ 0xA]][2] ^ + AES_imc[st->b[swap_b ^ 0xB]][3]); + if (!be) { + t = bswap32(t); + } + r->w[swap_w ^ 2] = t; + + t = (AES_imc[st->b[swap_b ^ 0xC]][0] ^ + AES_imc[st->b[swap_b ^ 0xD]][1] ^ + AES_imc[st->b[swap_b ^ 0xE]][2] ^ + AES_imc[st->b[swap_b ^ 0xF]][3]); + if (!be) { + t = bswap32(t); + } + r->w[swap_w ^ 3] = t; +} + +void aesdec_IMC_gen(AESState *r, const AESState *st) +{ + aesdec_IMC_swap(r, st, false); +} + +void aesdec_IMC_genrev(AESState *r, const AESState *st) +{ + aesdec_IMC_swap(r, st, true); +} + /* * Perform InvSubBytes + InvShiftRows + AddRoundKey. */