From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C0754C433F5 for ; Tue, 18 Jan 2022 01:13:26 +0000 (UTC) Received: from localhost ([::1]:36524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9d3t-0006x0-Iv for qemu-devel@archiver.kernel.org; Mon, 17 Jan 2022 20:13:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9d0Z-0005vb-9n; Mon, 17 Jan 2022 20:09:59 -0500 Received: from smtp21.cstnet.cn ([159.226.251.21]:51956 helo=cstnet.cn) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9d0W-0002iR-3q; Mon, 17 Jan 2022 20:09:59 -0500 Received: from [192.168.0.104] (unknown [180.156.147.178]) by APP-01 (Coremail) with SMTP id qwCowAB3f1dXE+ZhFlCLBg--.50102S2; Tue, 18 Jan 2022 09:09:44 +0800 (CST) Subject: Re: [PATCH v4 3/7] crypto include/crypto target/arm: move sm4_sbox to crypto To: Alistair Francis References: <20220111035124.9468-1-liweiwei@iscas.ac.cn> <20220111035124.9468-4-liweiwei@iscas.ac.cn> From: Weiwei Li Message-ID: Date: Tue, 18 Jan 2022 09:09:43 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-CM-TRANSID: qwCowAB3f1dXE+ZhFlCLBg--.50102S2 X-Coremail-Antispam: 1UD129KBjvJXoWxtrW8ZFW5GF17Xw18Zw4fXwb_yoWxAF1fpr 98Gw1rtr4rXrn7t3yavr1Fyry0yry0kF15Aw4Iyr10va97Gws5GF9IyrW8CrWUAr15CFyf ZF92vr18JF15tFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBq14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr 1j6F4UJwAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv 7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r 1j6r4UM4x0Y48IcVAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628v n2kIc2xKxwCYjI0SjxkI62AI1cAE67vIY487MxkF7I0Ew4C26cxK6c8Ij28IcwCF04k20x vY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I 3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIx AIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAI cVCF04k26cxKx2IYs7xG6rW3Jr0E3s1lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z2 80aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUj0JPtUUUUU== X-Originating-IP: [180.156.147.178] X-CM-SenderInfo: 5olzvxxzhlqxpvfd2hldfou0/ Received-SPF: pass client-ip=159.226.251.21; envelope-from=liweiwei@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: , Cc: lazyparser@gmail.com, "open list:RISC-V" , lustrew@foxmail.com, wangjunqiang , Bin Meng , Richard Henderson , "qemu-devel@nongnu.org Developers" , Palmer Dabbelt , luruibo2000@163.com, Alistair Francis Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 在 2022/1/18 上午7:28, Alistair Francis 写道: > On Tue, Jan 11, 2022 at 1:57 PM Weiwei Li wrote: >> - share it between target/arm and target/riscv >> >> Signed-off-by: Weiwei Li >> Signed-off-by: Junqiang Wang >> Reviewed-by: Philippe Mathieu-Daudé > Do you mind fixing up the commit title? > > Maybe something more like: > > crypto: move sm4_sbox from target/arm > > Otherwise: > > Reviewed-by: Alistair Francis > > Alistair > > Alistair OK. I'll change this. Thanks for your comment. Regards, Weiwei Li >> --- >> crypto/meson.build | 1 + >> crypto/sm4.c | 49 ++++++++++++++++++++++++++++++++++++++ >> include/crypto/sm4.h | 6 +++++ >> target/arm/crypto_helper.c | 36 +--------------------------- >> 4 files changed, 57 insertions(+), 35 deletions(-) >> create mode 100644 crypto/sm4.c >> create mode 100644 include/crypto/sm4.h >> >> diff --git a/crypto/meson.build b/crypto/meson.build >> index 95a6a83504..f659fc9035 100644 >> --- a/crypto/meson.build >> +++ b/crypto/meson.build >> @@ -38,6 +38,7 @@ crypto_ss.add(when: 'CONFIG_SECRET_KEYRING', if_true: files('secret_keyring.c')) >> crypto_ss.add(when: 'CONFIG_AF_ALG', if_true: files('afalg.c', 'cipher-afalg.c', 'hash-afalg.c')) >> crypto_ss.add(when: gnutls, if_true: files('tls-cipher-suites.c')) >> >> +util_ss.add(files('sm4.c')) >> util_ss.add(files('aes.c')) >> util_ss.add(files('init.c')) >> if gnutls.found() >> diff --git a/crypto/sm4.c b/crypto/sm4.c >> new file mode 100644 >> index 0000000000..9f0cd452c7 >> --- /dev/null >> +++ b/crypto/sm4.c >> @@ -0,0 +1,49 @@ >> +/* >> + * QEMU crypto sm4 support >> + * >> + * Copyright (C) 2013 - 2018 Linaro Ltd >> + * >> + * This library is free software; you can redistribute it and/or >> + * modify it under the terms of the GNU Lesser General Public >> + * License as published by the Free Software Foundation; either >> + * version 2.1 of the License, or (at your option) any later version. >> + */ >> + >> +#include "qemu/osdep.h" >> +#include "crypto/sm4.h" >> + >> +uint8_t const sm4_sbox[] = { >> + 0xd6, 0x90, 0xe9, 0xfe, 0xcc, 0xe1, 0x3d, 0xb7, >> + 0x16, 0xb6, 0x14, 0xc2, 0x28, 0xfb, 0x2c, 0x05, >> + 0x2b, 0x67, 0x9a, 0x76, 0x2a, 0xbe, 0x04, 0xc3, >> + 0xaa, 0x44, 0x13, 0x26, 0x49, 0x86, 0x06, 0x99, >> + 0x9c, 0x42, 0x50, 0xf4, 0x91, 0xef, 0x98, 0x7a, >> + 0x33, 0x54, 0x0b, 0x43, 0xed, 0xcf, 0xac, 0x62, >> + 0xe4, 0xb3, 0x1c, 0xa9, 0xc9, 0x08, 0xe8, 0x95, >> + 0x80, 0xdf, 0x94, 0xfa, 0x75, 0x8f, 0x3f, 0xa6, >> + 0x47, 0x07, 0xa7, 0xfc, 0xf3, 0x73, 0x17, 0xba, >> + 0x83, 0x59, 0x3c, 0x19, 0xe6, 0x85, 0x4f, 0xa8, >> + 0x68, 0x6b, 0x81, 0xb2, 0x71, 0x64, 0xda, 0x8b, >> + 0xf8, 0xeb, 0x0f, 0x4b, 0x70, 0x56, 0x9d, 0x35, >> + 0x1e, 0x24, 0x0e, 0x5e, 0x63, 0x58, 0xd1, 0xa2, >> + 0x25, 0x22, 0x7c, 0x3b, 0x01, 0x21, 0x78, 0x87, >> + 0xd4, 0x00, 0x46, 0x57, 0x9f, 0xd3, 0x27, 0x52, >> + 0x4c, 0x36, 0x02, 0xe7, 0xa0, 0xc4, 0xc8, 0x9e, >> + 0xea, 0xbf, 0x8a, 0xd2, 0x40, 0xc7, 0x38, 0xb5, >> + 0xa3, 0xf7, 0xf2, 0xce, 0xf9, 0x61, 0x15, 0xa1, >> + 0xe0, 0xae, 0x5d, 0xa4, 0x9b, 0x34, 0x1a, 0x55, >> + 0xad, 0x93, 0x32, 0x30, 0xf5, 0x8c, 0xb1, 0xe3, >> + 0x1d, 0xf6, 0xe2, 0x2e, 0x82, 0x66, 0xca, 0x60, >> + 0xc0, 0x29, 0x23, 0xab, 0x0d, 0x53, 0x4e, 0x6f, >> + 0xd5, 0xdb, 0x37, 0x45, 0xde, 0xfd, 0x8e, 0x2f, >> + 0x03, 0xff, 0x6a, 0x72, 0x6d, 0x6c, 0x5b, 0x51, >> + 0x8d, 0x1b, 0xaf, 0x92, 0xbb, 0xdd, 0xbc, 0x7f, >> + 0x11, 0xd9, 0x5c, 0x41, 0x1f, 0x10, 0x5a, 0xd8, >> + 0x0a, 0xc1, 0x31, 0x88, 0xa5, 0xcd, 0x7b, 0xbd, >> + 0x2d, 0x74, 0xd0, 0x12, 0xb8, 0xe5, 0xb4, 0xb0, >> + 0x89, 0x69, 0x97, 0x4a, 0x0c, 0x96, 0x77, 0x7e, >> + 0x65, 0xb9, 0xf1, 0x09, 0xc5, 0x6e, 0xc6, 0x84, >> + 0x18, 0xf0, 0x7d, 0xec, 0x3a, 0xdc, 0x4d, 0x20, >> + 0x79, 0xee, 0x5f, 0x3e, 0xd7, 0xcb, 0x39, 0x48, >> +}; >> + >> diff --git a/include/crypto/sm4.h b/include/crypto/sm4.h >> new file mode 100644 >> index 0000000000..9bd3ebc62e >> --- /dev/null >> +++ b/include/crypto/sm4.h >> @@ -0,0 +1,6 @@ >> +#ifndef QEMU_SM4_H >> +#define QEMU_SM4_H >> + >> +extern const uint8_t sm4_sbox[256]; >> + >> +#endif >> diff --git a/target/arm/crypto_helper.c b/target/arm/crypto_helper.c >> index 28a84c2dbd..390020672a 100644 >> --- a/target/arm/crypto_helper.c >> +++ b/target/arm/crypto_helper.c >> @@ -15,6 +15,7 @@ >> #include "exec/helper-proto.h" >> #include "tcg/tcg-gvec-desc.h" >> #include "crypto/aes.h" >> +#include "crypto/sm4.h" >> #include "vec_internal.h" >> >> union CRYPTO_STATE { >> @@ -694,41 +695,6 @@ DO_SM3TT(crypto_sm3tt2b, 3) >> >> #undef DO_SM3TT >> >> -static uint8_t const sm4_sbox[] = { >> - 0xd6, 0x90, 0xe9, 0xfe, 0xcc, 0xe1, 0x3d, 0xb7, >> - 0x16, 0xb6, 0x14, 0xc2, 0x28, 0xfb, 0x2c, 0x05, >> - 0x2b, 0x67, 0x9a, 0x76, 0x2a, 0xbe, 0x04, 0xc3, >> - 0xaa, 0x44, 0x13, 0x26, 0x49, 0x86, 0x06, 0x99, >> - 0x9c, 0x42, 0x50, 0xf4, 0x91, 0xef, 0x98, 0x7a, >> - 0x33, 0x54, 0x0b, 0x43, 0xed, 0xcf, 0xac, 0x62, >> - 0xe4, 0xb3, 0x1c, 0xa9, 0xc9, 0x08, 0xe8, 0x95, >> - 0x80, 0xdf, 0x94, 0xfa, 0x75, 0x8f, 0x3f, 0xa6, >> - 0x47, 0x07, 0xa7, 0xfc, 0xf3, 0x73, 0x17, 0xba, >> - 0x83, 0x59, 0x3c, 0x19, 0xe6, 0x85, 0x4f, 0xa8, >> - 0x68, 0x6b, 0x81, 0xb2, 0x71, 0x64, 0xda, 0x8b, >> - 0xf8, 0xeb, 0x0f, 0x4b, 0x70, 0x56, 0x9d, 0x35, >> - 0x1e, 0x24, 0x0e, 0x5e, 0x63, 0x58, 0xd1, 0xa2, >> - 0x25, 0x22, 0x7c, 0x3b, 0x01, 0x21, 0x78, 0x87, >> - 0xd4, 0x00, 0x46, 0x57, 0x9f, 0xd3, 0x27, 0x52, >> - 0x4c, 0x36, 0x02, 0xe7, 0xa0, 0xc4, 0xc8, 0x9e, >> - 0xea, 0xbf, 0x8a, 0xd2, 0x40, 0xc7, 0x38, 0xb5, >> - 0xa3, 0xf7, 0xf2, 0xce, 0xf9, 0x61, 0x15, 0xa1, >> - 0xe0, 0xae, 0x5d, 0xa4, 0x9b, 0x34, 0x1a, 0x55, >> - 0xad, 0x93, 0x32, 0x30, 0xf5, 0x8c, 0xb1, 0xe3, >> - 0x1d, 0xf6, 0xe2, 0x2e, 0x82, 0x66, 0xca, 0x60, >> - 0xc0, 0x29, 0x23, 0xab, 0x0d, 0x53, 0x4e, 0x6f, >> - 0xd5, 0xdb, 0x37, 0x45, 0xde, 0xfd, 0x8e, 0x2f, >> - 0x03, 0xff, 0x6a, 0x72, 0x6d, 0x6c, 0x5b, 0x51, >> - 0x8d, 0x1b, 0xaf, 0x92, 0xbb, 0xdd, 0xbc, 0x7f, >> - 0x11, 0xd9, 0x5c, 0x41, 0x1f, 0x10, 0x5a, 0xd8, >> - 0x0a, 0xc1, 0x31, 0x88, 0xa5, 0xcd, 0x7b, 0xbd, >> - 0x2d, 0x74, 0xd0, 0x12, 0xb8, 0xe5, 0xb4, 0xb0, >> - 0x89, 0x69, 0x97, 0x4a, 0x0c, 0x96, 0x77, 0x7e, >> - 0x65, 0xb9, 0xf1, 0x09, 0xc5, 0x6e, 0xc6, 0x84, >> - 0x18, 0xf0, 0x7d, 0xec, 0x3a, 0xdc, 0x4d, 0x20, >> - 0x79, 0xee, 0x5f, 0x3e, 0xd7, 0xcb, 0x39, 0x48, >> -}; >> - >> static void do_crypto_sm4e(uint64_t *rd, uint64_t *rn, uint64_t *rm) >> { >> union CRYPTO_STATE d = { .l = { rn[0], rn[1] } }; >> -- >> 2.17.1 >> >> From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1n9d0a-0005vo-JV for mharc-qemu-riscv@gnu.org; Mon, 17 Jan 2022 20:10:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9d0Z-0005vb-9n; Mon, 17 Jan 2022 20:09:59 -0500 Received: from smtp21.cstnet.cn ([159.226.251.21]:51956 helo=cstnet.cn) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9d0W-0002iR-3q; Mon, 17 Jan 2022 20:09:59 -0500 Received: from [192.168.0.104] (unknown [180.156.147.178]) by APP-01 (Coremail) with SMTP id qwCowAB3f1dXE+ZhFlCLBg--.50102S2; Tue, 18 Jan 2022 09:09:44 +0800 (CST) Subject: Re: [PATCH v4 3/7] crypto include/crypto target/arm: move sm4_sbox to crypto To: Alistair Francis Cc: Richard Henderson , Palmer Dabbelt , Alistair Francis , Bin Meng , "open list:RISC-V" , "qemu-devel@nongnu.org Developers" , wangjunqiang , lazyparser@gmail.com, luruibo2000@163.com, lustrew@foxmail.com References: <20220111035124.9468-1-liweiwei@iscas.ac.cn> <20220111035124.9468-4-liweiwei@iscas.ac.cn> From: Weiwei Li Message-ID: Date: Tue, 18 Jan 2022 09:09:43 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-CM-TRANSID: qwCowAB3f1dXE+ZhFlCLBg--.50102S2 X-Coremail-Antispam: 1UD129KBjvJXoWxtrW8ZFW5GF17Xw18Zw4fXwb_yoWxAF1fpr 98Gw1rtr4rXrn7t3yavr1Fyry0yry0kF15Aw4Iyr10va97Gws5GF9IyrW8CrWUAr15CFyf ZF92vr18JF15tFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBq14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr 1j6F4UJwAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv 7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r 1j6r4UM4x0Y48IcVAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628v n2kIc2xKxwCYjI0SjxkI62AI1cAE67vIY487MxkF7I0Ew4C26cxK6c8Ij28IcwCF04k20x vY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I 3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIx AIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAI cVCF04k26cxKx2IYs7xG6rW3Jr0E3s1lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z2 80aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUj0JPtUUUUU== X-Originating-IP: [180.156.147.178] X-CM-SenderInfo: 5olzvxxzhlqxpvfd2hldfou0/ Received-SPF: pass client-ip=159.226.251.21; envelope-from=liweiwei@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2022 01:09:59 -0000 在 2022/1/18 上午7:28, Alistair Francis 写道: > On Tue, Jan 11, 2022 at 1:57 PM Weiwei Li wrote: >> - share it between target/arm and target/riscv >> >> Signed-off-by: Weiwei Li >> Signed-off-by: Junqiang Wang >> Reviewed-by: Philippe Mathieu-Daudé > Do you mind fixing up the commit title? > > Maybe something more like: > > crypto: move sm4_sbox from target/arm > > Otherwise: > > Reviewed-by: Alistair Francis > > Alistair > > Alistair OK. I'll change this. Thanks for your comment. Regards, Weiwei Li >> --- >> crypto/meson.build | 1 + >> crypto/sm4.c | 49 ++++++++++++++++++++++++++++++++++++++ >> include/crypto/sm4.h | 6 +++++ >> target/arm/crypto_helper.c | 36 +--------------------------- >> 4 files changed, 57 insertions(+), 35 deletions(-) >> create mode 100644 crypto/sm4.c >> create mode 100644 include/crypto/sm4.h >> >> diff --git a/crypto/meson.build b/crypto/meson.build >> index 95a6a83504..f659fc9035 100644 >> --- a/crypto/meson.build >> +++ b/crypto/meson.build >> @@ -38,6 +38,7 @@ crypto_ss.add(when: 'CONFIG_SECRET_KEYRING', if_true: files('secret_keyring.c')) >> crypto_ss.add(when: 'CONFIG_AF_ALG', if_true: files('afalg.c', 'cipher-afalg.c', 'hash-afalg.c')) >> crypto_ss.add(when: gnutls, if_true: files('tls-cipher-suites.c')) >> >> +util_ss.add(files('sm4.c')) >> util_ss.add(files('aes.c')) >> util_ss.add(files('init.c')) >> if gnutls.found() >> diff --git a/crypto/sm4.c b/crypto/sm4.c >> new file mode 100644 >> index 0000000000..9f0cd452c7 >> --- /dev/null >> +++ b/crypto/sm4.c >> @@ -0,0 +1,49 @@ >> +/* >> + * QEMU crypto sm4 support >> + * >> + * Copyright (C) 2013 - 2018 Linaro Ltd >> + * >> + * This library is free software; you can redistribute it and/or >> + * modify it under the terms of the GNU Lesser General Public >> + * License as published by the Free Software Foundation; either >> + * version 2.1 of the License, or (at your option) any later version. >> + */ >> + >> +#include "qemu/osdep.h" >> +#include "crypto/sm4.h" >> + >> +uint8_t const sm4_sbox[] = { >> + 0xd6, 0x90, 0xe9, 0xfe, 0xcc, 0xe1, 0x3d, 0xb7, >> + 0x16, 0xb6, 0x14, 0xc2, 0x28, 0xfb, 0x2c, 0x05, >> + 0x2b, 0x67, 0x9a, 0x76, 0x2a, 0xbe, 0x04, 0xc3, >> + 0xaa, 0x44, 0x13, 0x26, 0x49, 0x86, 0x06, 0x99, >> + 0x9c, 0x42, 0x50, 0xf4, 0x91, 0xef, 0x98, 0x7a, >> + 0x33, 0x54, 0x0b, 0x43, 0xed, 0xcf, 0xac, 0x62, >> + 0xe4, 0xb3, 0x1c, 0xa9, 0xc9, 0x08, 0xe8, 0x95, >> + 0x80, 0xdf, 0x94, 0xfa, 0x75, 0x8f, 0x3f, 0xa6, >> + 0x47, 0x07, 0xa7, 0xfc, 0xf3, 0x73, 0x17, 0xba, >> + 0x83, 0x59, 0x3c, 0x19, 0xe6, 0x85, 0x4f, 0xa8, >> + 0x68, 0x6b, 0x81, 0xb2, 0x71, 0x64, 0xda, 0x8b, >> + 0xf8, 0xeb, 0x0f, 0x4b, 0x70, 0x56, 0x9d, 0x35, >> + 0x1e, 0x24, 0x0e, 0x5e, 0x63, 0x58, 0xd1, 0xa2, >> + 0x25, 0x22, 0x7c, 0x3b, 0x01, 0x21, 0x78, 0x87, >> + 0xd4, 0x00, 0x46, 0x57, 0x9f, 0xd3, 0x27, 0x52, >> + 0x4c, 0x36, 0x02, 0xe7, 0xa0, 0xc4, 0xc8, 0x9e, >> + 0xea, 0xbf, 0x8a, 0xd2, 0x40, 0xc7, 0x38, 0xb5, >> + 0xa3, 0xf7, 0xf2, 0xce, 0xf9, 0x61, 0x15, 0xa1, >> + 0xe0, 0xae, 0x5d, 0xa4, 0x9b, 0x34, 0x1a, 0x55, >> + 0xad, 0x93, 0x32, 0x30, 0xf5, 0x8c, 0xb1, 0xe3, >> + 0x1d, 0xf6, 0xe2, 0x2e, 0x82, 0x66, 0xca, 0x60, >> + 0xc0, 0x29, 0x23, 0xab, 0x0d, 0x53, 0x4e, 0x6f, >> + 0xd5, 0xdb, 0x37, 0x45, 0xde, 0xfd, 0x8e, 0x2f, >> + 0x03, 0xff, 0x6a, 0x72, 0x6d, 0x6c, 0x5b, 0x51, >> + 0x8d, 0x1b, 0xaf, 0x92, 0xbb, 0xdd, 0xbc, 0x7f, >> + 0x11, 0xd9, 0x5c, 0x41, 0x1f, 0x10, 0x5a, 0xd8, >> + 0x0a, 0xc1, 0x31, 0x88, 0xa5, 0xcd, 0x7b, 0xbd, >> + 0x2d, 0x74, 0xd0, 0x12, 0xb8, 0xe5, 0xb4, 0xb0, >> + 0x89, 0x69, 0x97, 0x4a, 0x0c, 0x96, 0x77, 0x7e, >> + 0x65, 0xb9, 0xf1, 0x09, 0xc5, 0x6e, 0xc6, 0x84, >> + 0x18, 0xf0, 0x7d, 0xec, 0x3a, 0xdc, 0x4d, 0x20, >> + 0x79, 0xee, 0x5f, 0x3e, 0xd7, 0xcb, 0x39, 0x48, >> +}; >> + >> diff --git a/include/crypto/sm4.h b/include/crypto/sm4.h >> new file mode 100644 >> index 0000000000..9bd3ebc62e >> --- /dev/null >> +++ b/include/crypto/sm4.h >> @@ -0,0 +1,6 @@ >> +#ifndef QEMU_SM4_H >> +#define QEMU_SM4_H >> + >> +extern const uint8_t sm4_sbox[256]; >> + >> +#endif >> diff --git a/target/arm/crypto_helper.c b/target/arm/crypto_helper.c >> index 28a84c2dbd..390020672a 100644 >> --- a/target/arm/crypto_helper.c >> +++ b/target/arm/crypto_helper.c >> @@ -15,6 +15,7 @@ >> #include "exec/helper-proto.h" >> #include "tcg/tcg-gvec-desc.h" >> #include "crypto/aes.h" >> +#include "crypto/sm4.h" >> #include "vec_internal.h" >> >> union CRYPTO_STATE { >> @@ -694,41 +695,6 @@ DO_SM3TT(crypto_sm3tt2b, 3) >> >> #undef DO_SM3TT >> >> -static uint8_t const sm4_sbox[] = { >> - 0xd6, 0x90, 0xe9, 0xfe, 0xcc, 0xe1, 0x3d, 0xb7, >> - 0x16, 0xb6, 0x14, 0xc2, 0x28, 0xfb, 0x2c, 0x05, >> - 0x2b, 0x67, 0x9a, 0x76, 0x2a, 0xbe, 0x04, 0xc3, >> - 0xaa, 0x44, 0x13, 0x26, 0x49, 0x86, 0x06, 0x99, >> - 0x9c, 0x42, 0x50, 0xf4, 0x91, 0xef, 0x98, 0x7a, >> - 0x33, 0x54, 0x0b, 0x43, 0xed, 0xcf, 0xac, 0x62, >> - 0xe4, 0xb3, 0x1c, 0xa9, 0xc9, 0x08, 0xe8, 0x95, >> - 0x80, 0xdf, 0x94, 0xfa, 0x75, 0x8f, 0x3f, 0xa6, >> - 0x47, 0x07, 0xa7, 0xfc, 0xf3, 0x73, 0x17, 0xba, >> - 0x83, 0x59, 0x3c, 0x19, 0xe6, 0x85, 0x4f, 0xa8, >> - 0x68, 0x6b, 0x81, 0xb2, 0x71, 0x64, 0xda, 0x8b, >> - 0xf8, 0xeb, 0x0f, 0x4b, 0x70, 0x56, 0x9d, 0x35, >> - 0x1e, 0x24, 0x0e, 0x5e, 0x63, 0x58, 0xd1, 0xa2, >> - 0x25, 0x22, 0x7c, 0x3b, 0x01, 0x21, 0x78, 0x87, >> - 0xd4, 0x00, 0x46, 0x57, 0x9f, 0xd3, 0x27, 0x52, >> - 0x4c, 0x36, 0x02, 0xe7, 0xa0, 0xc4, 0xc8, 0x9e, >> - 0xea, 0xbf, 0x8a, 0xd2, 0x40, 0xc7, 0x38, 0xb5, >> - 0xa3, 0xf7, 0xf2, 0xce, 0xf9, 0x61, 0x15, 0xa1, >> - 0xe0, 0xae, 0x5d, 0xa4, 0x9b, 0x34, 0x1a, 0x55, >> - 0xad, 0x93, 0x32, 0x30, 0xf5, 0x8c, 0xb1, 0xe3, >> - 0x1d, 0xf6, 0xe2, 0x2e, 0x82, 0x66, 0xca, 0x60, >> - 0xc0, 0x29, 0x23, 0xab, 0x0d, 0x53, 0x4e, 0x6f, >> - 0xd5, 0xdb, 0x37, 0x45, 0xde, 0xfd, 0x8e, 0x2f, >> - 0x03, 0xff, 0x6a, 0x72, 0x6d, 0x6c, 0x5b, 0x51, >> - 0x8d, 0x1b, 0xaf, 0x92, 0xbb, 0xdd, 0xbc, 0x7f, >> - 0x11, 0xd9, 0x5c, 0x41, 0x1f, 0x10, 0x5a, 0xd8, >> - 0x0a, 0xc1, 0x31, 0x88, 0xa5, 0xcd, 0x7b, 0xbd, >> - 0x2d, 0x74, 0xd0, 0x12, 0xb8, 0xe5, 0xb4, 0xb0, >> - 0x89, 0x69, 0x97, 0x4a, 0x0c, 0x96, 0x77, 0x7e, >> - 0x65, 0xb9, 0xf1, 0x09, 0xc5, 0x6e, 0xc6, 0x84, >> - 0x18, 0xf0, 0x7d, 0xec, 0x3a, 0xdc, 0x4d, 0x20, >> - 0x79, 0xee, 0x5f, 0x3e, 0xd7, 0xcb, 0x39, 0x48, >> -}; >> - >> static void do_crypto_sm4e(uint64_t *rd, uint64_t *rn, uint64_t *rm) >> { >> union CRYPTO_STATE d = { .l = { rn[0], rn[1] } }; >> -- >> 2.17.1 >> >>