From patchwork Sun Jul 9 13:59:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 700825 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp4741193wrs; Sun, 9 Jul 2023 07:02:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlFzRvnL8eQdvC6D60uQWeE8bMZiSaBwH/STwPfJsHBtD0PqT6vNJkLOzdfn5vU73fcfSI4I X-Received: by 2002:a05:622a:3c8:b0:403:3859:d20a with SMTP id k8-20020a05622a03c800b004033859d20amr11848543qtx.24.1688911370579; Sun, 09 Jul 2023 07:02:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688911370; cv=none; d=google.com; s=arc-20160816; b=M6mjp/aen4uD6dwrYCxxkubQjme6/B+9xml9JLcwSQKIyXP57vGROpjbU7WLIAEFR6 srImFPV81YEaQlGeAZirD+Kvxeg2sopTTHi8gLT1hc6syXZuHtNmDMeWs+0fGuEji81Q uMLG16vVT+TgJcjMk7opJVBIW+Ap9DRNuKzpSv6of56j79SoZJFO0c1pTZ1+zz1Wzyxt L5YuOKddwWmbHvu8TLBdlo79Iek5bCUUUMhlVdC8Qb48QmRlpStEaKl54L9E/0WHT8vP /gIMK7FCvnsvh4CznomVh/C6NAk79rqnbnrakC0OuWH4xWSgo90zm6QC+NBTWQNNvxeK 1tog== 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=NDeJ2wqT+fijtWONfLVnciqd4z0YwE/p9OnFcWQIM00=; b=sPkhGXb3y48iL6ln9u72WrpRxeE84Qvt+crM9fx7xIqaAt6U+faQEa38kIhYps3ybn M6Ma9nuPSm4rfMgTFaAHFgdKgiQYC5Ml7I0TrTrZl+J4x6RevqMh6Pxd3oM8ulPnhUXX 8m6usGao50XfE1GLWocMG/xe+ET8mpvzXtnswg30yuFvlHLKQx15BHzllm2tU80e/4Sk h9WhhWY5kAXw02XRCZrykh77Eqyhb0dVmIrF3Na09ZO5PNtJ9qLLQHsxBFnxM1ypK2v3 FDUHVPLCyuaX3j+Id2hhdY/QOViJbzAO2/aIhw7CgwETj29KoI9wXBzm5j2yBnQfDmSy hiSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ylW6zMUZ; 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 x8-20020ac85f08000000b00401e1c92d1csi4617194qta.586.2023.07.09.07.02.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Jul 2023 07:02:50 -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=ylW6zMUZ; 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 1qIUxY-0000TZ-43; Sun, 09 Jul 2023 10:00:20 -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 1qIUxB-0000LC-Ff for qemu-devel@nongnu.org; Sun, 09 Jul 2023 09:59:57 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qIUx9-0000N2-P3 for qemu-devel@nongnu.org; Sun, 09 Jul 2023 09:59:57 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-31297125334so2719193f8f.0 for ; Sun, 09 Jul 2023 06:59:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688911194; x=1691503194; 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=ylW6zMUZJDPODhE3mjOZt0HFrZeDCOvVVrSD+eWDuCSjVaFtg2uuEZvRG9q9cagbGz xrsRwHezE60v7YyPtaH31lzGPIReo0Jl5MkAM+9Nt43hFTtCkg8yYz5NofL+oiAkWwxN T6UbSfJ8d6ED4LCiEERZkt6PdEVCgdZt+HJeD5FI4FtNhQ1MnU9zhwD+HgCOIwNdsX+s Vq0cXvOHGWGHOp+c2512wuY0SU/jScX3EyXDC/4kaILGMGs7F+yDHXca+Y1Y2CoHrVoF 9zE+wKvY8ISdwgEt5CfU1FCoEVwTYiUCMtInZpyNLl7htFuaVC1slp4XXiZfd2qnXUrV ZLgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688911194; x=1691503194; 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=df9P41OTDwZtcG6WLBy4wgQQiacj+AoYG2/pU+jB+MvtW742GSuGZKEDhgvKDiJR9m 00zAvaAq+zdPbFiwNftFquEGfMl0QHPkJdAibpiQDdeNS0LJadmQ0XlqGAXx2T7dbd8K wWjuDT4BpOuPx+DLzEcD/GhMXiXPjp4CkYsZ3YHALtuMNQA2v4tv1oZXhnkVVs+xeO++ 7+b6g5jopgu4YzCgoDo78/eNa49lyb0Q6b8TMQOjTSgkPBiiRKvCFzL344RKxWWuAaEU fUVYH/itnqXox+QhjwTEhDaEAOj/tFfyTj3GcxKAmHW/r8KrcAUqiXRObczRrbI2jp+L g6bQ== X-Gm-Message-State: ABy/qLYefEoat2pa/DbttpNdAyvw9bFEJ1Ml5AyAmBIzMnTzvKYZk0KX I5BOgczDUpdiZm3YxVdsj7p9/H2fV5RhtBWMI01qdg== X-Received: by 2002:adf:fd44:0:b0:313:ebf3:850b with SMTP id h4-20020adffd44000000b00313ebf3850bmr11883810wrs.2.1688911194224; Sun, 09 Jul 2023 06:59:54 -0700 (PDT) Received: from stoup.. ([148.252.133.210]) by smtp.gmail.com with ESMTPSA id v18-20020a5d6792000000b003063a92bbf5sm9239422wru.70.2023.07.09.06.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jul 2023 06:59:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Subject: [PULL 08/37] crypto: Add aesdec_IMC Date: Sun, 9 Jul 2023 14:59:16 +0100 Message-Id: <20230709135945.250311-9-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::42b; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x42b.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 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. */