From nobody Sat Nov 23 17:37:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1730249969; cv=none; d=zohomail.com; s=zohoarc; b=ig/hZodpivK2DzW9ky/8jcgtjrtHc57B+UdgKSnAxLCCLDvrjYo+AtTqYNaPTgNmnShs01lalr8Ks7svFDQF44nCJF/mMBGT5XiHUgxD51xzzqCPidgcIDDCwW0g48nyrtRx+hk1p5rsOF10TEVp0ZTFFE6EGMs3W6Mi+4CbiBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730249969; h=Content-Type:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=+pHztxssJif2BLB7dAmmda2DjTMV69nA+UprrXN0fJk=; b=OLeRc4SBJBMAYwNhi4StRUBH8cggqxOI7XVhVboATwK75vv6h97BEeeUvraBD2SBQnTaN/uqj9Y38C3Dv/wvRZN1dkf4EdCzjCq/oA9kHqiUcQdno+bUIYMJGRWDHwDoYrPpf9sZtgz3BBRGe6VBn/XH26GULgKT7uk8N2phjk0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1730249969473818.7949003389177; Tue, 29 Oct 2024 17:59:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5x2p-00005w-GD; Tue, 29 Oct 2024 20:58:43 -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 1t5x2k-00005g-FG for qemu-devel@nongnu.org; Tue, 29 Oct 2024 20:58:38 -0400 Received: from mail-oo1-xc2f.google.com ([2607:f8b0:4864:20::c2f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t5x2g-0005kB-Le for qemu-devel@nongnu.org; Tue, 29 Oct 2024 20:58:37 -0400 Received: by mail-oo1-xc2f.google.com with SMTP id 006d021491bc7-5eb70a779baso3220139eaf.1 for ; Tue, 29 Oct 2024 17:58:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730249913; x=1730854713; darn=nongnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=+pHztxssJif2BLB7dAmmda2DjTMV69nA+UprrXN0fJk=; b=i5KXPAFqIIBmgfThnSzvYdnFHVCjY9pU1JtbXoQAYMaMmFBFQ88Img2WV8bt/wzlG7 iz+VmlyfHldYAeZw4y6Wc6/erP9hUYnTCc8W4w5hvCRMSeNHbZuiEHG3dEQNpSXQ7wzE wRASI3vzMocMkz6C8rmOmYyOLtWTUqkoqdz8G6LFdK7+aU66E7li+5Ui8JDkBc5aJvpR /lkN2WTKi90APzllhREFsxMevlj7ddm0xY9oUQnFI7wkO4Fw5gwBKU99nH0n8Jj24/Ou EfA8QnqNMBE/98DbMwvIq87Os9OMFSIvjCWX1EyJUV1m6ZpD+kZ/vi6LxLaAlswWLj6V uxBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730249913; x=1730854713; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+pHztxssJif2BLB7dAmmda2DjTMV69nA+UprrXN0fJk=; b=ZDjKfYvZifYdnM03GHL3cKUKAnSZGJNDZxCwsyCbht6NOJ0BSRAA0DU4NhswhqUA7o BKmVRI1m6SIaKHuj+QEpBRR/E2Li10JOH3ZyOutkn54K2G2gnHQiaXA3qS0Cpgr4coNp aDT25uc8KtvbI94E+/kAtc2JNWZFsB6eiR7SFBGegEHA6gnIEOeEr0QTg9TneWlxlGr+ PBWuGR+tONuRrmRSNfaEC30Or69iH7fnbUf3TMpC/nthxiYumLH8DYVNMVfv/LDufrR0 NQgIAMjF/xhTwQAsSqPKwXDd3ZmNqTzCIQEAI1v9+Zeoq5BUOz2RTHPuce32b8faI0gD 7kLA== X-Gm-Message-State: AOJu0YyPZgEci8NSCBaZBezbL/05Me/Vu8GcYNdLoy5SvOvMMu2Cq/as eNlgo80NgWT8NjwJNeDovGzuSxYK8TXuVM3pJyXaZL87bLVxUFmDippJDetmmI1yEMhs3VUBVyU H7U9z8Ui86Atd7/t+2YVpZR6y76UYiQ== X-Google-Smtp-Source: AGHT+IGYdC3SqUSUp/uzbhOuPfijV9CnpSwMpgzV3ts4JUxAxOHPkDu9Ev+a864Mch1jgA73MaiesmxyEo+LKZyvLyU= X-Received: by 2002:a05:6358:72a:b0:1b8:21d6:6034 with SMTP id e5c5f4694b2df-1c5e32cb7e9mr234583755d.8.1730249912563; Tue, 29 Oct 2024 17:58:32 -0700 (PDT) MIME-Version: 1.0 From: liequan che Date: Wed, 30 Oct 2024 08:58:21 +0800 Message-ID: Subject: [PATCH V3] crypto: Introduce SM3 hash hmac pbkdf algorithm To: qemu-devel@nongnu.org, =?UTF-8?Q?Daniel_P=2E_Berrang=C3=A9?= Content-Type: multipart/alternative; boundary="000000000000693dd60625a7336a" Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::c2f; envelope-from=liequanche@gmail.com; helo=mail-oo1-xc2f.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, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1730249970415116600 Content-Transfer-Encoding: quoted-printable --000000000000693dd60625a7336a MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 SW50cm9kdWNlIHRoZSBTTTMgY3J5cHRvZ3JhcGhpYyBoYXNoIGFsZ29yaXRobSAoR0IvVCAzMjkw NS0yMDE2KS4KClNNMyAoR0IvVCAzMjkwNS0yMDE2KSBpcyBhIGNyeXB0b2dyYXBoaWMgc3RhbmRh cmQgaXNzdWVkIGJ5IHRoZQpPcmdhbml6YXRpb24gb2YgU3RhdGUgQ29tbWVyY2lhbCBDcnlwdG9n cmFwaHkgQWRtaW5pc3RyYXRpb24gKE9TQ0NBKQphcyBhbiBhdXRob3JpemVkIGNyeXB0b2dyYXBo aWMgYWxnb3JpdGhtIGZvciB1c2Ugd2l0aGluIENoaW5hLgoKRGV0ZWN0IHRoZSBTTTMgY3J5cHRv Z3JhcGhpYyBoYXNoIGFsZ29yaXRobSBhbmQgZW5hYmxlIHRoZSBmZWF0dXJlIHNpbGVudGx5Cmlm IGl0IGlzIGF2YWlsYWJsZS4KClNpZ25lZC1vZmYtYnk6IGNoZWxpZXF1YW4gPGNoZWxpZXF1YW5A aW5zcHVyLmNvbT4KLS0tCiBjcnlwdG8vaGFzaC1nY3J5cHQuYyAgICAgICAgICAgfCAgMyArKysK IGNyeXB0by9oYXNoLW5ldHRsZS5jICAgICAgICAgICB8IDE0ICsrKysrKysrKysrKwogY3J5cHRv L2hhc2guYyAgICAgICAgICAgICAgICAgIHwgIDMgKysrCiBjcnlwdG8vaG1hYy1nY3J5cHQuYyAg ICAgICAgICAgfCAgMyArKysKIGNyeXB0by9obWFjLW5ldHRsZS5jICAgICAgICAgICB8IDExICsr KysrKysrKysKIGNyeXB0by9wYmtkZi1nY3J5cHQuYyAgICAgICAgICB8ICA2ICsrKysrKwogY3J5 cHRvL3Bia2RmLW5ldHRsZS5jICAgICAgICAgIHwgMTMgKysrKysrKysrKysrCiBpbmNsdWRlL2Ny eXB0by9oYXNoLmggICAgICAgICAgfCAgMSArCiBtZXNvbi5idWlsZCAgICAgICAgICAgICAgICAg ICAgfCAzOSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBxYXBpL2NyeXB0by5q c29uICAgICAgICAgICAgICAgfCAgMyArKy0KIHRlc3RzL3VuaXQvdGVzdC1jcnlwdG8taGFzaC5j ICB8IDE2ICsrKysrKysrKysrKysrCiB0ZXN0cy91bml0L3Rlc3QtY3J5cHRvLWhtYWMuYyAgfCAg OCArKysrKysrCiB0ZXN0cy91bml0L3Rlc3QtY3J5cHRvLXBia2RmLmMgfCAxNiArKysrKysrKysr KysrKwogMTMgZmlsZXMgY2hhbmdlZCwgMTM1IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkK CmRpZmYgLS1naXQgYS9jcnlwdG8vaGFzaC1nY3J5cHQuYyBiL2NyeXB0by9oYXNoLWdjcnlwdC5j CmluZGV4IDczNTMzYTQ5NDkuLmYwNGE5ZjU1M2MgMTAwNjQ0Ci0tLSBhL2NyeXB0by9oYXNoLWdj cnlwdC5jCisrKyBiL2NyeXB0by9oYXNoLWdjcnlwdC5jCkBAIC0zNCw2ICszNCw5IEBAIHN0YXRp YyBpbnQgcWNyeXB0b19oYXNoX2FsZ19tYXBbUUNSWVBUT19IQVNIX0FMR09fX01BWF0gPQo9M0QK ewogICAgIFtRQ1JZUFRPX0hBU0hfQUxHT19TSEEzODRdID0zRCBHQ1JZX01EX1NIQTM4NCwKICAg ICBbUUNSWVBUT19IQVNIX0FMR09fU0hBNTEyXSA9M0QgR0NSWV9NRF9TSEE1MTIsCiAgICAgW1FD UllQVE9fSEFTSF9BTEdPX1JJUEVNRDE2MF0gPTNEIEdDUllfTURfUk1EMTYwLAorI2lmZGVmIENP TkZJR19DUllQVE9fU00zCisgICAgW1FDUllQVE9fSEFTSF9BTEdPX1NNM10gPTNEIEdDUllfTURf U00zLAorI2VuZGlmCiB9OwoKIGdib29sZWFuIHFjcnlwdG9faGFzaF9zdXBwb3J0cyhRQ3J5cHRv SGFzaEFsZ28gYWxnKQpkaWZmIC0tZ2l0IGEvY3J5cHRvL2hhc2gtbmV0dGxlLmMgYi9jcnlwdG8v aGFzaC1uZXR0bGUuYwppbmRleCBjNzg2MjRiMzQ3Li41M2Y2ODMwMWVmIDEwMDY0NAotLS0gYS9j cnlwdG8vaGFzaC1uZXR0bGUuYworKysgYi9jcnlwdG8vaGFzaC1uZXR0bGUuYwpAQCAtMjYsNiAr MjYsOSBAQAogI2luY2x1ZGUgPG5ldHRsZS9tZDUuaD4KICNpbmNsdWRlIDxuZXR0bGUvc2hhLmg+ CiAjaW5jbHVkZSA8bmV0dGxlL3JpcGVtZDE2MC5oPgorI2lmZGVmIENPTkZJR19DUllQVE9fU00z CisjaW5jbHVkZSA8bmV0dGxlL3NtMy5oPgorI2VuZGlmCgogdHlwZWRlZiB2b2lkICgqcWNyeXB0 b19uZXR0bGVfaW5pdCkodm9pZCAqY3R4KTsKIHR5cGVkZWYgdm9pZCAoKnFjcnlwdG9fbmV0dGxl X3dyaXRlKSh2b2lkICpjdHgsCkBAIC00Myw2ICs0Niw5IEBAIHVuaW9uIHFjcnlwdG9faGFzaF9j dHggewogICAgIHN0cnVjdCBzaGEzODRfY3R4IHNoYTM4NDsKICAgICBzdHJ1Y3Qgc2hhNTEyX2N0 eCBzaGE1MTI7CiAgICAgc3RydWN0IHJpcGVtZDE2MF9jdHggcmlwZW1kMTYwOworI2lmZGVmIENP TkZJR19DUllQVE9fU00zCisgICAgc3RydWN0IHNtM19jdHggc20zOworI2VuZGlmCiB9OwoKIHN0 cnVjdCBxY3J5cHRvX2hhc2hfYWxnIHsKQEAgLTkzLDYgKzk5LDE0IEBAIHN0cnVjdCBxY3J5cHRv X2hhc2hfYWxnIHsKICAgICAgICAgLnJlc3VsdCA9M0QgKHFjcnlwdG9fbmV0dGxlX3Jlc3VsdCly aXBlbWQxNjBfZGlnZXN0LAogICAgICAgICAubGVuID0zRCBSSVBFTUQxNjBfRElHRVNUX1NJWkUs CiAgICAgfSwKKyNpZmRlZiBDT05GSUdfQ1JZUFRPX1NNMworICAgIFtRQ1JZUFRPX0hBU0hfQUxH T19TTTNdID0zRCB7CisgICAgICAgIC5pbml0ID0zRCAocWNyeXB0b19uZXR0bGVfaW5pdClzbTNf aW5pdCwKKyAgICAgICAgLndyaXRlID0zRCAocWNyeXB0b19uZXR0bGVfd3JpdGUpc20zX3VwZGF0 ZSwKKyAgICAgICAgLnJlc3VsdCA9M0QgKHFjcnlwdG9fbmV0dGxlX3Jlc3VsdClzbTNfZGlnZXN0 LAorICAgICAgICAubGVuID0zRCBTTTNfRElHRVNUX1NJWkUsCisgICAgfSwKKyNlbmRpZgogfTsK CiBnYm9vbGVhbiBxY3J5cHRvX2hhc2hfc3VwcG9ydHMoUUNyeXB0b0hhc2hBbGdvIGFsZykKZGlm ZiAtLWdpdCBhL2NyeXB0by9oYXNoLmMgYi9jcnlwdG8vaGFzaC5jCmluZGV4IDBjODU0OGM1Njgu Ljc1MTM3NjllNDIgMTAwNjQ0Ci0tLSBhL2NyeXB0by9oYXNoLmMKKysrIGIvY3J5cHRvL2hhc2gu YwpAQCAtMzMsNiArMzMsOSBAQCBzdGF0aWMgc2l6ZV90CnFjcnlwdG9faGFzaF9hbGdfc2l6ZVtR Q1JZUFRPX0hBU0hfQUxHT19fTUFYXSA9M0QgewogICAgIFtRQ1JZUFRPX0hBU0hfQUxHT19TSEEz ODRdICAgID0zRCBRQ1JZUFRPX0hBU0hfRElHRVNUX0xFTl9TSEEzODQsCiAgICAgW1FDUllQVE9f SEFTSF9BTEdPX1NIQTUxMl0gICAgPTNEIFFDUllQVE9fSEFTSF9ESUdFU1RfTEVOX1NIQTUxMiwK ICAgICBbUUNSWVBUT19IQVNIX0FMR09fUklQRU1EMTYwXSA9M0QgUUNSWVBUT19IQVNIX0RJR0VT VF9MRU5fUklQRU1EMTYwLAorI2lmZGVmIENPTkZJR19DUllQVE9fU00zCisgICAgW1FDUllQVE9f SEFTSF9BTEdPX1NNM10gPTNEIFFDUllQVE9fSEFTSF9ESUdFU1RfTEVOX1NNMywKKyNlbmRpZgog fTsKCiBzaXplX3QgcWNyeXB0b19oYXNoX2RpZ2VzdF9sZW4oUUNyeXB0b0hhc2hBbGdvIGFsZykK ZGlmZiAtLWdpdCBhL2NyeXB0by9obWFjLWdjcnlwdC5jIGIvY3J5cHRvL2htYWMtZ2NyeXB0LmMK aW5kZXggMTk5OTBjYjZlZC4uMDkwZmUwMWMxZSAxMDA2NDQKLS0tIGEvY3J5cHRvL2htYWMtZ2Ny eXB0LmMKKysrIGIvY3J5cHRvL2htYWMtZ2NyeXB0LmMKQEAgLTI2LDYgKzI2LDkgQEAgc3RhdGlj IGludCBxY3J5cHRvX2htYWNfYWxnX21hcFtRQ1JZUFRPX0hBU0hfQUxHT19fTUFYXSA9Cj0zRAp7 CiAgICAgW1FDUllQVE9fSEFTSF9BTEdPX1NIQTM4NF0gPTNEIEdDUllfTUFDX0hNQUNfU0hBMzg0 LAogICAgIFtRQ1JZUFRPX0hBU0hfQUxHT19TSEE1MTJdID0zRCBHQ1JZX01BQ19ITUFDX1NIQTUx MiwKICAgICBbUUNSWVBUT19IQVNIX0FMR09fUklQRU1EMTYwXSA9M0QgR0NSWV9NQUNfSE1BQ19S TUQxNjAsCisjaWZkZWYgQ09ORklHX0NSWVBUT19TTTMKKyAgICBbUUNSWVBUT19IQVNIX0FMR09f U00zXSA9M0QgR0NSWV9NQUNfSE1BQ19TTTMsCisjZW5kaWYKIH07CgogdHlwZWRlZiBzdHJ1Y3Qg UUNyeXB0b0htYWNHY3J5cHQgUUNyeXB0b0htYWNHY3J5cHQ7CmRpZmYgLS1naXQgYS9jcnlwdG8v aG1hYy1uZXR0bGUuYyBiL2NyeXB0by9obWFjLW5ldHRsZS5jCmluZGV4IDU0ZGQ3NWQ1ZmYuLjQ3 NTVmMmNhY2EgMTAwNjQ0Ci0tLSBhL2NyeXB0by9obWFjLW5ldHRsZS5jCisrKyBiL2NyeXB0by9o bWFjLW5ldHRsZS5jCkBAIC0zOCw2ICszOCw5IEBAIHN0cnVjdCBRQ3J5cHRvSG1hY05ldHRsZSB7 CiAgICAgICAgIHN0cnVjdCBobWFjX3NoYTI1Nl9jdHggc2hhMjU2X2N0eDsgLyogZXF1YWxzIGht YWNfc2hhMjI0X2N0eCAqLwogICAgICAgICBzdHJ1Y3QgaG1hY19zaGE1MTJfY3R4IHNoYTUxMl9j dHg7IC8qIGVxdWFscyBobWFjX3NoYTM4NF9jdHggKi8KICAgICAgICAgc3RydWN0IGhtYWNfcmlw ZW1kMTYwX2N0eCByaXBlbWQxNjBfY3R4OworI2lmZGVmIENPTkZJR19DUllQVE9fU00zCisgc3Ry dWN0IGhtYWNfc20zX2N0eCBjdHg7CisjZW5kaWYKICAgICB9IHU7CiB9OwoKQEAgLTg5LDYgKzky LDE0IEBAIHN0cnVjdCBxY3J5cHRvX25ldHRsZV9obWFjX2FsZyB7CiAgICAgICAgIC5kaWdlc3Qg PTNEIChxY3J5cHRvX25ldHRsZV9obWFjX2RpZ2VzdClobWFjX3JpcGVtZDE2MF9kaWdlc3QsCiAg ICAgICAgIC5sZW4gPTNEIFJJUEVNRDE2MF9ESUdFU1RfU0laRSwKICAgICB9LAorI2lmZGVmIENP TkZJR19DUllQVE9fU00zCisgICAgW1FDUllQVE9fSEFTSF9BTEdPX1NNM10gPTNEIHsKKyAgICAg ICAgLnNldGtleSA9M0QgKHFjcnlwdG9fbmV0dGxlX2htYWNfc2V0a2V5KWhtYWNfc20zX3NldF9r ZXksCisgICAgICAgIC51cGRhdGUgPTNEIChxY3J5cHRvX25ldHRsZV9obWFjX3VwZGF0ZSlobWFj X3NtM191cGRhdGUsCisgICAgICAgIC5kaWdlc3QgPTNEIChxY3J5cHRvX25ldHRsZV9obWFjX2Rp Z2VzdClobWFjX3NtM19kaWdlc3QsCisgICAgICAgIC5sZW4gPTNEIFNNM19ESUdFU1RfU0laRSwK KyAgICB9LAorI2VuZGlmCiB9OwoKIGJvb2wgcWNyeXB0b19obWFjX3N1cHBvcnRzKFFDcnlwdG9I YXNoQWxnbyBhbGcpCmRpZmYgLS1naXQgYS9jcnlwdG8vcGJrZGYtZ2NyeXB0LmMgYi9jcnlwdG8v cGJrZGYtZ2NyeXB0LmMKaW5kZXggNzZiYmI1NWY3YS4uZTg5YjhiMWM3NiAxMDA2NDQKLS0tIGEv Y3J5cHRvL3Bia2RmLWdjcnlwdC5jCisrKyBiL2NyeXB0by9wYmtkZi1nY3J5cHQuYwpAQCAtMzMs NiArMzMsOSBAQCBib29sIHFjcnlwdG9fcGJrZGYyX3N1cHBvcnRzKFFDcnlwdG9IYXNoQWxnbyBo YXNoKQogICAgIGNhc2UgUUNSWVBUT19IQVNIX0FMR09fU0hBMzg0OgogICAgIGNhc2UgUUNSWVBU T19IQVNIX0FMR09fU0hBNTEyOgogICAgIGNhc2UgUUNSWVBUT19IQVNIX0FMR09fUklQRU1EMTYw OgorI2lmZGVmIENPTkZJR19DUllQVE9fU00zCisgICAgY2FzZSBRQ1JZUFRPX0hBU0hfQUxHT19T TTM6CisjZW5kaWYKICAgICAgICAgcmV0dXJuIHFjcnlwdG9faGFzaF9zdXBwb3J0cyhoYXNoKTsK ICAgICBkZWZhdWx0OgogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC01NCw2ICs1Nyw5IEBAIGlu dCBxY3J5cHRvX3Bia2RmMihRQ3J5cHRvSGFzaEFsZ28gaGFzaCwKICAgICAgICAgW1FDUllQVE9f SEFTSF9BTEdPX1NIQTM4NF0gPTNEIEdDUllfTURfU0hBMzg0LAogICAgICAgICBbUUNSWVBUT19I QVNIX0FMR09fU0hBNTEyXSA9M0QgR0NSWV9NRF9TSEE1MTIsCiAgICAgICAgIFtRQ1JZUFRPX0hB U0hfQUxHT19SSVBFTUQxNjBdID0zRCBHQ1JZX01EX1JNRDE2MCwKKyNpZmRlZiBDT05GSUdfQ1JZ UFRPX1NNMworICAgICAgICBbUUNSWVBUT19IQVNIX0FMR09fU00zXSA9M0QgR0NSWV9NRF9TTTMs CisjZW5kaWYKICAgICB9OwogICAgIGludCByZXQ7CgpkaWZmIC0tZ2l0IGEvY3J5cHRvL3Bia2Rm LW5ldHRsZS5jIGIvY3J5cHRvL3Bia2RmLW5ldHRsZS5jCmluZGV4IDkzZTY4NmMyYzYuLjNlZjlj MWI1MmMgMTAwNjQ0Ci0tLSBhL2NyeXB0by9wYmtkZi1uZXR0bGUuYworKysgYi9jcnlwdG8vcGJr ZGYtbmV0dGxlLmMKQEAgLTM0LDYgKzM0LDkgQEAgYm9vbCBxY3J5cHRvX3Bia2RmMl9zdXBwb3J0 cyhRQ3J5cHRvSGFzaEFsZ28gaGFzaCkKICAgICBjYXNlIFFDUllQVE9fSEFTSF9BTEdPX1NIQTM4 NDoKICAgICBjYXNlIFFDUllQVE9fSEFTSF9BTEdPX1NIQTUxMjoKICAgICBjYXNlIFFDUllQVE9f SEFTSF9BTEdPX1JJUEVNRDE2MDoKKyNpZmRlZiBDT05GSUdfQ1JZUFRPX1NNMworICAgIGNhc2Ug UUNSWVBUT19IQVNIX0FMR09fU00zOgorI2VuZGlmCiAgICAgICAgIHJldHVybiB0cnVlOwogICAg IGRlZmF1bHQ6CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTU1LDYgKzU4LDkgQEAgaW50IHFj cnlwdG9fcGJrZGYyKFFDcnlwdG9IYXNoQWxnbyBoYXNoLAogICAgICAgICBzdHJ1Y3QgaG1hY19z aGEzODRfY3R4IHNoYTM4NDsKICAgICAgICAgc3RydWN0IGhtYWNfc2hhNTEyX2N0eCBzaGE1MTI7 CiAgICAgICAgIHN0cnVjdCBobWFjX3JpcGVtZDE2MF9jdHggcmlwZW1kMTYwOworI2lmZGVmIENP TkZJR19DUllQVE9fU00zCisgICAgICAgIHN0cnVjdCBobWFjX3NtM19jdHggc20zOworI2VuZGlm CiAgICAgfSBjdHg7CgogICAgIGlmIChpdGVyYXRpb25zID4gVUlOVF9NQVgpIHsKQEAgLTEwNiw2 ICsxMTIsMTMgQEAgaW50IHFjcnlwdG9fcGJrZGYyKFFDcnlwdG9IYXNoQWxnbyBoYXNoLAogICAg ICAgICBQQktERjIoJmN0eC5yaXBlbWQxNjAsIGhtYWNfcmlwZW1kMTYwX3VwZGF0ZSwKaG1hY19y aXBlbWQxNjBfZGlnZXN0LAogICAgICAgICAgICAgICAgUklQRU1EMTYwX0RJR0VTVF9TSVpFLCBp dGVyYXRpb25zLCBuc2FsdCwgc2FsdCwgbm91dCwgb3V0KTsKICAgICAgICAgYnJlYWs7CisjaWZk ZWYgQ09ORklHX0NSWVBUT19TTTMKKyAgICBjYXNlIFFDUllQVE9fSEFTSF9BTEdPX1NNMzoKKyAg ICAgICAgaG1hY19zbTNfc2V0X2tleSgmY3R4LnNtMywgbmtleSwga2V5KTsKKyAgICAgICAgUEJL REYyKCZjdHguc20zLCBobWFjX3NtM191cGRhdGUsIGhtYWNfc20zX2RpZ2VzdCwKKyAgICAgICAg ICAgICAgIFNNM19ESUdFU1RfU0laRSwgaXRlcmF0aW9ucywgbnNhbHQsIHNhbHQsIG5vdXQsIG91 dCk7CisgICAgICAgIGJyZWFrOworI2VuZGlmCgogICAgIGRlZmF1bHQ6CiAgICAgICAgIGVycm9y X3NldGdfZXJybm8oZXJycCwgRU5PU1lTLApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9jcnlwdG8vaGFz aC5oIGIvaW5jbHVkZS9jcnlwdG8vaGFzaC5oCmluZGV4IDcxMmNhYzc5ZWUuLjE4NjhkNGEwZjcg MTAwNjQ0Ci0tLSBhL2luY2x1ZGUvY3J5cHRvL2hhc2guaAorKysgYi9pbmNsdWRlL2NyeXB0by9o YXNoLmgKQEAgLTMxLDYgKzMxLDcgQEAKICNkZWZpbmUgUUNSWVBUT19IQVNIX0RJR0VTVF9MRU5f U0hBMzg0ICAgIDQ4CiAjZGVmaW5lIFFDUllQVE9fSEFTSF9ESUdFU1RfTEVOX1NIQTUxMiAgICA2 NAogI2RlZmluZSBRQ1JZUFRPX0hBU0hfRElHRVNUX0xFTl9SSVBFTUQxNjAgMjAKKyNkZWZpbmUg UUNSWVBUT19IQVNIX0RJR0VTVF9MRU5fU00zICAgICAgIDMyCgogLyogU2VlIGFsc28gIlFDcnlw dG9IYXNoQWxnbyIgZGVmaW5lZCBpbiBxYXBpL2NyeXB0by5qc29uICovCgpkaWZmIC0tZ2l0IGEv bWVzb24uYnVpbGQgYi9tZXNvbi5idWlsZAppbmRleCA4NTU5NGZkM2YxLi5iMzc4MTU3NjM4IDEw MDY0NAotLS0gYS9tZXNvbi5idWlsZAorKysgYi9tZXNvbi5idWlsZApAQCAtMTc1NCw2ICsxNzU0 LDcgQEAgZ2NyeXB0ID0zRCBub3RfZm91bmQKIG5ldHRsZSA9M0Qgbm90X2ZvdW5kCiBob2d3ZWVk ID0zRCBub3RfZm91bmQKIGNyeXB0b19zbTQgPTNEIG5vdF9mb3VuZAorY3J5cHRvX3NtMyA9M0Qg bm90X2ZvdW5kCiB4dHMgPTNEICdub25lJwoKIGlmIGdldF9vcHRpb24oJ25ldHRsZScpLmVuYWJs ZWQoKSBhbmQgZ2V0X29wdGlvbignZ2NyeXB0JykuZW5hYmxlZCgpCkBAIC0xNzg5LDYgKzE3OTAs MTcgQEAgaWYgbm90IGdudXRsc19jcnlwdG8uZm91bmQoKQogICAgICAgfScnJywgZGVwZW5kZW5j aWVzOiBnY3J5cHQpCiAgICAgICBjcnlwdG9fc200ID0zRCBub3RfZm91bmQKICAgICBlbmRpZgor ICAgIGNyeXB0b19zbTMgPTNEIGdjcnlwdAorICAgICMgU00zIEFMRyBpcyBhdmFpbGFibGUgaW4g bGliZ2NyeXB0ID49M0QgMS45CisgICAgaWYgZ2NyeXB0LmZvdW5kKCkgYW5kIG5vdCBjYy5saW5r cygnJycKKyAgICAgICNpbmNsdWRlIDxnY3J5cHQuaD4KKyAgICAgIGludCBtYWluKHZvaWQpIHsK KyAgICAgICAgZ2NyeV9tZF9oZF90IGhhbmRsZXI7CisgICAgICAgIGdjcnlfbWRfb3BlbigmaGFu ZGxlciwgR0NSWV9NRF9TTTMsIDApOworICAgICAgICByZXR1cm4gMDsKKyAgICAgIH0nJycsIGRl cGVuZGVuY2llczogZ2NyeXB0KQorICAgICAgY3J5cHRvX3NtMyA9M0Qgbm90X2ZvdW5kCisgICAg ZW5kaWYKICAgZW5kaWYKICAgaWYgKG5vdCBnZXRfb3B0aW9uKCduZXR0bGUnKS5hdXRvKCkgb3Ig aGF2ZV9zeXN0ZW0pIGFuZCBub3QKZ2NyeXB0LmZvdW5kKCkKICAgICBuZXR0bGUgPTNEIGRlcGVu ZGVuY3koJ25ldHRsZScsIHZlcnNpb246ICc+PTNEMy40JywKQEAgLTE4MDksNiArMTgyMSwzMSBA QCBpZiBub3QgZ251dGxzX2NyeXB0by5mb3VuZCgpCiAgICAgICB9JycnLCBkZXBlbmRlbmNpZXM6 IG5ldHRsZSkKICAgICAgIGNyeXB0b19zbTQgPTNEIG5vdF9mb3VuZAogICAgIGVuZGlmCisgICAg Y3J5cHRvX3NtMyA9M0QgbmV0dGxlCisgICAgIyBTTTMgQUxHIGlzIGF2YWlsYWJsZSBpbiBuZXR0 bGUgPj0zRCAzLjgKKyAgICBpZiBuZXR0bGUuZm91bmQoKSBhbmQgbm90IGNjLmxpbmtzKCcnJwor ICAgICAgI2luY2x1ZGUgPG5ldHRsZS9zbTMuaD4KKyAgICAgICNpbmNsdWRlIDxuZXR0bGUvaG1h Yy5oPgorICAgICAgaW50IG1haW4odm9pZCkgeworICAgICAgc3RydWN0IHNtM19jdHggY3R4Owor ICAgICAgc3RydWN0IGhtYWNfc20zX2N0eCBobWFjX2N0eDsKKyAgICAgIHVuc2lnbmVkIGNoYXIg ZGF0YVs2NF0gPTNEIHswfTsKKyAgICAgIHVuc2lnbmVkIGNoYXIgb3V0cHV0WzMyXTsKKworICAg ICAgLy8gU00zIGhhc2ggZnVuY3Rpb24gdGVzdAorICAgICAgc20zX2luaXQoJmN0eCk7CisgICAg ICBzbTNfdXBkYXRlKCZjdHgsIDY0LCBkYXRhKTsKKyAgICAgIHNtM19kaWdlc3QoJmN0eCwgMzIs IGRhdGEpOworCisgICAgICAvLyBITUFDLVNNMyB0ZXN0CisgICAgICBobWFjX3NtM19zZXRfa2V5 KCZobWFjX2N0eCwgMzIsIGRhdGEpOworICAgICAgaG1hY19zbTNfdXBkYXRlKCZobWFjX2N0eCwg NjQsIGRhdGEpOworICAgICAgaG1hY19zbTNfZGlnZXN0KCZobWFjX2N0eCwgMzIsIG91dHB1dCk7 CisKKyAgICAgIHJldHVybiAwOworICAgICAgfScnJywgZGVwZW5kZW5jaWVzOiBuZXR0bGUpCisg ICAgICBjcnlwdG9fc20zID0zRCBub3RfZm91bmQKKyAgICBlbmRpZgogICBlbmRpZgogZW5kaWYK CkBAIC0yNDUzLDYgKzI0OTAsNyBAQCBjb25maWdfaG9zdF9kYXRhLnNldCgnQ09ORklHX1RBU04x JywgdGFzbjEuZm91bmQoKSkKIGNvbmZpZ19ob3N0X2RhdGEuc2V0KCdDT05GSUdfR0NSWVBUJywg Z2NyeXB0LmZvdW5kKCkpCiBjb25maWdfaG9zdF9kYXRhLnNldCgnQ09ORklHX05FVFRMRScsIG5l dHRsZS5mb3VuZCgpKQogY29uZmlnX2hvc3RfZGF0YS5zZXQoJ0NPTkZJR19DUllQVE9fU000Jywg Y3J5cHRvX3NtNC5mb3VuZCgpKQorY29uZmlnX2hvc3RfZGF0YS5zZXQoJ0NPTkZJR19DUllQVE9f U00zJywgY3J5cHRvX3NtMy5mb3VuZCgpKQogY29uZmlnX2hvc3RfZGF0YS5zZXQoJ0NPTkZJR19I T0dXRUVEJywgaG9nd2VlZC5mb3VuZCgpKQogY29uZmlnX2hvc3RfZGF0YS5zZXQoJ0NPTkZJR19R RU1VX1BSSVZBVEVfWFRTJywgeHRzID0zRD0zRCAncHJpdmF0ZScpCiBjb25maWdfaG9zdF9kYXRh LnNldCgnQ09ORklHX01BTExPQ19UUklNJywgaGFzX21hbGxvY190cmltKQpAQCAtNDU3OCw2ICs0 NjE2LDcgQEAgaWYgbmV0dGxlLmZvdW5kKCkKICAgIHN1bW1hcnlfaW5mbyArPTNEIHsnICBYVFMn OiAgICAgICAgICAgICB4dHMgIT0zRCAncHJpdmF0ZSd9CiBlbmRpZgogc3VtbWFyeV9pbmZvICs9 M0QgeydTTTQgQUxHIHN1cHBvcnQnOiAgIGNyeXB0b19zbTR9CitzdW1tYXJ5X2luZm8gKz0zRCB7 J1NNMyBBTEcgc3VwcG9ydCc6ICAgY3J5cHRvX3NtM30KIHN1bW1hcnlfaW5mbyArPTNEIHsnQUZf QUxHIHN1cHBvcnQnOiAgICBoYXZlX2FmYWxnfQogc3VtbWFyeV9pbmZvICs9M0Qgeydybmctbm9u ZSc6ICAgICAgICAgIGdldF9vcHRpb24oJ3JuZ19ub25lJyl9CiBzdW1tYXJ5X2luZm8gKz0zRCB7 J0xpbnV4IGtleXJpbmcnOiAgICAgaGF2ZV9rZXlyaW5nfQpkaWZmIC0tZ2l0IGEvcWFwaS9jcnlw dG8uanNvbiBiL3FhcGkvY3J5cHRvLmpzb24KaW5kZXggOTQzMTUyMjc2OC4uNDIxOWQwZmExNiAx MDA2NDQKLS0tIGEvcWFwaS9jcnlwdG8uanNvbgorKysgYi9xYXBpL2NyeXB0by5qc29uCkBAIC01 NSwxMSArNTUsMTIgQEAKICMgQHNoYTUxMjogU0hBLTUxMi4gIChzaW5jZSAyLjcpCiAjCiAjIEBy aXBlbWQxNjA6IFJJUEVNRC0xNjAuICAoc2luY2UgMi43KQorIyBAc20zOiBTTTMuIChzaW5jZSA5 LjIuMCkKICMKICMgU2luY2U6IDIuNgogIyMKIHsgJ2VudW0nOiAnUUNyeXB0b0hhc2hBbGdvJywK LSAgJ2RhdGEnOiBbJ21kNScsICdzaGExJywgJ3NoYTIyNCcsICdzaGEyNTYnLCAnc2hhMzg0Jywg J3NoYTUxMicsCidyaXBlbWQxNjAnXX0KKyAgJ2RhdGEnOiBbJ21kNScsICdzaGExJywgJ3NoYTIy NCcsICdzaGEyNTYnLCAnc2hhMzg0JywgJ3NoYTUxMicsCidyaXBlbWQxNjAnLCAnc20zJ119Cgog IyMKICMgQFFDcnlwdG9DaXBoZXJBbGdvOgpkaWZmIC0tZ2l0IGEvdGVzdHMvdW5pdC90ZXN0LWNy eXB0by1oYXNoLmMgYi90ZXN0cy91bml0L3Rlc3QtY3J5cHRvLWhhc2guYwppbmRleCA3NmM0Njk5 YzE1Li44ZmVlMTU5M2Y5IDEwMDY0NAotLS0gYS90ZXN0cy91bml0L3Rlc3QtY3J5cHRvLWhhc2gu YworKysgYi90ZXN0cy91bml0L3Rlc3QtY3J5cHRvLWhhc2guYwpAQCAtNDMsNiArNDMsOSBAQAog ICAgICAgICAgICAgICAgICAgICAgICI2M2I1NGU0Y2IyZDIwMzJiMzkzOTk0YWEyNjNjMGRiYiIg XAogICAgICAgICAgICAgICAgICAgICAgICJlMDBhOWYyZmU5ZWY2MDM3MzUyMjMyYTFlZWM1NWVl NyIKICNkZWZpbmUgT1VUUFVUX1JJUEVNRDE2MCAiZjNkNjU4ZmFkM2ZkZmIyYjUyYzkzNjljZjBk NDQxMjQ5ZGRmYThhMCIKKyNpZmRlZiBDT05GSUdfQ1JZUFRPX1NNMworI2RlZmluZSBPVVRQVVRf U00zCiJkNGE5N2RiMTA1YjQ3N2I4NGM0ZjIwZWM5YzMxYTZjODE0ZTI3MDVhMGI4M2E1YTg5NzQ4 ZDc1ZjBlZjQ1NmExIgorI2VuZGlmCgogI2RlZmluZSBPVVRQVVRfTUQ1X0I2NCAiWW8wZ1kzRldN RFdyanZZdlNTdmV5UT0zRD0zRCIKICNkZWZpbmUgT1VUUFVUX1NIQTFfQjY0ICJzdWRQSm5XS09r SWVVSnp1QkZKRXQ0ZFR6QUk9M0QiCkBAIC01NSw2ICs1OCwxMCBAQAogICAgICAgICAgICAgICAg ICAgICAgICAgICAiN3NWZTV3PTNEPTNEIgogI2RlZmluZSBPVVRQVVRfUklQRU1EMTYwX0I2NCAi ODlaWSt0UDkreXRTeVRhYzhOUkJKSjNmcUtBPTNEIgoKKyNpZmRlZiBDT05GSUdfQ1JZUFRPX1NN MworI2RlZmluZSBPVVRQVVRfU00zX0I2NCAiMUtsOXNRVzBkN2hNVHlEc25ER215QlRpY0ZvTGc2 V29sMGpYWHc3MFZxRT0zRCIKKyNlbmRpZgorCiBzdGF0aWMgY29uc3QgY2hhciAqZXhwZWN0ZWRf b3V0cHV0c1tdID0zRCB7CiAgICAgW1FDUllQVE9fSEFTSF9BTEdPX01ENV0gPTNEIE9VVFBVVF9N RDUsCiAgICAgW1FDUllQVE9fSEFTSF9BTEdPX1NIQTFdID0zRCBPVVRQVVRfU0hBMSwKQEAgLTYz LDYgKzcwLDkgQEAgc3RhdGljIGNvbnN0IGNoYXIgKmV4cGVjdGVkX291dHB1dHNbXSA9M0Qgewog ICAgIFtRQ1JZUFRPX0hBU0hfQUxHT19TSEEzODRdID0zRCBPVVRQVVRfU0hBMzg0LAogICAgIFtR Q1JZUFRPX0hBU0hfQUxHT19TSEE1MTJdID0zRCBPVVRQVVRfU0hBNTEyLAogICAgIFtRQ1JZUFRP X0hBU0hfQUxHT19SSVBFTUQxNjBdID0zRCBPVVRQVVRfUklQRU1EMTYwLAorI2lmZGVmIENPTkZJ R19DUllQVE9fU00zCisgICAgW1FDUllQVE9fSEFTSF9BTEdPX1NNM10gPTNEIE9VVFBVVF9TTTMs CisjZW5kaWYKIH07CiBzdGF0aWMgY29uc3QgY2hhciAqZXhwZWN0ZWRfb3V0cHV0c19iNjRbXSA9 M0QgewogICAgIFtRQ1JZUFRPX0hBU0hfQUxHT19NRDVdID0zRCBPVVRQVVRfTUQ1X0I2NCwKQEAg LTcyLDYgKzgyLDkgQEAgc3RhdGljIGNvbnN0IGNoYXIgKmV4cGVjdGVkX291dHB1dHNfYjY0W10g PTNEIHsKICAgICBbUUNSWVBUT19IQVNIX0FMR09fU0hBMzg0XSA9M0QgT1VUUFVUX1NIQTM4NF9C NjQsCiAgICAgW1FDUllQVE9fSEFTSF9BTEdPX1NIQTUxMl0gPTNEIE9VVFBVVF9TSEE1MTJfQjY0 LAogICAgIFtRQ1JZUFRPX0hBU0hfQUxHT19SSVBFTUQxNjBdID0zRCBPVVRQVVRfUklQRU1EMTYw X0I2NCwKKyNpZmRlZiBDT05GSUdfQ1JZUFRPX1NNMworICAgIFtRQ1JZUFRPX0hBU0hfQUxHT19T TTNdID0zRCBPVVRQVVRfU00zX0I2NCwKKyNlbmRpZgogfTsKIHN0YXRpYyBjb25zdCBpbnQgZXhw ZWN0ZWRfbGVuc1tdID0zRCB7CiAgICAgW1FDUllQVE9fSEFTSF9BTEdPX01ENV0gPTNEIDE2LApA QCAtODEsNiArOTQsOSBAQCBzdGF0aWMgY29uc3QgaW50IGV4cGVjdGVkX2xlbnNbXSA9M0Qgewog ICAgIFtRQ1JZUFRPX0hBU0hfQUxHT19TSEEzODRdID0zRCA0OCwKICAgICBbUUNSWVBUT19IQVNI X0FMR09fU0hBNTEyXSA9M0QgNjQsCiAgICAgW1FDUllQVE9fSEFTSF9BTEdPX1JJUEVNRDE2MF0g PTNEIDIwLAorI2lmZGVmIENPTkZJR19DUllQVE9fU00zCisgICAgW1FDUllQVE9fSEFTSF9BTEdP X1NNM10gPTNEIDMyLAorI2VuZGlmCiB9OwoKIHN0YXRpYyBjb25zdCBjaGFyIGhleFtdID0zRCAi MDEyMzQ1Njc4OWFiY2RlZiI7CmRpZmYgLS1naXQgYS90ZXN0cy91bml0L3Rlc3QtY3J5cHRvLWht YWMuYyBiL3Rlc3RzL3VuaXQvdGVzdC1jcnlwdG8taG1hYy5jCmluZGV4IGNkYjg3NzQ0NDMuLmQ4 Nzc0YmVkMDEgMTAwNjQ0Ci0tLSBhL3Rlc3RzL3VuaXQvdGVzdC1jcnlwdG8taG1hYy5jCisrKyBi L3Rlc3RzL3VuaXQvdGVzdC1jcnlwdG8taG1hYy5jCkBAIC03Niw2ICs3NiwxNCBAQCBzdGF0aWMg UUNyeXB0b0htYWNUZXN0RGF0YSB0ZXN0X2RhdGFbXSA9M0QgewogICAgICAgICAgICAgIjk0OTY0 ZWQ0YzExNTViNjJiNjY4YzI0MWQ2NzI3OWU1IgogICAgICAgICAgICAgIjhhNzExNjc2IiwKICAg ICB9LAorI2lmZGVmIENPTkZJR19DUllQVE9fU00zCisgICAgeworICAgICAgICAuYWxnID0zRCBR Q1JZUFRPX0hBU0hfQUxHT19TTTMsCisgICAgICAgIC5oZXhfZGlnZXN0ID0zRAorICAgICAgICAg ICAgIjc2MGUzNzk5MzMyYmM5MTM4MTliOTMwMDg1MzYwZGRiIgorICAgICJjMDU1MjkyNjEzMTNk NWIxNWI3NWJhYjRmZDdhZTkxZSIsCisgICAgfSwKKyNlbmRpZgogfTsKCiBzdGF0aWMgY29uc3Qg Y2hhciBoZXhbXSA9M0QgIjAxMjM0NTY3ODlhYmNkZWYiOwpkaWZmIC0tZ2l0IGEvdGVzdHMvdW5p dC90ZXN0LWNyeXB0by1wYmtkZi5jIGIvdGVzdHMvdW5pdC90ZXN0LWNyeXB0by1wYmtkZi5jCmlu ZGV4IDEyZWU4MDhmYmMuLjA2MWE4ZGExMzkgMTAwNjQ0Ci0tLSBhL3Rlc3RzL3VuaXQvdGVzdC1j cnlwdG8tcGJrZGYuYworKysgYi90ZXN0cy91bml0L3Rlc3QtY3J5cHRvLXBia2RmLmMKQEAgLTMy NSw2ICszMjUsMjIgQEAgc3RhdGljIFFDcnlwdG9QYmtkZlRlc3REYXRhIHRlc3RfZGF0YVtdID0z RCB7CiAgICAgICAgICAgICAgICAiXHhjZVx4YmZceDkxXHgxNFx4OGJceDVjXHg0OFx4NDEiLAog ICAgICAgICAubm91dCA9M0QgMzIKICAgICB9LAorI2lmZGVmIENPTkZJR19DUllQVE9fU00zCisg ICAgeworICAgICAgICAucGF0aCA9M0QgIi9jcnlwdG8vcGJrZGYvbm9ucmZjL3NtMy9pdGVyMiIs CisgICAgICAgIC5oYXNoID0zRCBRQ1JZUFRPX0hBU0hfQUxHT19TTTMsCisgICAgICAgIC5pdGVy YXRpb25zID0zRCAyLAorICAgICAgICAua2V5ID0zRCAicGFzc3dvcmQiLAorICAgICAgICAubmtl eSA9M0QgOCwKKyAgICAgICAgLnNhbHQgPTNEICJBVEhFTkEuTUlULkVEVXJhZWJ1cm4iLAorICAg ICAgICAubnNhbHQgPTNEIDIxLAorICAgICAgICAub3V0ID0zRCAiXHg0OFx4NzFceDFiXHg1OFx4 YTNceGNiXHhjZVx4MDYiCisgIlx4YmFceGFkXHg3N1x4YThceGI1XHhiOVx4ZDhceDA3IgorICJc eDZhXHhlMlx4YjNceDViXHg5NVx4Y2VceGM4XHhjZSIKKyAiXHhlN1x4YjFceGNiXHhlZVx4NjFc eGRmXHgwNFx4ZWEiLAorICAgICAgICAubm91dCA9M0QgMzIKKyAgICB9LAorI2VuZGlmCiAjaWYg MAogICAgIHsKICAgICAgICAgLnBhdGggPTNEICIvY3J5cHRvL3Bia2RmL25vbnJmYy93aGlybHBv b2wvaXRlcjEyMDAiLAotLT0yMAoyLjMzLjA= --000000000000693dd60625a7336a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Introduce the SM3 cryptographic hash algo= rithm (GB/T 32905-2016).

SM3 (GB/T 32905-2016) is a cryptographic st= andard issued by the
Organization of State Commercial Cryptography Admin= istration (OSCCA)
as an authorized cryptographic algorithm for use withi= n China.

Detect the SM3 cryptographic hash algorithm and enable the = feature silently
if it is available.

Signed-off-by: cheliequan &l= t;cheliequan@ins= pur.com>
---
=C2=A0crypto/hash-gcrypt.c =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 | =C2=A03 +++
=C2=A0crypto/hash-nettle.c =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 | 14 ++++++++++++
=C2=A0crypto/hash.c =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2=A03 +++
=C2=A0cryp= to/hmac-gcrypt.c =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | =C2=A03 +++
=C2=A0= crypto/hmac-nettle.c =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 11 ++++++++++
= =C2=A0crypto/pbkdf-gcrypt.c =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| =C2=A06 +++= +++
=C2=A0crypto/pbkdf-nettle.c =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 13 += +++++++++++
=C2=A0include/crypto/hash.h =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0| =C2=A01 +
=C2=A0meson.build =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 39 ++++++++++++++++++++++++++++++++++
= =C2=A0qapi/crypto.json =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | = =C2=A03 ++-
=C2=A0tests/unit/test-crypto-hash.c =C2=A0| 16 +++++++++++++= +
=C2=A0tests/unit/test-crypto-hmac.c =C2=A0| =C2=A08 +++++++
=C2=A0t= ests/unit/test-crypto-pbkdf.c | 16 ++++++++++++++
=C2=A013 files changed= , 135 insertions(+), 1 deletion(-)

diff --git a/crypto/hash-gcrypt.c= b/crypto/hash-gcrypt.c
index 73533a4949..f04a9f553c 100644
--- a/cry= pto/hash-gcrypt.c
+++ b/crypto/hash-gcrypt.c
@@ -34,6 +34,9 @@ static= int qcrypto_hash_alg_map[QCRYPTO_HASH_ALGO__MAX] =3D {
=C2=A0 =C2=A0 = =C2=A0[QCRYPTO_HASH_ALGO_SHA384] =3D GCRY_MD_SHA384,
=C2=A0 =C2=A0 =C2= =A0[QCRYPTO_HASH_ALGO_SHA512] =3D GCRY_MD_SHA512,
=C2=A0 =C2=A0 =C2=A0[Q= CRYPTO_HASH_ALGO_RIPEMD160] =3D GCRY_MD_RMD160,
+#ifdef CONFIG_CRYPTO_SM= 3
+ =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_SM3] =3D GCRY_MD_SM3,
+#endif
= =C2=A0};
=C2=A0
=C2=A0gboolean qcrypto_hash_supports(QCryptoHashAlgo = alg)
diff --git a/crypto/hash-nettle.c b/crypto/hash-nettle.c
index c= 78624b347..53f68301ef 100644
--- a/crypto/hash-nettle.c
+++ b/crypto/= hash-nettle.c
@@ -26,6 +26,9 @@
=C2=A0#include <nettle/md5.h>=C2=A0#include <nettle/sha.h>
=C2=A0#include <nettle/ripemd16= 0.h>
+#ifdef CONFIG_CRYPTO_SM3
+#include <nettle/sm3.h>
+= #endif
=C2=A0
=C2=A0typedef void (*qcrypto_nettle_init)(void *ctx);=C2=A0typedef void (*qcrypto_nettle_write)(void *ctx,
@@ -43,6 +46,9 @= @ union qcrypto_hash_ctx {
=C2=A0 =C2=A0 =C2=A0struct sha384_ctx sha384;=
=C2=A0 =C2=A0 =C2=A0struct sha512_ctx sha512;
=C2=A0 =C2=A0 =C2=A0st= ruct ripemd160_ctx ripemd160;
+#ifdef CONFIG_CRYPTO_SM3
+ =C2=A0 =C2= =A0struct sm3_ctx sm3;
+#endif
=C2=A0};
=C2=A0
=C2=A0struct qcr= ypto_hash_alg {
@@ -93,6 +99,14 @@ struct qcrypto_hash_alg {
=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0.result =3D (qcrypto_nettle_result)ripemd160_dig= est,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.len =3D RIPEMD160_DIGEST_SIZE,=C2=A0 =C2=A0 =C2=A0},
+#ifdef CONFIG_CRYPTO_SM3
+ =C2=A0 =C2=A0[QC= RYPTO_HASH_ALGO_SM3] =3D {
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0.init =3D (qcryp= to_nettle_init)sm3_init,
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0.write =3D (qcrypt= o_nettle_write)sm3_update,
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0.result =3D (qcr= ypto_nettle_result)sm3_digest,
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0.len =3D SM3= _DIGEST_SIZE,
+ =C2=A0 =C2=A0},
+#endif
=C2=A0};
=C2=A0
=C2= =A0gboolean qcrypto_hash_supports(QCryptoHashAlgo alg)
diff --git a/cryp= to/hash.c b/crypto/hash.c
index 0c8548c568..7513769e42 100644
--- a/c= rypto/hash.c
+++ b/crypto/hash.c
@@ -33,6 +33,9 @@ static size_t qcry= pto_hash_alg_size[QCRYPTO_HASH_ALGO__MAX] =3D {
=C2=A0 =C2=A0 =C2=A0[QCR= YPTO_HASH_ALGO_SHA384] =C2=A0 =C2=A0=3D QCRYPTO_HASH_DIGEST_LEN_SHA384,
= =C2=A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_SHA512] =C2=A0 =C2=A0=3D QCRYPTO_HAS= H_DIGEST_LEN_SHA512,
=C2=A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_RIPEMD160] = =3D QCRYPTO_HASH_DIGEST_LEN_RIPEMD160,
+#ifdef CONFIG_CRYPTO_SM3
+ = =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_SM3] =3D QCRYPTO_HASH_DIGEST_LEN_SM3,
+#= endif
=C2=A0};
=C2=A0
=C2=A0size_t qcrypto_hash_digest_len(QCrypto= HashAlgo alg)
diff --git a/crypto/hmac-gcrypt.c b/crypto/hmac-gcrypt.cindex 19990cb6ed..090fe01c1e 100644
--- a/crypto/hmac-gcrypt.c
+++ = b/crypto/hmac-gcrypt.c
@@ -26,6 +26,9 @@ static int qcrypto_hmac_alg_map= [QCRYPTO_HASH_ALGO__MAX] =3D {
=C2=A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_SH= A384] =3D GCRY_MAC_HMAC_SHA384,
=C2=A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_S= HA512] =3D GCRY_MAC_HMAC_SHA512,
=C2=A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_= RIPEMD160] =3D GCRY_MAC_HMAC_RMD160,
+#ifdef CONFIG_CRYPTO_SM3
+ =C2= =A0 =C2=A0[QCRYPTO_HASH_ALGO_SM3] =3D GCRY_MAC_HMAC_SM3,
+#endif
=C2= =A0};
=C2=A0
=C2=A0typedef struct QCryptoHmacGcrypt QCryptoHmacGcrypt= ;
diff --git a/crypto/hmac-nettle.c b/crypto/hmac-nettle.c
index 54dd= 75d5ff..4755f2caca 100644
--- a/crypto/hmac-nettle.c
+++ b/crypto/hma= c-nettle.c
@@ -38,6 +38,9 @@ struct QCryptoHmacNettle {
=C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0struct hmac_sha256_ctx sha256_ctx; /* equals hmac_sha2= 24_ctx */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0struct hmac_sha512_ctx sha51= 2_ctx; /* equals hmac_sha384_ctx */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0st= ruct hmac_ripemd160_ctx ripemd160_ctx;
+#ifdef CONFIG_CRYPTO_SM3
+ st= ruct hmac_sm3_ctx ctx;
+#endif
=C2=A0 =C2=A0 =C2=A0} u;
=C2=A0};=C2=A0
@@ -89,6 +92,14 @@ struct qcrypto_nettle_hmac_alg {
=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0.digest =3D (qcrypto_nettle_hmac_digest)hmac_rip= emd160_digest,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.len =3D RIPEMD160_DIGE= ST_SIZE,
=C2=A0 =C2=A0 =C2=A0},
+#ifdef CONFIG_CRYPTO_SM3
+ =C2=A0= =C2=A0[QCRYPTO_HASH_ALGO_SM3] =3D {
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0.setke= y =3D (qcrypto_nettle_hmac_setkey)hmac_sm3_set_key,
+ =C2=A0 =C2=A0 =C2= =A0 =C2=A0.update =3D (qcrypto_nettle_hmac_update)hmac_sm3_update,
+ =C2= =A0 =C2=A0 =C2=A0 =C2=A0.digest =3D (qcrypto_nettle_hmac_digest)hmac_sm3_di= gest,
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0.len =3D SM3_DIGEST_SIZE,
+ =C2=A0= =C2=A0},
+#endif
=C2=A0};
=C2=A0
=C2=A0bool qcrypto_hmac_suppo= rts(QCryptoHashAlgo alg)
diff --git a/crypto/pbkdf-gcrypt.c b/crypto/pbk= df-gcrypt.c
index 76bbb55f7a..e89b8b1c76 100644
--- a/crypto/pbkdf-gc= rypt.c
+++ b/crypto/pbkdf-gcrypt.c
@@ -33,6 +33,9 @@ bool qcrypto_pbk= df2_supports(QCryptoHashAlgo hash)
=C2=A0 =C2=A0 =C2=A0case QCRYPTO_HASH= _ALGO_SHA384:
=C2=A0 =C2=A0 =C2=A0case QCRYPTO_HASH_ALGO_SHA512:
=C2= =A0 =C2=A0 =C2=A0case QCRYPTO_HASH_ALGO_RIPEMD160:
+#ifdef CONFIG_CRYPTO= _SM3
+ =C2=A0 =C2=A0case QCRYPTO_HASH_ALGO_SM3:
+#endif
=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0return qcrypto_hash_supports(hash);
=C2=A0 =C2= =A0 =C2=A0default:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return false;
@@= -54,6 +57,9 @@ int qcrypto_pbkdf2(QCryptoHashAlgo hash,
=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_SHA384] =3D GCRY_MD_SHA384,
=C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_SHA512] =3D GCRY_MD_SHA51= 2,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_RIPEMD160] =3D G= CRY_MD_RMD160,
+#ifdef CONFIG_CRYPTO_SM3
+ =C2=A0 =C2=A0 =C2=A0 =C2= =A0[QCRYPTO_HASH_ALGO_SM3] =3D GCRY_MD_SM3,
+#endif
=C2=A0 =C2=A0 =C2= =A0};
=C2=A0 =C2=A0 =C2=A0int ret;
=C2=A0
diff --git a/crypto/pbkd= f-nettle.c b/crypto/pbkdf-nettle.c
index 93e686c2c6..3ef9c1b52c 100644--- a/crypto/pbkdf-nettle.c
+++ b/crypto/pbkdf-nettle.c
@@ -34,6 +3= 4,9 @@ bool qcrypto_pbkdf2_supports(QCryptoHashAlgo hash)
=C2=A0 =C2=A0 = =C2=A0case QCRYPTO_HASH_ALGO_SHA384:
=C2=A0 =C2=A0 =C2=A0case QCRYPTO_HA= SH_ALGO_SHA512:
=C2=A0 =C2=A0 =C2=A0case QCRYPTO_HASH_ALGO_RIPEMD160:+#ifdef CONFIG_CRYPTO_SM3
+ =C2=A0 =C2=A0case QCRYPTO_HASH_ALGO_SM3:+#endif
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return true;
=C2=A0 =C2=A0= =C2=A0default:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return false;
@@ -5= 5,6 +58,9 @@ int qcrypto_pbkdf2(QCryptoHashAlgo hash,
=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0struct hmac_sha384_ctx sha384;
=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0struct hmac_sha512_ctx sha512;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0struct hmac_ripemd160_ctx ripemd160;
+#ifdef CONFIG_CRYPTO_SM3
+ = =C2=A0 =C2=A0 =C2=A0 =C2=A0struct hmac_sm3_ctx sm3;
+#endif
=C2=A0 = =C2=A0 =C2=A0} ctx;
=C2=A0
=C2=A0 =C2=A0 =C2=A0if (iterations > UI= NT_MAX) {
@@ -106,6 +112,13 @@ int qcrypto_pbkdf2(QCryptoHashAlgo hash,<= br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0PBKDF2(&ctx.ripemd160, hmac_ripemd= 160_update, hmac_ripemd160_digest,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 RIPEMD160_DIGEST_SIZE, iterations, nsalt, salt, nout, = out);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0break;
+#ifdef CONFIG_CRYPTO_= SM3
+ =C2=A0 =C2=A0case QCRYPTO_HASH_ALGO_SM3:
+ =C2=A0 =C2=A0 =C2=A0= =C2=A0hmac_sm3_set_key(&ctx.sm3, nkey, key);
+ =C2=A0 =C2=A0 =C2=A0= =C2=A0PBKDF2(&ctx.sm3, hmac_sm3_update, hmac_sm3_digest,
+ =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 SM3_DIGEST_SIZE, iterations, nsal= t, salt, nout, out);
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0break;
+#endif
= =C2=A0
=C2=A0 =C2=A0 =C2=A0default:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0error_setg_errno(errp, ENOSYS,
diff --git a/include/crypto/hash.h b/i= nclude/crypto/hash.h
index 712cac79ee..1868d4a0f7 100644
--- a/includ= e/crypto/hash.h
+++ b/include/crypto/hash.h
@@ -31,6 +31,7 @@
=C2= =A0#define QCRYPTO_HASH_DIGEST_LEN_SHA384 =C2=A0 =C2=A048
=C2=A0#define = QCRYPTO_HASH_DIGEST_LEN_SHA512 =C2=A0 =C2=A064
=C2=A0#define QCRYPTO_HAS= H_DIGEST_LEN_RIPEMD160 20
+#define QCRYPTO_HASH_DIGEST_LEN_SM3 =C2=A0 = =C2=A0 =C2=A0 32
=C2=A0
=C2=A0/* See also "QCryptoHashAlgo"= defined in qapi/crypto.json */
=C2=A0
diff --git a/meson.build b/mes= on.build
index 85594fd3f1..b378157638 100644
--- a/meson.build
+++= b/meson.build
@@ -1754,6 +1754,7 @@ gcrypt =3D not_found
=C2=A0nettl= e =3D not_found
=C2=A0hogweed =3D not_found
=C2=A0crypto_sm4 =3D not_= found
+crypto_sm3 =3D not_found
=C2=A0xts =3D 'none'
=C2= =A0
=C2=A0if get_option('nettle').enabled() and get_option('= gcrypt').enabled()
@@ -1789,6 +1790,17 @@ if not gnutls_crypto.found= ()
=C2=A0 =C2=A0 =C2=A0 =C2=A0}''', dependencies: gcrypt)=C2=A0 =C2=A0 =C2=A0 =C2=A0crypto_sm4 =3D not_found
=C2=A0 =C2=A0 =C2= =A0endif
+ =C2=A0 =C2=A0crypto_sm3 =3D gcrypt
+ =C2=A0 =C2=A0# SM3 AL= G is available in libgcrypt >=3D 1.9
+ =C2=A0 =C2=A0if gcrypt.found()= and not cc.links('''
+ =C2=A0 =C2=A0 =C2=A0#include <gcr= ypt.h>
+ =C2=A0 =C2=A0 =C2=A0int main(void) {
+ =C2=A0 =C2=A0 =C2= =A0 =C2=A0gcry_md_hd_t handler;
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0gcry_md_ope= n(&handler, GCRY_MD_SM3, 0);
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0return 0;<= br>+ =C2=A0 =C2=A0 =C2=A0}''', dependencies: gcrypt)
+ =C2= =A0 =C2=A0 =C2=A0crypto_sm3 =3D not_found
+ =C2=A0 =C2=A0endif
=C2=A0= =C2=A0endif
=C2=A0 =C2=A0if (not get_option('nettle').auto() or= have_system) and not gcrypt.found()
=C2=A0 =C2=A0 =C2=A0nettle =3D depe= ndency('nettle', version: '>=3D3.4',
@@ -1809,6 +1821= ,31 @@ if not gnutls_crypto.found()
=C2=A0 =C2=A0 =C2=A0 =C2=A0}'= 9;', dependencies: nettle)
=C2=A0 =C2=A0 =C2=A0 =C2=A0crypto_sm4 =3D= not_found
=C2=A0 =C2=A0 =C2=A0endif
+ =C2=A0 =C2=A0crypto_sm3 =3D ne= ttle
+ =C2=A0 =C2=A0# SM3 ALG is available in nettle >=3D 3.8
+ = =C2=A0 =C2=A0if nettle.found() and not cc.links('''
+ =C2=A0= =C2=A0 =C2=A0#include <nettle/sm3.h>
+ =C2=A0 =C2=A0 =C2=A0#inclu= de <nettle/hmac.h>
+ =C2=A0 =C2=A0 =C2=A0int main(void) {
+ =C2= =A0 =C2=A0 =C2=A0struct sm3_ctx ctx;
+ =C2=A0 =C2=A0 =C2=A0struct hmac_s= m3_ctx hmac_ctx;
+ =C2=A0 =C2=A0 =C2=A0unsigned char data[64] =3D {0};+ =C2=A0 =C2=A0 =C2=A0unsigned char output[32];
+ =C2=A0 =C2=A0
+ = =C2=A0 =C2=A0 =C2=A0// SM3 hash function test
+ =C2=A0 =C2=A0 =C2=A0sm3_= init(&ctx);
+ =C2=A0 =C2=A0 =C2=A0sm3_update(&ctx, 64, data);+ =C2=A0 =C2=A0 =C2=A0sm3_digest(&ctx, 32, data);
+
+ =C2=A0 =C2= =A0 =C2=A0// HMAC-SM3 test
+ =C2=A0 =C2=A0 =C2=A0hmac_sm3_set_key(&h= mac_ctx, 32, data);
+ =C2=A0 =C2=A0 =C2=A0hmac_sm3_update(&hmac_ctx,= 64, data);
+ =C2=A0 =C2=A0 =C2=A0hmac_sm3_digest(&hmac_ctx, 32, out= put);
+ =C2=A0 =C2=A0
+ =C2=A0 =C2=A0 =C2=A0return 0;
+ =C2=A0 =C2= =A0 =C2=A0}''', dependencies: nettle)
+ =C2=A0 =C2=A0 =C2=A0= crypto_sm3 =3D not_found
+ =C2=A0 =C2=A0endif
=C2=A0 =C2=A0endif
= =C2=A0endif
=C2=A0
@@ -2453,6 +2490,7 @@ config_host_data.set('CO= NFIG_TASN1', tasn1.found())
=C2=A0config_host_data.set('CONFIG_G= CRYPT', gcrypt.found())
=C2=A0config_host_data.set('CONFIG_NETTL= E', nettle.found())
=C2=A0config_host_data.set('CONFIG_CRYPTO_SM= 4', crypto_sm4.found())
+config_host_data.set('CONFIG_CRYPTO_SM3= ', crypto_sm3.found())
=C2=A0config_host_data.set('CONFIG_HOGWEE= D', hogweed.found())
=C2=A0config_host_data.set('CONFIG_QEMU_PRI= VATE_XTS', xts =3D=3D 'private')
=C2=A0config_host_data.set(= 'CONFIG_MALLOC_TRIM', has_malloc_trim)
@@ -4578,6 +4616,7 @@ if = nettle.found()
=C2=A0 =C2=A0 summary_info +=3D {' =C2=A0XTS': = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 xts !=3D 'private'}
= =C2=A0endif
=C2=A0summary_info +=3D {'SM4 ALG support': =C2=A0 c= rypto_sm4}
+summary_info +=3D {'SM3 ALG support': =C2=A0 crypto_= sm3}
=C2=A0summary_info +=3D {'AF_ALG support': =C2=A0 =C2=A0hav= e_afalg}
=C2=A0summary_info +=3D {'rng-none': =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0get_option('rng_none')}
=C2=A0summary_info +=3D= {'Linux keyring': =C2=A0 =C2=A0 have_keyring}
diff --git a/qapi= /crypto.json b/qapi/crypto.json
index 9431522768..4219d0fa16 100644
-= -- a/qapi/crypto.json
+++ b/qapi/crypto.json
@@ -55,11 +55,12 @@
= =C2=A0# @sha512: SHA-512. =C2=A0(since 2.7)
=C2=A0#
=C2=A0# @ripemd16= 0: RIPEMD-160. =C2=A0(since 2.7)
+# @sm3: SM3. (since 9.2.0)
=C2=A0#<= br>=C2=A0# Since: 2.6
=C2=A0##
=C2=A0{ 'enum': 'QCryptoHa= shAlgo',
- =C2=A0'data': ['md5', 'sha1', = 9;sha224', 'sha256', 'sha384', 'sha512', 'r= ipemd160']}
+ =C2=A0'data': ['md5', 'sha1', = 'sha224', 'sha256', 'sha384', 'sha512', = 9;ripemd160', 'sm3']}
=C2=A0
=C2=A0##
=C2=A0# @QCrypto= CipherAlgo:
diff --git a/tests/unit/test-crypto-hash.c b/tests/unit/test= -crypto-hash.c
index 76c4699c15..8fee1593f9 100644
--- a/tests/unit/t= est-crypto-hash.c
+++ b/tests/unit/test-crypto-hash.c
@@ -43,6 +43,9 = @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0"63b54e4cb2d2032b393994aa263c0dbb" \
=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&q= uot;e00a9f2fe9ef6037352232a1eec55ee7"
=C2=A0#define OUTPUT_RIPEMD16= 0 "f3d658fad3fdfb2b52c9369cf0d441249ddfa8a0"
+#ifdef CONFIG_CR= YPTO_SM3
+#define OUTPUT_SM3 "d4a97db105b477b84c4f20ec9c31a6c814e27= 05a0b83a5a89748d75f0ef456a1"
+#endif
=C2=A0
=C2=A0#define OUT= PUT_MD5_B64 "Yo0gY3FWMDWrjvYvSSveyQ=3D=3D"
=C2=A0#define OUTPU= T_SHA1_B64 "sudPJnWKOkIeUJzuBFJEt4dTzAI=3D"
@@ -55,6 +58,10 @@=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0"7sVe5w=3D=3D"
=C2=A0#define OUTPUT= _RIPEMD160_B64 "89ZY+tP9+ytSyTac8NRBJJ3fqKA=3D"
=C2=A0
+#if= def CONFIG_CRYPTO_SM3
+#define OUTPUT_SM3_B64 "1Kl9sQW0d7hMTyDsnDGm= yBTicFoLg6Wol0jXXw70VqE=3D"
+#endif
+
=C2=A0static const char= *expected_outputs[] =3D {
=C2=A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_MD5] = =3D OUTPUT_MD5,
=C2=A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_SHA1] =3D OUTPUT_= SHA1,
@@ -63,6 +70,9 @@ static const char *expected_outputs[] =3D {
= =C2=A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_SHA384] =3D OUTPUT_SHA384,
=C2=A0= =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_SHA512] =3D OUTPUT_SHA512,
=C2=A0 =C2= =A0 =C2=A0[QCRYPTO_HASH_ALGO_RIPEMD160] =3D OUTPUT_RIPEMD160,
+#ifdef CO= NFIG_CRYPTO_SM3
+ =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_SM3] =3D OUTPUT_SM3,+#endif
=C2=A0};
=C2=A0static const char *expected_outputs_b64[] = =3D {
=C2=A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_MD5] =3D OUTPUT_MD5_B64,@@ -72,6 +82,9 @@ static const char *expected_outputs_b64[] =3D {
=C2= =A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_SHA384] =3D OUTPUT_SHA384_B64,
=C2= =A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_SHA512] =3D OUTPUT_SHA512_B64,
=C2= =A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_RIPEMD160] =3D OUTPUT_RIPEMD160_B64,+#ifdef CONFIG_CRYPTO_SM3
+ =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_SM3] =3D OU= TPUT_SM3_B64,
+#endif
=C2=A0};
=C2=A0static const int expected_len= s[] =3D {
=C2=A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_MD5] =3D 16,
@@ -81,= 6 +94,9 @@ static const int expected_lens[] =3D {
=C2=A0 =C2=A0 =C2=A0[Q= CRYPTO_HASH_ALGO_SHA384] =3D 48,
=C2=A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_= SHA512] =3D 64,
=C2=A0 =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_RIPEMD160] =3D 20= ,
+#ifdef CONFIG_CRYPTO_SM3
+ =C2=A0 =C2=A0[QCRYPTO_HASH_ALGO_SM3] = =3D 32,
+#endif
=C2=A0};
=C2=A0
=C2=A0static const char hex[] = =3D "0123456789abcdef";
diff --git a/tests/unit/test-crypto-hm= ac.c b/tests/unit/test-crypto-hmac.c
index cdb8774443..d8774bed01 100644=
--- a/tests/unit/test-crypto-hmac.c
+++ b/tests/unit/test-crypto-hma= c.c
@@ -76,6 +76,14 @@ static QCryptoHmacTestData test_data[] =3D {
= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"94964ed4c1155b62b668c= 241d67279e5"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"= 8a711676",
=C2=A0 =C2=A0 =C2=A0},
+#ifdef CONFIG_CRYPTO_SM3
+= =C2=A0 =C2=A0{
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0.alg =3D QCRYPTO_HASH_ALGO_= SM3,
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0.hex_digest =3D
+ =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0"760e3799332bc913819b930085360ddb"
+ = =C2=A0 =C2=A0"c05529261313d5b15b75bab4fd7ae91e",
+ =C2=A0 =C2= =A0},
+#endif
=C2=A0};
=C2=A0
=C2=A0static const char hex[] =3D= "0123456789abcdef";
diff --git a/tests/unit/test-crypto-pbkdf= .c b/tests/unit/test-crypto-pbkdf.c
index 12ee808fbc..061a8da139 100644<= br>--- a/tests/unit/test-crypto-pbkdf.c
+++ b/tests/unit/test-crypto-pbk= df.c
@@ -325,6 +325,22 @@ static QCryptoPbkdfTestData test_data[] =3D {<= br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "\xce\xbf\x= 91\x14\x8b\x5c\x48\x41",
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0.nout = =3D 32
=C2=A0 =C2=A0 =C2=A0},
+#ifdef CONFIG_CRYPTO_SM3
+ =C2=A0 = =C2=A0{
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0.path =3D "/crypto/pbkdf/nonrf= c/sm3/iter2",
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0.hash =3D QCRYPTO_HASH_A= LGO_SM3,
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0.iterations =3D 2,
+ =C2=A0 =C2= =A0 =C2=A0 =C2=A0.key =3D "password",
+ =C2=A0 =C2=A0 =C2=A0 = =C2=A0.nkey =3D 8,
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0.salt =3D "ATHENA.M= IT.EDUraeburn",
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0.nsalt =3D 21,
+ = =C2=A0 =C2=A0 =C2=A0 =C2=A0.out =3D "\x48\x71\x1b\x58\xa3\xcb\xce\x06&= quot;
+ "\xba\xad\x77\xa8\xb5\xb9\xd8\x07"
+ "\x6a\x= e2\xb3\x5b\x95\xce\xc8\xce"
+ "\xe7\xb1\xcb\xee\x61\xdf\x04\x= ea",
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0.nout =3D 32
+ =C2=A0 =C2=A0},=
+#endif
=C2=A0#if 0
=C2=A0 =C2=A0 =C2=A0{
=C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0.path =3D "/crypto/pbkdf/nonrfc/whirlpool/iter1200"= ,
--
2.33.0
--000000000000693dd60625a7336a--