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 EA7C1E77199 for ; Thu, 9 Jan 2025 03:59:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tVjhY-0002pQ-4Z; Wed, 08 Jan 2025 22:59:20 -0500 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 1tVjhO-0002od-0r for grub-devel@gnu.org; Wed, 08 Jan 2025 22:59:10 -0500 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tVjhL-0004kM-GQ for grub-devel@gnu.org; Wed, 08 Jan 2025 22:59:09 -0500 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-5d3bbb0f09dso618127a12.2 for ; Wed, 08 Jan 2025 19:59:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1736395146; x=1736999946; darn=gnu.org; 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=xRleGMx4sLWBXGc/JhVu/GOXXx4EupQU2ipNol0fYGA=; b=C7gCoJV3G0is/X/A+1dV8ivoiiLKInrztuKm8Ev9BaaU4NsJoe0L9GvLvz7iLaHDWQ BNRo7J2tEgeMU8sVGgBwJXG4yIrrx5kJ8SmIZ1zro5lr/LjL9w2WVS1+owrKdYntGMMX 37mO4D/YiQg4E2xa8h3/7n0VeMdivFKVB270ec1uSIqHSrtlTQHdTeJm2MZtgdZ6ylYy rSw55tJ73ZenzrJ6roJd+wPIAxDDT87O3gYVp6VcXI4XvZz9Sg2+4Ln/+wPi6g0u7A32 Z+aEWFqDl0SoFmvKYkOR0LUKwcGjC9ZZ7NH8FArXH6R2Lfm7xqY6FZCVRtD9S4oqwCZm PwpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736395146; x=1736999946; 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=xRleGMx4sLWBXGc/JhVu/GOXXx4EupQU2ipNol0fYGA=; b=s20oDTzTYcTdB+oF6bjYRcWIUcKdmYXr3kebtRzx7FzD6GvLdt6PzDOMNDJEKupuYQ NHMjqhKtbGm6sNNdOwqqPlsZkfJ+obsBAk7zEzfVbaKg926F/24PaDv0UBUXTPKXov35 Dx7owstpyl2FVXN7vAogCjbCdoOVceBqUkGO7CAKMexDC7yQfrnR3qAjHYc8IDIFQr7N RMJJ+UJb3JLG0/NKSA2p8z94ayzVwx5OT6yYHgDmYQJCFPaYPWT6JZu61l6lZbP4wjqz uxEDmwF3t5dOy0HLWKcEmgbSZT6lCB5xFXY7yqfyctsqmtCX0/eePgJbioKO4otAVGXL MYxA== X-Gm-Message-State: AOJu0Yw+z3XITX88jMw0eILfptl+BkyhwssYN+YJAK6LjWuM2WfzznH4 T3umv1NbQEl+Mq1gd31HDM2PeOUk43dZK4nJozz8YjLW2VmGB0l5sAxjwShKL0wHAiTLl2h2765 1W7w= X-Gm-Gg: ASbGncs67EO82b3zh7+G+TNtrlSe1hdXzqbzvZEa0jDXybTcBk5GDaOusK143XhISeq vtnOoLgHctpjIfSpuLhekcVEJwwXD2soVzQsWPpBGkrCSMW9PV1Au1IeotR6gVJjiq8rOjBx6dJ GtbWFWrF0XFrxL3q5HXf/ppsVuDlcjRUuRAmQqFPnwuxlqzckTqqYGrzWyPkfpD2jeixVqT2qIs AzmIbUYNcVr6nkO2JdSbD52xdCHf7iLWVJyDQ+z5xxry4PKvOJx2ct5aYWSccCznoZ8fDQIcXAs 2VDvuLODZYc= X-Google-Smtp-Source: AGHT+IFlZNg3a5D/+0UVjtsbJXF0Fx4D6KW0Jctx0T61npUg5ccDQr9emQ/xyJWiuKF7Kv4G7pG8dQ== X-Received: by 2002:a05:6402:13c1:b0:5d0:e563:4475 with SMTP id 4fb4d7f45d1cf-5d972e70305mr3739335a12.29.1736395145700; Wed, 08 Jan 2025 19:59:05 -0800 (PST) Received: from localhost (111-240-139-233.dynamic-ip.hinet.net. [111.240.139.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72aad8dbb65sm37239774b3a.122.2025.01.08.19.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 19:59:05 -0800 (PST) To: The development of GNU GRUB Subject: [PATCH v2 08/10] util/grub-protect: Support NV index mode Date: Thu, 9 Jan 2025 11:58:33 +0800 Message-ID: <20250109035835.22002-9-glin@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250109035835.22002-1-glin@suse.com> References: <20250109035835.22002-1-glin@suse.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=glin@suse.com; helo=mail-ed1-x533.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Gary Lin via Grub-devel Reply-To: The development of GNU GRUB Cc: Gary Lin , Daniel Kiper , mchang@suse.com, patrick.colp@oracle.com, Stefan Berger , jejb@linux.ibm.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: grub-devel-bounces+grub-devel=archiver.kernel.org@gnu.org Sender: grub-devel-bounces+grub-devel=archiver.kernel.org@gnu.org VGhpcyBjb21taXQgaW1wbGVtZW50cyB0aGUgbWlzc2luZyBOViBpbmRleCBtb2RlIHN1cHBvcnQg aW4KJ2dydWItcHJvdGVjdCcuIE5WIGluZGV4IG1vZGUgc3RvcmVzIHRoZSBzZWFsZWQga2V5IGlu IHRoZSBUUE0Kbm9uLXZvbGF0aWxlIG1lbW9yeSAoTlZSQU0pIGluc3RlYWQgb2YgYSBmaWxlLiBU aGVyZSBhcmUgdHdvIHN1cHBvcnRlZAp0eXBlcyBvZiBUUE0gaGFuZGxlcy4KCjEuIFBlcnNpc3Rl bnQgaGFuZGxlICgweDgxMDAwMDAwfjB4ODFGRkZGRkYpCiAgIFRQTSAyLjAgS2V5IEZpbGUgZm9y bWF0ICgtLXRwbTJrZXkpIGlzIG5vdCBzdXBwb3J0ZWQgZHVlIHRvIHRoZQogICBsaW1pdGF0aW9u IG9mIHBlcnNpc3RlbnQgaGFuZGxlcy4gVGhpcyAnZ3J1Yi1wcm90ZWN0JyBjb21tYW5kCiAgIHNl YWxzIHRoZSBrZXkgaW50byB0aGUgcGVyc2lzdGVudCBoYW5kbGUgMHg4MTAwMDAwMC4KCiAgIyBn cnViLXByb3RlY3QgXAogICAgICAtLXByb3RlY3Rvcj10cG0yIFwKICAgICAgLS1hY3Rpb249YWRk IFwKICAgICAgLS10cG0yLWJhbms9c2hhMjU2IFwKICAgICAgLS10cG0yLXBjcnM9NywxMSBcCiAg ICAgIC0tdHBtMi1rZXlmaWxlPWx1a3Mta2V5IFwKICAgICAgLS10cG0yLW52aW5kZXg9MHg4MTAw MDAwMAoKMi4gTlYgaW5kZXggaGFuZGxlICgweDEwMDAwMDB+MHgxRkZGRkZGKQogICBCb3RoIFRQ TSAyLjAgS2V5IEZpbGUgZm9ybWF0IGFuZCB0aGUgcmF3IGZvcm1hdCBhcmUgc3VwcG9ydGVkIGJ5 IE5WCiAgIGluZGV4IGhhbmRsZXMuIEhlcmUgaXMgdGhlICdncnViLXByb3RlY3QnIGNvbW1hbmQg dG8gc2VhbCB0aGUga2V5IGluCiAgIFRQTSAyLjAgS2V5IEZpbGUgZm9ybWF0IGludG8gdGhlIE5W IGluZGV4IGhhbmRsZSAweDEwMDAwMDAuCgogICMgZ3J1Yi1wcm90ZWN0IFwKICAgICAgLS1wcm90 ZWN0b3I9dHBtMiBcCiAgICAgIC0tYWN0aW9uPWFkZCBcCiAgICAgIC0tdHBtMmtleSBcCiAgICAg IC0tdHBtMi1iYW5rPXNoYTI1NiBcCiAgICAgIC0tdHBtMi1wY3JzPTcsMTEgXAogICAgICAtLXRw bTIta2V5ZmlsZT1sdWtzLWtleSBcCiAgICAgIC0tdHBtMi1udmluZGV4PTB4MTAwMDAwMAoKQmVz aWRlcyB0aGUgJ2FkZCcgYWN0aW9uLCB0aGUgY29ycmVzcG9uZGluZyAncmVtb3ZlJyBhY3Rpb24g aXMgYWxzbwppbnRyb2R1Y2VkLiBUbyByZW1vdmUgdGhlIGRhdGEgZnJvbSBhIHBlcnNpc3RlbnQg b3IgTlYgaW5kZXggaGFuZGxlLApqdXN0IHVzZSAnLS10cG0yLW52aW5kZXg9SEFORExFJyBjb21i aW5pbmcgd2l0aCAnLS10cG0yLWV2aWN0Jy4gVGhpcwpzYW1wbGUgY29tbWFuZCByZW1vdmVzIHRo ZSBkYXRhIGZyb20gdGhlIE5WIGluZGV4IGhhbmRsZSAweDEwMDAwMDAuCgogICMgZ3J1Yi1wcm90 ZWN0IFwKICAgICAgLS1wcm90ZWN0b3I9dHBtMiBcCiAgICAgIC0tYWN0aW9uPXJlbW92ZSBcCiAg ICAgIC0tdHBtMi1ldmljdCBcCiAgICAgIC0tdHBtMi1udmluZGV4PTB4MTAwMDAwMAoKU2lnbmVk LW9mZi1ieTogR2FyeSBMaW4gPGdsaW5Ac3VzZS5jb20+Ci0tLQogdXRpbC9ncnViLXByb3RlY3Qu YyB8IDM0MyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogMSBm aWxlIGNoYW5nZWQsIDI4NyBpbnNlcnRpb25zKCspLCA1NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS91dGlsL2dydWItcHJvdGVjdC5jIGIvdXRpbC9ncnViLXByb3RlY3QuYwppbmRleCA1Yjdl OTUyZjQuLjYyMTlkMjRhMiAxMDA2NDQKLS0tIGEvdXRpbC9ncnViLXByb3RlY3QuYworKysgYi91 dGlsL2dydWItcHJvdGVjdC5jCkBAIC02MSw3ICs2MSw4IEBAIHR5cGVkZWYgZW51bSBwcm90ZWN0 X29wdAogICBQUk9URUNUX09QVF9UUE0yX0tFWUZJTEUsCiAgIFBST1RFQ1RfT1BUX1RQTTJfT1VU RklMRSwKICAgUFJPVEVDVF9PUFRfVFBNMl9FVklDVCwKLSAgUFJPVEVDVF9PUFRfVFBNMl9UUE0y S0VZCisgIFBST1RFQ1RfT1BUX1RQTTJfVFBNMktFWSwKKyAgUFJPVEVDVF9PUFRfVFBNMl9OVklO REVYLAogfSBwcm90ZWN0X29wdF90OwogCiAvKiBPcHRpb24gZmxhZ3MgdG8ga2VlcCB0cmFjayBv ZiBzcGVjaWZpZWQgYXJndW1lbnRzICovCkBAIC03OSw3ICs4MCw4IEBAIHR5cGVkZWYgZW51bSBw cm90ZWN0X2FyZwogICBQUk9URUNUX0FSR19UUE0yX0tFWUZJTEUgICAgPSAxIDw8IDcsCiAgIFBS T1RFQ1RfQVJHX1RQTTJfT1VURklMRSAgICA9IDEgPDwgOCwKICAgUFJPVEVDVF9BUkdfVFBNMl9F VklDVCAgICAgID0gMSA8PCA5LAotICBQUk9URUNUX0FSR19UUE0yX1RQTTJLRVkgICAgPSAxIDw8 IDEwCisgIFBST1RFQ1RfQVJHX1RQTTJfVFBNMktFWSAgICA9IDEgPDwgMTAsCisgIFBST1RFQ1Rf QVJHX1RQTTJfTlZJTkRFWCAgICA9IDEgPDwgMTEKIH0gcHJvdGVjdF9hcmdfdDsKIAogdHlwZWRl ZiBlbnVtIHByb3RlY3RfcHJvdGVjdG9yCkBAIC0xMTEsNiArMTEzLDcgQEAgdHlwZWRlZiBzdHJ1 Y3QgcHJvdGVjdF9hcmdzCiAgIGNvbnN0IGNoYXIgKnRwbTJfb3V0ZmlsZTsKICAgYm9vbCB0cG0y X2V2aWN0OwogICBib29sIHRwbTJfdHBtMmtleTsKKyAgVFBNX0hBTkRMRV90IHRwbTJfbnZpbmRl eDsKIH0gcHJvdGVjdF9hcmdzX3Q7CiAKIHN0YXRpYyBzdHJ1Y3QgYXJncF9vcHRpb24gcHJvdGVj dF9vcHRpb25zW10gPQpAQCAtMjI0LDYgKzIyNywxNSBAQCBzdGF0aWMgc3RydWN0IGFyZ3Bfb3B0 aW9uIHByb3RlY3Rfb3B0aW9uc1tdID0KIAlOXygiVXNlIFRQTSAyLjAgS2V5IEZpbGUgZm9ybWF0 LiIpLAogICAgICAgLmdyb3VwID0gMAogICAgIH0sCisgICAgeworICAgICAgLm5hbWUgPSAidHBt Mi1udmluZGV4IiwKKyAgICAgIC5rZXkgICA9IFBST1RFQ1RfT1BUX1RQTTJfTlZJTkRFWCwKKyAg ICAgIC5hcmcgICA9ICJOVU0iLAorICAgICAgLmZsYWdzID0gMCwKKyAgICAgIC5kb2MgICA9CisJ Tl8oIlN0b3JlIHRoZSBzZWFsZWQga2V5IGluIGEgcGVyc2lzdGVudCBvciBOViBpbmRleCBoYW5k bGUuIiksCisgICAgICAuZ3JvdXAgPSAwCisgICAgfSwKICAgICAvKiBFbmQgb2YgbGlzdCAqLwog ICAgIHsgMCwgMCwgMCwgMCwgMCwgMCB9CiAgIH07CkBAIC02NjgsOCArNjgwLDggQEAgZXh0ZXJu IGFzbjFfc3RhdGljX25vZGUgdHBtMmtleV9hc24xX3RhYltdOwogI2RlZmluZSBUUE0yS0VZX1NF QUxFRF9LRVlfT0lEICIyLjIzLjEzMy4xMC4xLjUiCiAKIHN0YXRpYyBncnViX2Vycl90Ci1wcm90 ZWN0X3RwbTJfZXhwb3J0X3RwbTJrZXkgKGNvbnN0IHByb3RlY3RfYXJnc190ICphcmdzLAotCQkJ ICAgICB0cG0yX3NlYWxlZF9rZXlfdCAqc2VhbGVkX2tleSkKK3Byb3RlY3RfdHBtMl9leHBvcnRf dHBtMmtleSAoY29uc3QgcHJvdGVjdF9hcmdzX3QgKmFyZ3MsIHRwbTJfc2VhbGVkX2tleV90ICpz ZWFsZWRfa2V5LAorCQkJICAgICB2b2lkICoqZGVyX2J1ZiwgaW50ICpkZXJfYnVmX3NpemUpCiB7 CiAgIGNvbnN0IGNoYXIgKnNlYWxlZF9rZXlfb2lkID0gVFBNMktFWV9TRUFMRURfS0VZX09JRDsK ICAgYXNuMV9ub2RlIGFzbjFfZGVmID0gTlVMTDsKQEAgLTY4OSwxMiArNzAxLDEzIEBAIHByb3Rl Y3RfdHBtMl9leHBvcnRfdHBtMmtleSAoY29uc3QgcHJvdGVjdF9hcmdzX3QgKmFyZ3MsCiAgIH07 CiAgIHN0cnVjdCBncnViX3RwbTJfYnVmZmVyIHB1Yl9idWY7CiAgIHN0cnVjdCBncnViX3RwbTJf YnVmZmVyIHByaXZfYnVmOwotICB2b2lkICpkZXJfYnVmID0gTlVMTDsKLSAgaW50IGRlcl9idWZf c2l6ZSA9IDA7CiAgIGludCBpOwogICBpbnQgcmV0OwogICBncnViX2Vycl90IGVycjsKIAorICBp ZiAoZGVyX2J1ZiA9PSBOVUxMKQorICAgIHJldHVybiBHUlVCX0VSUl9CQURfQVJHVU1FTlQ7CisK ICAgZm9yIChpID0gMDsgaSA8IGFyZ3MtPnRwbTJfcGNyX2NvdW50OyBpKyspCiAgICAgVFBNU19Q Q1JfU0VMRUNUSU9OX1NlbGVjdFBDUiAoJnBjcl9zZWwucGNyU2VsZWN0aW9uc1swXSwgYXJncy0+ dHBtMl9wY3JzW2ldKTsKIApAQCAtODQ0LDggKzg1Nyw4IEBAIHByb3RlY3RfdHBtMl9leHBvcnRf dHBtMmtleSAoY29uc3QgcHJvdGVjdF9hcmdzX3QgKmFyZ3MsCiAgICAgfQogCiAgIC8qIENyZWF0 ZSB0aGUgREVSIGJpbmFyeSAqLwotICBkZXJfYnVmX3NpemUgPSAwOwotICByZXQgPSBhc24xX2Rl cl9jb2RpbmcgKHRwbTJrZXksICIiLCBOVUxMLCAmZGVyX2J1Zl9zaXplLCBOVUxMKTsKKyAgKmRl cl9idWZfc2l6ZSA9IDA7CisgIHJldCA9IGFzbjFfZGVyX2NvZGluZyAodHBtMmtleSwgIiIsIE5V TEwsIGRlcl9idWZfc2l6ZSwgTlVMTCk7CiAgIGlmIChyZXQgIT0gQVNOMV9NRU1fRVJST1IpCiAg ICAgewogICAgICAgZnByaW50ZiAoc3RkZXJyLCAiRmFpbGVkIHRvIGdldCBERVIgc2l6ZTogMHgl eFxuIiwgcmV0KTsKQEAgLTg1MywxNSArODY2LDE1IEBAIHByb3RlY3RfdHBtMl9leHBvcnRfdHBt MmtleSAoY29uc3QgcHJvdGVjdF9hcmdzX3QgKmFyZ3MsCiAgICAgICBnb3RvIGVycm9yOwogICAg IH0KIAotICBkZXJfYnVmID0gZ3J1Yl9tYWxsb2MgKGRlcl9idWZfc2l6ZSk7Ci0gIGlmIChkZXJf YnVmID09IE5VTEwpCisgICpkZXJfYnVmID0gZ3J1Yl9tYWxsb2MgKCpkZXJfYnVmX3NpemUpOwor ICBpZiAoKmRlcl9idWYgPT0gTlVMTCkKICAgICB7CiAgICAgICBmcHJpbnRmIChzdGRlcnIsICJG YWlsZWQgdG8gYWxsb2NhdGUgbWVtb3J5IGZvciBERVIgZW5jb2RpbmdcbiIpOwogICAgICAgZXJy ID0gR1JVQl9FUlJfT1VUX09GX01FTU9SWTsKICAgICAgIGdvdG8gZXJyb3I7CiAgICAgfQogCi0g IHJldCA9IGFzbjFfZGVyX2NvZGluZyAodHBtMmtleSwgIiIsIGRlcl9idWYsICZkZXJfYnVmX3Np emUsIE5VTEwpOworICByZXQgPSBhc24xX2Rlcl9jb2RpbmcgKHRwbTJrZXksICIiLCAqZGVyX2J1 ZiwgZGVyX2J1Zl9zaXplLCBOVUxMKTsKICAgaWYgKHJldCAhPSBBU04xX1NVQ0NFU1MpCiAgICAg ewogICAgICAgZnByaW50ZiAoc3RkZXJyLCAiREVSIGNvZGluZyBlcnJvcjogMHgleFxuIiwgcmV0 KTsKQEAgLTg2OSwxMyArODgyLDcgQEAgcHJvdGVjdF90cG0yX2V4cG9ydF90cG0ya2V5IChjb25z dCBwcm90ZWN0X2FyZ3NfdCAqYXJncywKICAgICAgIGdvdG8gZXJyb3I7CiAgICAgfQogCi0gIGVy ciA9IHByb3RlY3Rfd3JpdGVfZmlsZSAoYXJncy0+dHBtMl9vdXRmaWxlLCBkZXJfYnVmLCBkZXJf YnVmX3NpemUpOwotICBpZiAoZXJyICE9IEdSVUJfRVJSX05PTkUpCi0gICAgZnByaW50ZiAoc3Rk ZXJyLCBOXygiQ291bGQgbm90IHdyaXRlIHRwbTJrZXkgZmlsZSAoJXMpLlxuIiksIHN0cmVycm9y IChlcnJubykpOwotCiAgZXJyb3I6Ci0gIGdydWJfZnJlZSAoZGVyX2J1Zik7Ci0KICAgaWYgKHRw bTJrZXkpCiAgICAgYXNuMV9kZWxldGVfc3RydWN0dXJlICgmdHBtMmtleSk7CiAKQEAgLTg4Mywx MCArODkwLDggQEAgcHJvdGVjdF90cG0yX2V4cG9ydF90cG0ya2V5IChjb25zdCBwcm90ZWN0X2Fy Z3NfdCAqYXJncywKIH0KIAogc3RhdGljIGdydWJfZXJyX3QKLXByb3RlY3RfdHBtMl9leHBvcnRf c2VhbGVkX2tleSAoY29uc3QgY2hhciAqZmlsZXBhdGgsCi0JCQkJdHBtMl9zZWFsZWRfa2V5X3Qg KnNlYWxlZF9rZXkpCitwcm90ZWN0X3RwbTJfZXhwb3J0X3JhdyAodHBtMl9zZWFsZWRfa2V5X3Qg KnNlYWxlZF9rZXksIHZvaWQgKipvdXRfYnVmLCBpbnQgKm91dF9idWZfc2l6ZSkKIHsKLSAgZ3J1 Yl9lcnJfdCBlcnI7CiAgIHN0cnVjdCBncnViX3RwbTJfYnVmZmVyIGJ1ZjsKIAogICBncnViX3Rw bTJfYnVmZmVyX2luaXQgKCZidWYpOwpAQCAtODk2LDEzICs5MDEsOTggQEAgcHJvdGVjdF90cG0y X2V4cG9ydF9zZWFsZWRfa2V5IChjb25zdCBjaGFyICpmaWxlcGF0aCwKICAgaWYgKGJ1Zi5lcnJv ciAhPSAwKQogICAgIHJldHVybiBHUlVCX0VSUl9CQURfQVJHVU1FTlQ7CiAKLSAgZXJyID0gcHJv dGVjdF93cml0ZV9maWxlIChmaWxlcGF0aCwgYnVmLmRhdGEsIGJ1Zi5zaXplKTsKLSAgaWYgKGVy ciAhPSBHUlVCX0VSUl9OT05FKQotICAgIGZwcmludGYgKHN0ZGVyciwgTl8oIkNvdWxkIG5vdCB3 cml0ZSBzZWFsZWQga2V5IGZpbGUgKCVzKS5cbiIpLCBzdHJlcnJvciAoZXJybm8pKTsKKyAgKm91 dF9idWZfc2l6ZSA9IGJ1Zi5zaXplOworICAqb3V0X2J1ZiA9IGdydWJfbWFsbG9jIChidWYuc2l6 ZSk7CisKKyAgaWYgKCpvdXRfYnVmID09IE5VTEwpCisgICAgeworICAgICAgZnByaW50ZiAoc3Rk ZXJyLCBOXygiQ291bGQgbm90IGFsbG9jYXRlIG1lbW9yeSBmb3IgdGhlIHJhdyBmb3JtYXQga2V5 LlxuIikpOworICAgICAgcmV0dXJuIEdSVUJfRVJSX09VVF9PRl9NRU1PUlk7CisgICAgfQorCisg IGdydWJfbWVtY3B5ICgqb3V0X2J1ZiwgYnVmLmRhdGEsIGJ1Zi5zaXplKTsKKworICByZXR1cm4g R1JVQl9FUlJfTk9ORTsKK30KKworc3RhdGljIGdydWJfZXJyX3QKK3Byb3RlY3RfdHBtMl9leHBv cnRfcGVyc2lzdGVudCAocHJvdGVjdF9hcmdzX3QgKmFyZ3MsCisJCQkJVFBNX0hBTkRMRV90IHNy a19oYW5kbGUsCisJCQkJdHBtMl9zZWFsZWRfa2V5X3QgKnNlYWxlZF9rZXkpCit7CisgIFRQTVNf QVVUSF9DT01NQU5EX3QgYXV0aENtZCA9IHswfTsKKyAgVFBNMkJfTkFNRV90IG5hbWUgPSB7MH07 CisgIFRQTV9IQU5ETEVfdCBzZWFsZWRfaGFuZGxlOworICBUUE1fUkNfdCByYzsKKyAgZ3J1Yl9l cnJfdCBlcnIgPSBHUlVCX0VSUl9OT05FOworCisgIC8qIExvYWQgdGhlIHNlYWxlZCBrZXkgYW5k IGFzc29jaWF0ZSBpdCB3aXRoIHRoZSBTUksgKi8KKyAgYXV0aENtZC5zZXNzaW9uSGFuZGxlID0g VFBNX1JTX1BXOworICByYyA9IGdydWJfdHBtMl9sb2FkIChzcmtfaGFuZGxlLCAmYXV0aENtZCwg JnNlYWxlZF9rZXktPnByaXZhdGUsICZzZWFsZWRfa2V5LT5wdWJsaWMsCisJCSAgICAgICAmc2Vh bGVkX2hhbmRsZSwgJm5hbWUsIE5VTEwpOworICBpZiAocmMgIT0gVFBNX1JDX1NVQ0NFU1MpCisg ICAgeworICAgICAgZnByaW50ZiAoc3RkZXJyLCAiRmFpbGVkIHRvIGxvYWQgc2VhbGVkIGtleSAo VFBNMl9Mb2FkOiAleCkuXG4iLCByYyk7CisgICAgICByZXR1cm4gR1JVQl9FUlJfQkFEX0RFVklD RTsKKyAgICB9CisKKyAgLyogTWFrZSB0aGUgc2VhbGVkIGtleSBvYmplY3QgcGVyc2lzdGVudCAq LworICBhdXRoQ21kLnNlc3Npb25IYW5kbGUgPSBUUE1fUlNfUFc7CisgIHJjID0gZ3J1Yl90cG0y X2V2aWN0Y29udHJvbCAoVFBNX1JIX09XTkVSLCBzZWFsZWRfaGFuZGxlLCAmYXV0aENtZCwgYXJn cy0+dHBtMl9udmluZGV4LCBOVUxMKTsKKyAgaWYgKHJjICE9IFRQTV9SQ19TVUNDRVNTKQorICAg IHsKKyAgICAgIGZwcmludGYgKHN0ZGVyciwgIkZhaWxlZCB0byBtYWtlIHNlYWxlZCBrZXkgcGVy c2lzdGVudCB3aXRoIGhhbmRsZSAweCV4IChUUE0yX0V2aWN0Q29udHJvbDogMHgleCkuXG4iLCBh cmdzLT50cG0yX252aW5kZXgsIHJjKTsKKyAgICAgIGVyciA9IEdSVUJfRVJSX0JBRF9ERVZJQ0U7 CisgICAgICBnb3RvIGV4aXQ7CisgICAgfQorCisgZXhpdDoKKyAgZ3J1Yl90cG0yX2ZsdXNoY29u dGV4dCAoc2VhbGVkX2hhbmRsZSk7CiAKICAgcmV0dXJuIGVycjsKIH0KIAorc3RhdGljIGdydWJf ZXJyX3QKK3Byb3RlY3RfdHBtMl9leHBvcnRfbnZpbmRleCAocHJvdGVjdF9hcmdzX3QgKmFyZ3Ms IHZvaWQgKmRhdGEsIGludCBkYXRhX3NpemUpCit7CisgIFRQTVNfQVVUSF9DT01NQU5EX3QgYXV0 aENtZCA9IHswfTsKKyAgVFBNMkJfTlZfUFVCTElDX3QgcHViX2luZm8gPSB7MH07CisgIFRQTTJC X01BWF9OVl9CVUZGRVJfdCBudl9kYXRhID0gezB9OworICBUUE1fUkNfdCByYzsKKworICBpZiAo ZGF0YV9zaXplID4gVFBNX01BWF9OVl9CVUZGRVJfU0laRSB8fCBkYXRhX3NpemUgPCAwKQorICAg IHsKKyAgICAgIGZwcmludGYgKHN0ZGVyciwgTl8oIkludmFsaWQgdHBtMmtleSBzaXplIGZvciBU UE0gTlYgYnVmZmVyXG4iKSk7CisgICAgICByZXR1cm4gR1JVQl9FUlJfT1VUX09GX1JBTkdFOwor ICAgIH0KKworICBwdWJfaW5mby5udlB1YmxpYy5udkluZGV4ID0gYXJncy0+dHBtMl9udmluZGV4 OworICBwdWJfaW5mby5udlB1YmxpYy5uYW1lQWxnID0gVFBNX0FMR19TSEEyNTY7CisgIHB1Yl9p bmZvLm52UHVibGljLmF0dHJpYnV0ZXMgPSBUUE1BX05WX09XTkVSV1JJVEUgfCBUUE1BX05WX09X TkVSUkVBRDsKKyAgcHViX2luZm8ubnZQdWJsaWMuZGF0YVNpemUgPSAoZ3J1Yl91aW50MTZfdCkg ZGF0YV9zaXplOworCisgIGF1dGhDbWQuc2Vzc2lvbkhhbmRsZSA9IFRQTV9SU19QVzsKKyAgcmMg PSBncnViX3RwbTJfbnZfZGVmaW5lc3BhY2UgKFRQTV9SSF9PV05FUiwgJmF1dGhDbWQsIE5VTEws ICZwdWJfaW5mbyk7CisgIGlmIChyYyAhPSBUUE1fUkNfU1VDQ0VTUykKKyAgICB7CisgICAgICBm cHJpbnRmIChzdGRlcnIsICJGYWlsZWQgdG8gZGVmaW5lIE5WIHNwYWNlIGZvciAweCV4IChUUE0y X05WX0RlZmluZVNwYWNlOiAweCV4KVxuIiwgYXJncy0+dHBtMl9udmluZGV4LCByYyk7CisgICAg ICByZXR1cm4gR1JVQl9FUlJfQkFEX0RFVklDRTsKKyAgICB9CisKKyAgYXV0aENtZC5zZXNzaW9u SGFuZGxlID0gVFBNX1JTX1BXOworICBncnViX21lbWNweSAobnZfZGF0YS5idWZmZXIsIGRhdGEs IGRhdGFfc2l6ZSk7CisgIG52X2RhdGEuc2l6ZSA9IChncnViX3VpbnQxNl90KSBkYXRhX3NpemU7 CisKKyAgcmMgPSBncnViX3RwbTJfbnZfd3JpdGUgKFRQTV9SSF9PV05FUiwgYXJncy0+dHBtMl9u dmluZGV4LCAmYXV0aENtZCwgJm52X2RhdGEsIDApOworICBpZiAocmMgIT0gVFBNX1JDX1NVQ0NF U1MpCisgICAgeworICAgICAgZnByaW50ZiAoc3RkZXJyLCAiRmFpbGVkIHRvIHdyaXRlIGRhdGEg aW50byAweCV4IChUUE0yX05WX1dyaXRlOiAweCV4KVxuIiwgYXJncy0+dHBtMl9udmluZGV4LCBy Yyk7CisgICAgICByZXR1cm4gR1JVQl9FUlJfQkFEX0RFVklDRTsKKyAgICB9CisKKyAgcmV0dXJu IEdSVUJfRVJSX05PTkU7Cit9CisKIHN0YXRpYyBncnViX2Vycl90CiBwcm90ZWN0X3RwbTJfYWRk IChwcm90ZWN0X2FyZ3NfdCAqYXJncykKIHsKQEAgLTkxMSw2ICsxMDAxLDggQEAgcHJvdGVjdF90 cG0yX2FkZCAocHJvdGVjdF9hcmdzX3QgKmFyZ3MpCiAgIGdydWJfc2l6ZV90IGtleV9zaXplOwog ICBUUE1fSEFORExFX3Qgc3JrOwogICBUUE0yQl9ESUdFU1RfdCBwb2xpY3lfZGlnZXN0OworICB2 b2lkICpvdXRfYnVmID0gTlVMTDsKKyAgaW50IG91dF9idWZfc2l6ZTsKICAgdHBtMl9zZWFsZWRf a2V5X3Qgc2VhbGVkX2tleTsKIAogICBlcnIgPSBwcm90ZWN0X3RwbTJfb3Blbl9kZXZpY2UgKGFy Z3MtPnRwbTJfZGV2aWNlKTsKQEAgLTk0MCwxNSArMTAzMiw1MSBAQCBwcm90ZWN0X3RwbTJfYWRk IChwcm90ZWN0X2FyZ3NfdCAqYXJncykKICAgaWYgKGVyciAhPSBHUlVCX0VSUl9OT05FKQogICAg IGdvdG8gZXhpdDM7CiAKLSAgaWYgKGFyZ3MtPnRwbTJfdHBtMmtleSAhPSAwKQotICAgIGVyciA9 IHByb3RlY3RfdHBtMl9leHBvcnRfdHBtMmtleSAoYXJncywgJnNlYWxlZF9rZXkpOworICBpZiAo YXJncy0+dHBtMl90cG0ya2V5ID09IHRydWUpCisgICAgeworICAgICAgZXJyID0gcHJvdGVjdF90 cG0yX2V4cG9ydF90cG0ya2V5IChhcmdzLCAmc2VhbGVkX2tleSwgJm91dF9idWYsICZvdXRfYnVm X3NpemUpOworICAgICAgaWYgKGVyciAhPSBHUlVCX0VSUl9OT05FKQorCXsKKwkgIGZwcmludGYg KHN0ZGVyciwgTl8oIkNvdWxkIG5vdCBleHBvcnQgdG8gVFBNIDIuMCBLZXkgRmlsZSBmb3JtYXRc biIpKTsKKwkgIGdvdG8gZXhpdDM7CisJfQorICAgIH0KICAgZWxzZQotICAgIGVyciA9IHByb3Rl Y3RfdHBtMl9leHBvcnRfc2VhbGVkX2tleSAoYXJncy0+dHBtMl9vdXRmaWxlLCAmc2VhbGVkX2tl eSk7Ci0gIGlmIChlcnIgIT0gR1JVQl9FUlJfTk9ORSkKLSAgICBnb3RvIGV4aXQzOworICAgIHsK KyAgICAgIGVyciA9IHByb3RlY3RfdHBtMl9leHBvcnRfcmF3ICgmc2VhbGVkX2tleSwgJm91dF9i dWYsICZvdXRfYnVmX3NpemUpOworICAgICAgaWYgKGVyciAhPSBHUlVCX0VSUl9OT05FKQorCXsK KwkgIGZwcmludGYgKHN0ZGVyciwgTl8oIkNvdWxkIG5vdCBleHBvcnQgdG8gdGhlIHJhdyBmb3Jt YXRcbiIpKTsKKwkgIGdvdG8gZXhpdDM7CisJfQorICAgIH0KKworICBpZiAoYXJncy0+dHBtMl9v dXRmaWxlICE9IE5VTEwpCisgICAgeworICAgICAgZXJyID0gcHJvdGVjdF93cml0ZV9maWxlIChh cmdzLT50cG0yX291dGZpbGUsIG91dF9idWYsIG91dF9idWZfc2l6ZSk7CisgICAgICBpZiAoZXJy ICE9IEdSVUJfRVJSX05PTkUpCisJeworCSAgZnByaW50ZiAoc3RkZXJyLCBOXygiQ291bGQgbm90 IHdyaXRlIGtleSBmaWxlICglcykuXG4iKSwgc3RyZXJyb3IgKGVycm5vKSk7CisJICBnb3RvIGV4 aXQzOworCX0KKyAgICB9CisKKyAgaWYgKFRQTV9IVF9JU19OVklOREVYIChhcmdzLT50cG0yX252 aW5kZXgpID09IHRydWUpCisgICAgeworICAgICAgZXJyID0gcHJvdGVjdF90cG0yX2V4cG9ydF9u dmluZGV4IChhcmdzLCBvdXRfYnVmLCBvdXRfYnVmX3NpemUpOworICAgICAgaWYgKGVyciAhPSBH UlVCX0VSUl9OT05FKQorCWdvdG8gZXhpdDM7CisgICAgfQorICBlbHNlIGlmIChUUE1fSFRfSVNf UEVSU0lTVEVOVCAoYXJncy0+dHBtMl9udmluZGV4KSA9PSB0cnVlKQorICAgIHsKKyAgICAgIGVy ciA9IHByb3RlY3RfdHBtMl9leHBvcnRfcGVyc2lzdGVudCAoYXJncywgc3JrLCAmc2VhbGVkX2tl eSk7CisgICAgICBpZiAoZXJyICE9IEdSVUJfRVJSX05PTkUpCisJZ290byBleGl0MzsKKyAgICB9 CiAKICBleGl0MzoKICAgZ3J1Yl90cG0yX2ZsdXNoY29udGV4dCAoc3JrKTsKKyAgZ3J1Yl9mcmVl IChvdXRfYnVmKTsKIAogIGV4aXQyOgogICBncnViX2ZyZWUgKGtleSk7CkBAIC05NjAsMTQgKzEw ODgsNjYgQEAgcHJvdGVjdF90cG0yX2FkZCAocHJvdGVjdF9hcmdzX3QgKmFyZ3MpCiB9CiAKIHN0 YXRpYyBncnViX2Vycl90Ci1wcm90ZWN0X3RwbTJfcmVtb3ZlIChwcm90ZWN0X2FyZ3NfdCAqYXJn cykKK3Byb3RlY3RfdHBtMl9ldmljdCAoVFBNX0hBTkRMRV90IGhhbmRsZSkKIHsKICAgVFBNX1JD X3QgcmM7CiAgIFRQTTJCX1BVQkxJQ190IHB1YmxpYzsKLSAgVFBNU19BVVRIX0NPTU1BTkRfdCBh dXRoQ29tbWFuZCA9IHswfTsKKyAgVFBNU19BVVRIX0NPTU1BTkRfdCBhdXRoQ21kID0gezB9Owor CisgIC8qIEZpbmQgdGhlIHBlcnNpc3RlbnQgaGFuZGxlICovCisgIHJjID0gZ3J1Yl90cG0yX3Jl YWRwdWJsaWMgKGhhbmRsZSwgTlVMTCwgJnB1YmxpYyk7CisgIGlmIChyYyAhPSBUUE1fUkNfU1VD Q0VTUykKKyAgICB7CisgICAgICBmcHJpbnRmIChzdGRlcnIsICJIYW5kbGUgMHgleCBub3QgZm91 bmQuXG4iLCBoYW5kbGUpOworICAgICAgcmV0dXJuIEdSVUJfRVJSX0JBRF9BUkdVTUVOVDsKKyAg ICB9CisKKyAgLyogRXZpY3QgdGhlIHBlcnNpc3RlbnQgaGFuZGxlICovCisgIGF1dGhDbWQuc2Vz c2lvbkhhbmRsZSA9IFRQTV9SU19QVzsKKyAgcmMgPSBncnViX3RwbTJfZXZpY3Rjb250cm9sIChU UE1fUkhfT1dORVIsIGhhbmRsZSwgJmF1dGhDbWQsIGhhbmRsZSwgTlVMTCk7CisgIGlmIChyYyAh PSBUUE1fUkNfU1VDQ0VTUykKKyAgICB7CisgICAgICBmcHJpbnRmIChzdGRlcnIsICJGYWlsZWQg dG8gZXZpY3QgaGFuZGxlIDB4JXggKFRQTTJfRXZpY3RDb250cm9sOiAweCV4KS5cbiIsIGhhbmRs ZSwgcmMpOworICAgICAgcmV0dXJuIEdSVUJfRVJSX0JBRF9ERVZJQ0U7CisgICAgfQorCisgIHJl dHVybiBHUlVCX0VSUl9OT05FOworfQorCitzdGF0aWMgZ3J1Yl9lcnJfdAorcHJvdGVjdF90cG0y X252X3VuZGVmaW5lIChUUE1fSEFORExFX3QgaGFuZGxlKQoreworICBUUE1fUkNfdCByYzsKKyAg VFBNMkJfTlZfUFVCTElDX3QgbnZfcHVibGljOworICBUUE1TX0FVVEhfQ09NTUFORF90IGF1dGhD bWQgPSB7MH07CisgIFRQTTJCX05BTUVfdCBudl9uYW1lOworCisgIC8qIEZpbmQgdGhlIG52aW5k ZXggaGFuZGxlICovCisgIHJjID0gZ3J1Yl90cG0yX252X3JlYWRwdWJsaWMgKGhhbmRsZSwgTlVM TCwgJm52X3B1YmxpYywgJm52X25hbWUpOworICBpZiAocmMgIT0gVFBNX1JDX1NVQ0NFU1MpCisg ICAgeworICAgICAgZnByaW50ZiAoc3RkZXJyLCAiSGFuZGxlIDB4JXggbm90IGZvdW5kLlxuIiwg aGFuZGxlKTsKKyAgICAgIHJldHVybiBHUlVCX0VSUl9CQURfQVJHVU1FTlQ7OworICAgIH0KKwor ICAvKiBVbmRlZmluZSB0aGUgbnZpbmRleCBoYW5kbGUgKi8KKyAgYXV0aENtZC5zZXNzaW9uSGFu ZGxlID0gVFBNX1JTX1BXOworICByYyA9IGdydWJfdHBtMl9udl91bmRlZmluZXNwYWNlIChUUE1f UkhfT1dORVIsIGhhbmRsZSwgJmF1dGhDbWQpOworICBpZiAocmMgIT0gVFBNX1JDX1NVQ0NFU1Mp CisgICAgeworICAgICAgZnByaW50ZiAoc3RkZXJyLCAiRmFpbGVkIHRvIHVuZGVmaW5lIGhhbmRs ZSAweCV4IChUUE0yX05WX1VuZGVmaW5lU3BhY2U6IDB4JXgpLlxuIiwgaGFuZGxlLCByYyk7Cisg ICAgICByZXR1cm4gR1JVQl9FUlJfQkFEX0RFVklDRTsKKyAgICB9CisKKyAgcmV0dXJuIEdSVUJf RVJSX05PTkU7Cit9CisKK3N0YXRpYyBncnViX2Vycl90Citwcm90ZWN0X3RwbTJfcmVtb3ZlIChw cm90ZWN0X2FyZ3NfdCAqYXJncykKK3sKICAgZ3J1Yl9lcnJfdCBlcnI7CiAKLSAgaWYgKGFyZ3Mt PnRwbTJfZXZpY3QgPT0gMCkKKyAgaWYgKGFyZ3MtPnRwbTJfZXZpY3QgPT0gZmFsc2UpCiAgICAg ewogICAgICAgcHJpbnRmICgiLS10cG0yLWV2aWN0IG5vdCBzcGVjaWZpZWQsIG5vdGhpbmcgdG8g ZG8uXG4iKTsKICAgICAgIHJldHVybiBHUlVCX0VSUl9OT05FOwpAQCAtOTc3LDM1ICsxMTU3LDQx IEBAIHByb3RlY3RfdHBtMl9yZW1vdmUgKHByb3RlY3RfYXJnc190ICphcmdzKQogICBpZiAoZXJy ICE9IEdSVUJfRVJSX05PTkUpCiAgICAgcmV0dXJuIGVycjsKIAotICAvKiBGaW5kIFNSSyAqLwot ICByYyA9IGdydWJfdHBtMl9yZWFkcHVibGljIChhcmdzLT50cG0yX3NyaywgTlVMTCwgJnB1Ymxp Yyk7Ci0gIGlmIChyYyAhPSBUUE1fUkNfU1VDQ0VTUykKKyAgaWYgKGFyZ3MtPnRwbTJfc3JrICE9 IDApCiAgICAgewotICAgICAgZnByaW50ZiAoc3RkZXJyLCAiU1JLIHdpdGggaGFuZGxlIDB4JXgg bm90IGZvdW5kLlxuIiwgYXJncy0+dHBtMl9zcmspOwotICAgICAgZXJyID0gR1JVQl9FUlJfQkFE X0FSR1VNRU5UOwotICAgICAgZ290byBleGl0MTsKKyAgICAgIGVyciA9IHByb3RlY3RfdHBtMl9l dmljdCAoYXJncy0+dHBtMl9zcmspOworICAgICAgaWYgKGVyciAhPSBHUlVCX0VSUl9OT05FKQor CWdvdG8gZXhpdDsKICAgICB9CiAKLSAgLyogRXZpY3QgU1JLICovCi0gIGF1dGhDb21tYW5kLnNl c3Npb25IYW5kbGUgPSBUUE1fUlNfUFc7Ci0KLSAgcmMgPSBncnViX3RwbTJfZXZpY3Rjb250cm9s IChUUE1fUkhfT1dORVIsIGFyZ3MtPnRwbTJfc3JrLCAmYXV0aENvbW1hbmQsIGFyZ3MtPnRwbTJf c3JrLCBOVUxMKTsKLSAgaWYgKHJjICE9IFRQTV9SQ19TVUNDRVNTKQorICBpZiAoYXJncy0+dHBt Ml9udmluZGV4ICE9IDApCiAgICAgewotICAgICAgZnByaW50ZiAoc3RkZXJyLCAiRmFpbGVkIHRv IGV2aWN0IFNSSyB3aXRoIGhhbmRsZSAweCV4IChUUE0yX0V2aWN0Q29udHJvbDogMHgleCkuXG4i LCBhcmdzLT50cG0yX3NyaywgcmMpOwotICAgICAgZXJyID0gR1JVQl9FUlJfQkFEX0RFVklDRTsK LSAgICAgIGdvdG8gZXhpdDI7CisgICAgICBpZiAoVFBNX0hUX0lTX1BFUlNJU1RFTlQgKGFyZ3Mt PnRwbTJfbnZpbmRleCkgPT0gdHJ1ZSkKKwl7CisJICBlcnIgPSBwcm90ZWN0X3RwbTJfZXZpY3Qg KGFyZ3MtPnRwbTJfbnZpbmRleCk7CisJICBpZiAoZXJyICE9IEdSVUJfRVJSX05PTkUpCisJICAg IGdvdG8gZXhpdDsKKwl9CisgICAgICBlbHNlIGlmIChUUE1fSFRfSVNfTlZJTkRFWCAoYXJncy0+ dHBtMl9udmluZGV4KSA9PSB0cnVlKQorCXsKKwkgIGVyciA9IHByb3RlY3RfdHBtMl9udl91bmRl ZmluZSAoYXJncy0+dHBtMl9udmluZGV4KTsKKwkgIGlmIChlcnIgIT0gR1JVQl9FUlJfTk9ORSkK KwkgICAgZ290byBleGl0OworCX0KKyAgICAgIGVsc2UKKwl7CisJICBmcHJpbnRmIChzdGRlcnIs ICJVbnN1cHBvcnRlZCBoYW5kbGUgMHgleFxuIiwgYXJncy0+dHBtMl9udmluZGV4KTsKKwkgIGVy ciA9IEdSVUJfRVJSX0JBRF9BUkdVTUVOVDsKKwkgIGdvdG8gZXhpdDsKKwl9CiAgICAgfQogCiAg IGVyciA9IEdSVUJfRVJSX05PTkU7CiAKLSBleGl0MjoKLSAgZ3J1Yl90cG0yX2ZsdXNoY29udGV4 dCAoYXJncy0+dHBtMl9zcmspOwotCi0gZXhpdDE6CisgZXhpdDoKICAgcHJvdGVjdF90cG0yX2Ns b3NlX2RldmljZSAoKTsKIAotICByZXR1cm4gR1JVQl9FUlJfTk9ORTsKKyAgcmV0dXJuIGVycjsK IH0KIAogc3RhdGljIGdydWJfZXJyX3QKQEAgLTEwNDUsOSArMTIzMSwzNiBAQCBwcm90ZWN0X3Rw bTJfYXJnc192ZXJpZnkgKHByb3RlY3RfYXJnc190ICphcmdzKQogCSAgcmV0dXJuIEdSVUJfRVJS X0JBRF9BUkdVTUVOVDsKIAl9CiAKLSAgICAgIGlmIChhcmdzLT50cG0yX291dGZpbGUgPT0gTlVM TCkKKyAgICAgIGlmIChhcmdzLT50cG0yX291dGZpbGUgPT0gTlVMTCAmJiBhcmdzLT50cG0yX252 aW5kZXggPT0gMCkKIAl7Ci0JICBmcHJpbnRmIChzdGRlcnIsIE5fKCItLXRwbTItb3V0ZmlsZSBt dXN0IGJlIHNwZWNpZmllZC5cbiIpKTsKKwkgIGZwcmludGYgKHN0ZGVyciwgTl8oIi0tdHBtMi1v dXRmaWxlIG9yIC0tdHBtMi1udmluZGV4IG11c3QgYmUgc3BlY2lmaWVkLlxuIikpOworCSAgcmV0 dXJuIEdSVUJfRVJSX0JBRF9BUkdVTUVOVDsKKwl9CisKKyAgICAgIGlmIChhcmdzLT50cG0yX252 aW5kZXggIT0gMCkKKwl7CisJICBpZiAoYXJncy0+dHBtMl90cG0ya2V5ID09IHRydWUgJiYgVFBN X0hUX0lTX1BFUlNJU1RFTlQgKGFyZ3MtPnRwbTJfbnZpbmRleCkgPT0gdHJ1ZSkKKwkgICAgewor CSAgICAgIGZwcmludGYgKHN0ZGVyciwgTl8oIlBlcnNpc3RlbnQgaGFuZGxlIGRvZXMgbm90IHN1 cHBvcnQgVFBNIDIuMCBLZXkgRmlsZSBmb3JtYXQuXG4iKSk7CisJICAgICAgcmV0dXJuIEdSVUJf RVJSX0JBRF9BUkdVTUVOVDsKKwkgICAgfQorCisJICBpZiAoVFBNX0hUX0lTX1BFUlNJU1RFTlQg KGFyZ3MtPnRwbTJfbnZpbmRleCkgPT0gZmFsc2UgJiYgVFBNX0hUX0lTX05WSU5ERVggKGFyZ3Mt PnRwbTJfbnZpbmRleCkgPT0gZmFsc2UpCisJICAgIHsKKwkgICAgICBmcHJpbnRmIChzdGRlcnIs IE5fKCItLXRwbTItbnZpbmRleCBtdXN0IGJlIGEgcGVyc2lzdGVudCBvciBOViBpbmRleCBoYW5k bGUuXG4iKSk7CisJICAgICAgcmV0dXJuIEdSVUJfRVJSX0JBRF9BUkdVTUVOVDsKKwkgICAgfQor CisJICBpZiAoYXJncy0+dHBtMl9udmluZGV4ID09IGFyZ3MtPnRwbTJfc3JrKQorCSAgICB7CisJ ICAgICAgZnByaW50ZiAoc3RkZXJyLCBOXygiLS10cG0yLW52aW5kZXggYW5kIC0tdHBtMi1zcmsg bXVzdCBiZSBkaWZmZXJlbnQuXG4iKSk7CisJICAgICAgcmV0dXJuIEdSVUJfRVJSX0JBRF9BUkdV TUVOVDsKKwkgICAgfQorCX0KKworICAgICAgaWYgKGFyZ3MtPnRwbTJfc3JrICE9IDAgJiYgVFBN X0hUX0lTX1BFUlNJU1RFTlQoYXJncy0+dHBtMl9zcmspID09IGZhbHNlKQorCXsKKwkgIGZwcmlu dGYgKHN0ZGVyciwgTl8oIi0tdHBtMi1zcmsgbXVzdCBiZSBhIHBlcnNpc3RlbnQgaGFuZGxlLCBl LmcuIDB4ODEwMDAwMDAuXG4iKSk7CiAJICByZXR1cm4gR1JVQl9FUlJfQkFEX0FSR1VNRU5UOwog CX0KIApAQCAtMTA5OSw5ICsxMzEyLDkgQEAgcHJvdGVjdF90cG0yX2FyZ3NfdmVyaWZ5IChwcm90 ZWN0X2FyZ3NfdCAqYXJncykKIAkgIHJldHVybiBHUlVCX0VSUl9CQURfQVJHVU1FTlQ7CiAJfQog Ci0gICAgICBpZiAoYXJncy0+dHBtMl9zcmsgPT0gMCkKKyAgICAgIGlmIChhcmdzLT50cG0yX3Ny ayA9PSAwICYmIGFyZ3MtPnRwbTJfbnZpbmRleCA9PSAwKQogCXsKLQkgIGZwcmludGYgKHN0ZGVy ciwgTl8oIi0tdHBtMi1zcmsgaXMgbm90IHNwZWNpZmllZCB3aGVuIC0tYWN0aW9uIGlzICdyZW1v dmUnLlxuIikpOworCSAgZnByaW50ZiAoc3RkZXJyLCBOXygibWlzc2luZyAtLXRwbTItc3JrIG9y IC0tdHBtMi1udmluZGV4IGZvciAtLWFjdGlvbiAncmVtb3ZlJy5cbiIpKTsKIAkgIHJldHVybiBH UlVCX0VSUl9CQURfQVJHVU1FTlQ7CiAJfQogCkBAIC0xMjc0LDcgKzE0ODcsNyBAQCBwcm90ZWN0 X2FyZ3BfcGFyc2VyIChpbnQga2V5LCBjaGFyICphcmcsIHN0cnVjdCBhcmdwX3N0YXRlICpzdGF0 ZSkKIAkgIHJldHVybiBFSU5WQUw7CiAJfQogCi0gICAgICBhcmdzLT50cG0yX2V2aWN0ID0gMTsK KyAgICAgIGFyZ3MtPnRwbTJfZXZpY3QgPSB0cnVlOwogICAgICAgYXJncy0+YXJncyB8PSBQUk9U RUNUX0FSR19UUE0yX0VWSUNUOwogICAgICAgYnJlYWs7CiAKQEAgLTEyODUsMTAgKzE0OTgsMjgg QEAgcHJvdGVjdF9hcmdwX3BhcnNlciAoaW50IGtleSwgY2hhciAqYXJnLCBzdHJ1Y3QgYXJncF9z dGF0ZSAqc3RhdGUpCiAJICByZXR1cm4gRUlOVkFMOwogCX0KIAotICAgICAgYXJncy0+dHBtMl90 cG0ya2V5ID0gMTsKKyAgICAgIGFyZ3MtPnRwbTJfdHBtMmtleSA9IHRydWU7CiAgICAgICBhcmdz LT5hcmdzIHw9IFBST1RFQ1RfQVJHX1RQTTJfVFBNMktFWTsKICAgICAgIGJyZWFrOwogCisgICAg Y2FzZSBQUk9URUNUX09QVF9UUE0yX05WSU5ERVg6CisgICAgICBpZiAoYXJncy0+YXJncyAmIFBS T1RFQ1RfQVJHX1RQTTJfTlZJTkRFWCkKKwl7CisJICBmcHJpbnRmIChzdGRlcnIsIE5fKCItLXRw bTItbnZpbmRleCBjYW4gb25seSBiZSBzcGVjaWZpZWQgb25jZS5cbiIpKTsKKwkgIHJldHVybiBF SU5WQUw7CisJfQorCisgICAgICBlcnIgPSBncnViX3RwbTJfcHJvdGVjdG9yX3BhcnNlX3RwbV9o YW5kbGUgKGFyZywgJmFyZ3MtPnRwbTJfbnZpbmRleCk7CisgICAgICBpZiAoZXJyICE9IEdSVUJf RVJSX05PTkUpCisJeworCSAgaWYgKGdydWJfZXJybm8gIT0gR1JVQl9FUlJfTk9ORSkKKwkgICAg Z3J1Yl9wcmludF9lcnJvciAoKTsKKwkgIHJldHVybiBFSU5WQUw7CisJfQorCisgICAgICBhcmdz LT5hcmdzIHw9IFBST1RFQ1RfQVJHX1RQTTJfTlZJTkRFWDsKKyAgICAgIGJyZWFrOworCiAgICAg ZGVmYXVsdDoKICAgICAgIHJldHVybiBBUkdQX0VSUl9VTktOT1dOOwogICAgIH0KLS0gCjIuNDMu MAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkdydWIt ZGV2ZWwgbWFpbGluZyBsaXN0CkdydWItZGV2ZWxAZ251Lm9yZwpodHRwczovL2xpc3RzLmdudS5v cmcvbWFpbG1hbi9saXN0aW5mby9ncnViLWRldmVsCg==