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 EC8FEE77188 for ; Mon, 13 Jan 2025 03:08:29 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tXAnu-0002xX-JE; Sun, 12 Jan 2025 22:07:50 -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 1tXAnr-0002ux-Va for grub-devel@gnu.org; Sun, 12 Jan 2025 22:07:47 -0500 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tXAnp-0004FD-CP for grub-devel@gnu.org; Sun, 12 Jan 2025 22:07:47 -0500 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-5d8c1950da7so6594996a12.3 for ; Sun, 12 Jan 2025 19:07:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1736737664; x=1737342464; 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=46zpO3BNceh0AaWPrCNo04vaqBPICcP+r5BQVBLm0TU=; b=L0IxxChz/WQV/OYkuwg17tpd95FrSzGrXlN2RceQfHcUHmrzTUaFYKwAWcN07C8010 ANR0JLVGsU8l2WvzXBd2rH9TAeReCY+0KqmhwYoOH1b4OF9GCCwseND1APQKI1KdjkMo 65we8AUkrCptIejvL54qCcv37s/nDKPG5fuIj4SVyKAV40pwDAXkBv8KQSZ4xl3M16td bVaZVp/dAvwtMDcOimaoNlotZiZBWIIu2OJjiG/XfPmBmEB3BFVUXxLROXRdoQjF3ogZ 5iDROhh11MTcz2qsed42j9Fd6w9Jn0ERWrNBRGXr2eAJcTRpl0Uv+jteUdiVDoYjlDVo nXog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736737664; x=1737342464; 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=46zpO3BNceh0AaWPrCNo04vaqBPICcP+r5BQVBLm0TU=; b=uet21pt4T48ej5I16dFgc3mpcqHwLve/TH/dwZmY5r9IiHbgW10Nn/53QtVDg8azJC QcHKeGTif6i7ASOUWFVEjgS3dBqUy7IUo625g6j47OBgoox0W1044sLL7OOHFjaps+ZR Dhf0BUjRZTbehTVe8uzFym8P9xkrRvUHlMIStByAcBvYfePL5v/Gtt1LlQacArUO6/mq eCHOj9T30sVEbcDV81dj8M+0XDydA1hv5XMfDAgTMyt8DeHF0k1zqOD2yQ78SKdSPhvQ oK7mbJgfQZ6dNxJU9ADkUadt+5RcD8gIp3ZvbF123CNWId987ZjGo3PJBnsvBkP8WHTz gs2w== X-Gm-Message-State: AOJu0YwduD9zJNSqc+/QwmByv7ymq4sFwlcUmM1ErSCIEnQ8UoX0H4lw kw1tIdWUl0eRgyLfN5VapVOrUp1BI5xjVS0W1LMvdbTzdChdrmbXfPN9m3lOFbHsz3XlG7Px1fc 7 X-Gm-Gg: ASbGncvHd9UFOnjEDCTVEwbEXgK4WHQAOvjz0Zxcn+ZzrkryVvxqmB8gTM9U3vBae/w JwnTcHQ5Sr7bRsD1XEaSH12q2/wkHCbm5ab7gi+iEEmCIXAIL+sIeWSAAQOh/imFGZYyptBhk4v IzUt1/zIdo8Qp+CbaFGIAht3oQIR7nAusfuaTT4D0FItWV4PDXxGi+oGKsBhYGFN1rJP81guHpr Puh1F4NqmbgNH5gvgUr82z2oMnD28CIs6He2CHJClfEipmJdOImSLAUvuD0vNa54ei9mCJdR9Uy 5Mml8sG2pTQ= X-Google-Smtp-Source: AGHT+IHfgxUnZtxRQOFlxjeAqt6PAItAZzaZEERBDmJqs75pklxzSMVC/Xh082dx6jmPNe9hK3/kWw== X-Received: by 2002:a05:6402:5205:b0:5d2:7199:ae6 with SMTP id 4fb4d7f45d1cf-5d972e04bbemr17299811a12.9.1736737663669; Sun, 12 Jan 2025 19:07:43 -0800 (PST) Received: from localhost (111-240-128-227.dynamic-ip.hinet.net. [111.240.128.227]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72d406a61f7sm5025738b3a.175.2025.01.12.19.07.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jan 2025 19:07:43 -0800 (PST) To: The development of GNU GRUB Subject: [PATCH v3 08/10] util/grub-protect: Support NV index mode Date: Mon, 13 Jan 2025 11:07:11 +0800 Message-ID: <20250113030713.2119-9-glin@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250113030713.2119-1-glin@suse.com> References: <20250113030713.2119-1-glin@suse.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=glin@suse.com; helo=mail-ed1-x532.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+ClJldmlld2VkLWJ5OiBTdGVmYW4gQmVy Z2VyIDxzdGVmYW5iQGxpbnV4LmlibS5jb20+Ci0tLQogdXRpbC9ncnViLXByb3RlY3QuYyB8IDM0 MyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDI4NyBpbnNlcnRpb25zKCspLCA1NiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS91 dGlsL2dydWItcHJvdGVjdC5jIGIvdXRpbC9ncnViLXByb3RlY3QuYwppbmRleCA1YjdlOTUyZjQu LjQwZDRhM2ZjNSAxMDA2NDQKLS0tIGEvdXRpbC9ncnViLXByb3RlY3QuYworKysgYi91dGlsL2dy dWItcHJvdGVjdC5jCkBAIC02MSw3ICs2MSw4IEBAIHR5cGVkZWYgZW51bSBwcm90ZWN0X29wdAog ICBQUk9URUNUX09QVF9UUE0yX0tFWUZJTEUsCiAgIFBST1RFQ1RfT1BUX1RQTTJfT1VURklMRSwK ICAgUFJPVEVDVF9PUFRfVFBNMl9FVklDVCwKLSAgUFJPVEVDVF9PUFRfVFBNMl9UUE0yS0VZCisg IFBST1RFQ1RfT1BUX1RQTTJfVFBNMktFWSwKKyAgUFJPVEVDVF9PUFRfVFBNMl9OVklOREVYLAog fSBwcm90ZWN0X29wdF90OwogCiAvKiBPcHRpb24gZmxhZ3MgdG8ga2VlcCB0cmFjayBvZiBzcGVj aWZpZWQgYXJndW1lbnRzICovCkBAIC03OSw3ICs4MCw4IEBAIHR5cGVkZWYgZW51bSBwcm90ZWN0 X2FyZwogICBQUk9URUNUX0FSR19UUE0yX0tFWUZJTEUgICAgPSAxIDw8IDcsCiAgIFBST1RFQ1Rf QVJHX1RQTTJfT1VURklMRSAgICA9IDEgPDwgOCwKICAgUFJPVEVDVF9BUkdfVFBNMl9FVklDVCAg ICAgID0gMSA8PCA5LAotICBQUk9URUNUX0FSR19UUE0yX1RQTTJLRVkgICAgPSAxIDw8IDEwCisg IFBST1RFQ1RfQVJHX1RQTTJfVFBNMktFWSAgICA9IDEgPDwgMTAsCisgIFBST1RFQ1RfQVJHX1RQ TTJfTlZJTkRFWCAgICA9IDEgPDwgMTEKIH0gcHJvdGVjdF9hcmdfdDsKIAogdHlwZWRlZiBlbnVt IHByb3RlY3RfcHJvdGVjdG9yCkBAIC0xMTEsNiArMTEzLDcgQEAgdHlwZWRlZiBzdHJ1Y3QgcHJv dGVjdF9hcmdzCiAgIGNvbnN0IGNoYXIgKnRwbTJfb3V0ZmlsZTsKICAgYm9vbCB0cG0yX2V2aWN0 OwogICBib29sIHRwbTJfdHBtMmtleTsKKyAgVFBNX0hBTkRMRV90IHRwbTJfbnZpbmRleDsKIH0g cHJvdGVjdF9hcmdzX3Q7CiAKIHN0YXRpYyBzdHJ1Y3QgYXJncF9vcHRpb24gcHJvdGVjdF9vcHRp b25zW10gPQpAQCAtMjI0LDYgKzIyNywxNSBAQCBzdGF0aWMgc3RydWN0IGFyZ3Bfb3B0aW9uIHBy b3RlY3Rfb3B0aW9uc1tdID0KIAlOXygiVXNlIFRQTSAyLjAgS2V5IEZpbGUgZm9ybWF0LiIpLAog ICAgICAgLmdyb3VwID0gMAogICAgIH0sCisgICAgeworICAgICAgLm5hbWUgPSAidHBtMi1udmlu ZGV4IiwKKyAgICAgIC5rZXkgICA9IFBST1RFQ1RfT1BUX1RQTTJfTlZJTkRFWCwKKyAgICAgIC5h cmcgICA9ICJOVU0iLAorICAgICAgLmZsYWdzID0gMCwKKyAgICAgIC5kb2MgICA9CisJTl8oIlN0 b3JlIHRoZSBzZWFsZWQga2V5IGluIGEgcGVyc2lzdGVudCBvciBOViBpbmRleCBoYW5kbGUuIiks CisgICAgICAuZ3JvdXAgPSAwCisgICAgfSwKICAgICAvKiBFbmQgb2YgbGlzdCAqLwogICAgIHsg MCwgMCwgMCwgMCwgMCwgMCB9CiAgIH07CkBAIC02NjgsOCArNjgwLDggQEAgZXh0ZXJuIGFzbjFf c3RhdGljX25vZGUgdHBtMmtleV9hc24xX3RhYltdOwogI2RlZmluZSBUUE0yS0VZX1NFQUxFRF9L RVlfT0lEICIyLjIzLjEzMy4xMC4xLjUiCiAKIHN0YXRpYyBncnViX2Vycl90Ci1wcm90ZWN0X3Rw bTJfZXhwb3J0X3RwbTJrZXkgKGNvbnN0IHByb3RlY3RfYXJnc190ICphcmdzLAotCQkJICAgICB0 cG0yX3NlYWxlZF9rZXlfdCAqc2VhbGVkX2tleSkKK3Byb3RlY3RfdHBtMl9leHBvcnRfdHBtMmtl eSAoY29uc3QgcHJvdGVjdF9hcmdzX3QgKmFyZ3MsIHRwbTJfc2VhbGVkX2tleV90ICpzZWFsZWRf a2V5LAorCQkJICAgICB2b2lkICoqZGVyX2J1ZiwgaW50ICpkZXJfYnVmX3NpemUpCiB7CiAgIGNv bnN0IGNoYXIgKnNlYWxlZF9rZXlfb2lkID0gVFBNMktFWV9TRUFMRURfS0VZX09JRDsKICAgYXNu MV9ub2RlIGFzbjFfZGVmID0gTlVMTDsKQEAgLTY4OSwxMiArNzAxLDEzIEBAIHByb3RlY3RfdHBt Ml9leHBvcnRfdHBtMmtleSAoY29uc3QgcHJvdGVjdF9hcmdzX3QgKmFyZ3MsCiAgIH07CiAgIHN0 cnVjdCBncnViX3RwbTJfYnVmZmVyIHB1Yl9idWY7CiAgIHN0cnVjdCBncnViX3RwbTJfYnVmZmVy IHByaXZfYnVmOwotICB2b2lkICpkZXJfYnVmID0gTlVMTDsKLSAgaW50IGRlcl9idWZfc2l6ZSA9 IDA7CiAgIGludCBpOwogICBpbnQgcmV0OwogICBncnViX2Vycl90IGVycjsKIAorICBpZiAoZGVy X2J1ZiA9PSBOVUxMKQorICAgIHJldHVybiBHUlVCX0VSUl9CQURfQVJHVU1FTlQ7CisKICAgZm9y IChpID0gMDsgaSA8IGFyZ3MtPnRwbTJfcGNyX2NvdW50OyBpKyspCiAgICAgVFBNU19QQ1JfU0VM RUNUSU9OX1NlbGVjdFBDUiAoJnBjcl9zZWwucGNyU2VsZWN0aW9uc1swXSwgYXJncy0+dHBtMl9w Y3JzW2ldKTsKIApAQCAtODQ0LDggKzg1Nyw4IEBAIHByb3RlY3RfdHBtMl9leHBvcnRfdHBtMmtl eSAoY29uc3QgcHJvdGVjdF9hcmdzX3QgKmFyZ3MsCiAgICAgfQogCiAgIC8qIENyZWF0ZSB0aGUg REVSIGJpbmFyeSAqLwotICBkZXJfYnVmX3NpemUgPSAwOwotICByZXQgPSBhc24xX2Rlcl9jb2Rp bmcgKHRwbTJrZXksICIiLCBOVUxMLCAmZGVyX2J1Zl9zaXplLCBOVUxMKTsKKyAgKmRlcl9idWZf c2l6ZSA9IDA7CisgIHJldCA9IGFzbjFfZGVyX2NvZGluZyAodHBtMmtleSwgIiIsIE5VTEwsIGRl cl9idWZfc2l6ZSwgTlVMTCk7CiAgIGlmIChyZXQgIT0gQVNOMV9NRU1fRVJST1IpCiAgICAgewog ICAgICAgZnByaW50ZiAoc3RkZXJyLCAiRmFpbGVkIHRvIGdldCBERVIgc2l6ZTogMHgleFxuIiwg cmV0KTsKQEAgLTg1MywxNSArODY2LDE1IEBAIHByb3RlY3RfdHBtMl9leHBvcnRfdHBtMmtleSAo Y29uc3QgcHJvdGVjdF9hcmdzX3QgKmFyZ3MsCiAgICAgICBnb3RvIGVycm9yOwogICAgIH0KIAot ICBkZXJfYnVmID0gZ3J1Yl9tYWxsb2MgKGRlcl9idWZfc2l6ZSk7Ci0gIGlmIChkZXJfYnVmID09 IE5VTEwpCisgICpkZXJfYnVmID0gZ3J1Yl9tYWxsb2MgKCpkZXJfYnVmX3NpemUpOworICBpZiAo KmRlcl9idWYgPT0gTlVMTCkKICAgICB7CiAgICAgICBmcHJpbnRmIChzdGRlcnIsICJGYWlsZWQg dG8gYWxsb2NhdGUgbWVtb3J5IGZvciBERVIgZW5jb2RpbmdcbiIpOwogICAgICAgZXJyID0gR1JV Ql9FUlJfT1VUX09GX01FTU9SWTsKICAgICAgIGdvdG8gZXJyb3I7CiAgICAgfQogCi0gIHJldCA9 IGFzbjFfZGVyX2NvZGluZyAodHBtMmtleSwgIiIsIGRlcl9idWYsICZkZXJfYnVmX3NpemUsIE5V TEwpOworICByZXQgPSBhc24xX2Rlcl9jb2RpbmcgKHRwbTJrZXksICIiLCAqZGVyX2J1ZiwgZGVy X2J1Zl9zaXplLCBOVUxMKTsKICAgaWYgKHJldCAhPSBBU04xX1NVQ0NFU1MpCiAgICAgewogICAg ICAgZnByaW50ZiAoc3RkZXJyLCAiREVSIGNvZGluZyBlcnJvcjogMHgleFxuIiwgcmV0KTsKQEAg LTg2OSwxMyArODgyLDcgQEAgcHJvdGVjdF90cG0yX2V4cG9ydF90cG0ya2V5IChjb25zdCBwcm90 ZWN0X2FyZ3NfdCAqYXJncywKICAgICAgIGdvdG8gZXJyb3I7CiAgICAgfQogCi0gIGVyciA9IHBy b3RlY3Rfd3JpdGVfZmlsZSAoYXJncy0+dHBtMl9vdXRmaWxlLCBkZXJfYnVmLCBkZXJfYnVmX3Np emUpOwotICBpZiAoZXJyICE9IEdSVUJfRVJSX05PTkUpCi0gICAgZnByaW50ZiAoc3RkZXJyLCBO XygiQ291bGQgbm90IHdyaXRlIHRwbTJrZXkgZmlsZSAoJXMpLlxuIiksIHN0cmVycm9yIChlcnJu bykpOwotCiAgZXJyb3I6Ci0gIGdydWJfZnJlZSAoZGVyX2J1Zik7Ci0KICAgaWYgKHRwbTJrZXkp CiAgICAgYXNuMV9kZWxldGVfc3RydWN0dXJlICgmdHBtMmtleSk7CiAKQEAgLTg4MywxMCArODkw LDggQEAgcHJvdGVjdF90cG0yX2V4cG9ydF90cG0ya2V5IChjb25zdCBwcm90ZWN0X2FyZ3NfdCAq YXJncywKIH0KIAogc3RhdGljIGdydWJfZXJyX3QKLXByb3RlY3RfdHBtMl9leHBvcnRfc2VhbGVk X2tleSAoY29uc3QgY2hhciAqZmlsZXBhdGgsCi0JCQkJdHBtMl9zZWFsZWRfa2V5X3QgKnNlYWxl ZF9rZXkpCitwcm90ZWN0X3RwbTJfZXhwb3J0X3JhdyAodHBtMl9zZWFsZWRfa2V5X3QgKnNlYWxl ZF9rZXksIHZvaWQgKipvdXRfYnVmLCBpbnQgKm91dF9idWZfc2l6ZSkKIHsKLSAgZ3J1Yl9lcnJf dCBlcnI7CiAgIHN0cnVjdCBncnViX3RwbTJfYnVmZmVyIGJ1ZjsKIAogICBncnViX3RwbTJfYnVm ZmVyX2luaXQgKCZidWYpOwpAQCAtODk2LDEzICs5MDEsOTggQEAgcHJvdGVjdF90cG0yX2V4cG9y dF9zZWFsZWRfa2V5IChjb25zdCBjaGFyICpmaWxlcGF0aCwKICAgaWYgKGJ1Zi5lcnJvciAhPSAw KQogICAgIHJldHVybiBHUlVCX0VSUl9CQURfQVJHVU1FTlQ7CiAKLSAgZXJyID0gcHJvdGVjdF93 cml0ZV9maWxlIChmaWxlcGF0aCwgYnVmLmRhdGEsIGJ1Zi5zaXplKTsKLSAgaWYgKGVyciAhPSBH UlVCX0VSUl9OT05FKQotICAgIGZwcmludGYgKHN0ZGVyciwgTl8oIkNvdWxkIG5vdCB3cml0ZSBz ZWFsZWQga2V5IGZpbGUgKCVzKS5cbiIpLCBzdHJlcnJvciAoZXJybm8pKTsKKyAgKm91dF9idWZf c2l6ZSA9IGJ1Zi5zaXplOworICAqb3V0X2J1ZiA9IGdydWJfbWFsbG9jIChidWYuc2l6ZSk7CisK KyAgaWYgKCpvdXRfYnVmID09IE5VTEwpCisgICAgeworICAgICAgZnByaW50ZiAoc3RkZXJyLCBO XygiQ291bGQgbm90IGFsbG9jYXRlIG1lbW9yeSBmb3IgdGhlIHJhdyBmb3JtYXQga2V5LlxuIikp OworICAgICAgcmV0dXJuIEdSVUJfRVJSX09VVF9PRl9NRU1PUlk7CisgICAgfQorCisgIGdydWJf bWVtY3B5ICgqb3V0X2J1ZiwgYnVmLmRhdGEsIGJ1Zi5zaXplKTsKKworICByZXR1cm4gR1JVQl9F UlJfTk9ORTsKK30KKworc3RhdGljIGdydWJfZXJyX3QKK3Byb3RlY3RfdHBtMl9leHBvcnRfcGVy c2lzdGVudCAocHJvdGVjdF9hcmdzX3QgKmFyZ3MsCisJCQkJVFBNX0hBTkRMRV90IHNya19oYW5k bGUsCisJCQkJdHBtMl9zZWFsZWRfa2V5X3QgKnNlYWxlZF9rZXkpCit7CisgIFRQTVNfQVVUSF9D T01NQU5EX3QgYXV0aENtZCA9IHswfTsKKyAgVFBNMkJfTkFNRV90IG5hbWUgPSB7MH07CisgIFRQ TV9IQU5ETEVfdCBzZWFsZWRfaGFuZGxlOworICBUUE1fUkNfdCByYzsKKyAgZ3J1Yl9lcnJfdCBl cnIgPSBHUlVCX0VSUl9OT05FOworCisgIC8qIExvYWQgdGhlIHNlYWxlZCBrZXkgYW5kIGFzc29j aWF0ZSBpdCB3aXRoIHRoZSBTUksgKi8KKyAgYXV0aENtZC5zZXNzaW9uSGFuZGxlID0gVFBNX1JT X1BXOworICByYyA9IGdydWJfdHBtMl9sb2FkIChzcmtfaGFuZGxlLCAmYXV0aENtZCwgJnNlYWxl ZF9rZXktPnByaXZhdGUsICZzZWFsZWRfa2V5LT5wdWJsaWMsCisJCSAgICAgICAmc2VhbGVkX2hh bmRsZSwgJm5hbWUsIE5VTEwpOworICBpZiAocmMgIT0gVFBNX1JDX1NVQ0NFU1MpCisgICAgewor ICAgICAgZnByaW50ZiAoc3RkZXJyLCAiRmFpbGVkIHRvIGxvYWQgc2VhbGVkIGtleSAoVFBNMl9M b2FkOiAleCkuXG4iLCByYyk7CisgICAgICByZXR1cm4gR1JVQl9FUlJfQkFEX0RFVklDRTsKKyAg ICB9CisKKyAgLyogTWFrZSB0aGUgc2VhbGVkIGtleSBvYmplY3QgcGVyc2lzdGVudCAqLworICBh dXRoQ21kLnNlc3Npb25IYW5kbGUgPSBUUE1fUlNfUFc7CisgIHJjID0gZ3J1Yl90cG0yX2V2aWN0 Y29udHJvbCAoVFBNX1JIX09XTkVSLCBzZWFsZWRfaGFuZGxlLCAmYXV0aENtZCwgYXJncy0+dHBt Ml9udmluZGV4LCBOVUxMKTsKKyAgaWYgKHJjICE9IFRQTV9SQ19TVUNDRVNTKQorICAgIHsKKyAg ICAgIGZwcmludGYgKHN0ZGVyciwgIkZhaWxlZCB0byBtYWtlIHNlYWxlZCBrZXkgcGVyc2lzdGVu dCB3aXRoIGhhbmRsZSAweCV4IChUUE0yX0V2aWN0Q29udHJvbDogMHgleCkuXG4iLCBhcmdzLT50 cG0yX252aW5kZXgsIHJjKTsKKyAgICAgIGVyciA9IEdSVUJfRVJSX0JBRF9ERVZJQ0U7CisgICAg ICBnb3RvIGV4aXQ7CisgICAgfQorCisgZXhpdDoKKyAgZ3J1Yl90cG0yX2ZsdXNoY29udGV4dCAo c2VhbGVkX2hhbmRsZSk7CiAKICAgcmV0dXJuIGVycjsKIH0KIAorc3RhdGljIGdydWJfZXJyX3QK K3Byb3RlY3RfdHBtMl9leHBvcnRfbnZpbmRleCAocHJvdGVjdF9hcmdzX3QgKmFyZ3MsIHZvaWQg KmRhdGEsIGludCBkYXRhX3NpemUpCit7CisgIFRQTVNfQVVUSF9DT01NQU5EX3QgYXV0aENtZCA9 IHswfTsKKyAgVFBNMkJfTlZfUFVCTElDX3QgcHViX2luZm8gPSB7MH07CisgIFRQTTJCX01BWF9O Vl9CVUZGRVJfdCBudl9kYXRhID0gezB9OworICBUUE1fUkNfdCByYzsKKworICBpZiAoZGF0YV9z aXplID4gVFBNX01BWF9OVl9CVUZGRVJfU0laRSB8fCBkYXRhX3NpemUgPCAwKQorICAgIHsKKyAg ICAgIGZwcmludGYgKHN0ZGVyciwgTl8oIkludmFsaWQgdHBtMmtleSBzaXplIGZvciBUUE0gTlYg YnVmZmVyXG4iKSk7CisgICAgICByZXR1cm4gR1JVQl9FUlJfT1VUX09GX1JBTkdFOworICAgIH0K KworICBwdWJfaW5mby5udlB1YmxpYy5udkluZGV4ID0gYXJncy0+dHBtMl9udmluZGV4OworICBw dWJfaW5mby5udlB1YmxpYy5uYW1lQWxnID0gVFBNX0FMR19TSEEyNTY7CisgIHB1Yl9pbmZvLm52 UHVibGljLmF0dHJpYnV0ZXMgPSBUUE1BX05WX09XTkVSV1JJVEUgfCBUUE1BX05WX09XTkVSUkVB RDsKKyAgcHViX2luZm8ubnZQdWJsaWMuZGF0YVNpemUgPSAoZ3J1Yl91aW50MTZfdCkgZGF0YV9z aXplOworCisgIGF1dGhDbWQuc2Vzc2lvbkhhbmRsZSA9IFRQTV9SU19QVzsKKyAgcmMgPSBncnVi X3RwbTJfbnZfZGVmaW5lc3BhY2UgKFRQTV9SSF9PV05FUiwgJmF1dGhDbWQsIE5VTEwsICZwdWJf aW5mbyk7CisgIGlmIChyYyAhPSBUUE1fUkNfU1VDQ0VTUykKKyAgICB7CisgICAgICBmcHJpbnRm IChzdGRlcnIsICJGYWlsZWQgdG8gZGVmaW5lIE5WIHNwYWNlIGZvciAweCV4IChUUE0yX05WX0Rl ZmluZVNwYWNlOiAweCV4KVxuIiwgYXJncy0+dHBtMl9udmluZGV4LCByYyk7CisgICAgICByZXR1 cm4gR1JVQl9FUlJfQkFEX0RFVklDRTsKKyAgICB9CisKKyAgYXV0aENtZC5zZXNzaW9uSGFuZGxl ID0gVFBNX1JTX1BXOworICBncnViX21lbWNweSAobnZfZGF0YS5idWZmZXIsIGRhdGEsIGRhdGFf c2l6ZSk7CisgIG52X2RhdGEuc2l6ZSA9IChncnViX3VpbnQxNl90KSBkYXRhX3NpemU7CisKKyAg cmMgPSBncnViX3RwbTJfbnZfd3JpdGUgKFRQTV9SSF9PV05FUiwgYXJncy0+dHBtMl9udmluZGV4 LCAmYXV0aENtZCwgJm52X2RhdGEsIDApOworICBpZiAocmMgIT0gVFBNX1JDX1NVQ0NFU1MpCisg ICAgeworICAgICAgZnByaW50ZiAoc3RkZXJyLCAiRmFpbGVkIHRvIHdyaXRlIGRhdGEgaW50byAw eCV4IChUUE0yX05WX1dyaXRlOiAweCV4KVxuIiwgYXJncy0+dHBtMl9udmluZGV4LCByYyk7Cisg ICAgICByZXR1cm4gR1JVQl9FUlJfQkFEX0RFVklDRTsKKyAgICB9CisKKyAgcmV0dXJuIEdSVUJf RVJSX05PTkU7Cit9CisKIHN0YXRpYyBncnViX2Vycl90CiBwcm90ZWN0X3RwbTJfYWRkIChwcm90 ZWN0X2FyZ3NfdCAqYXJncykKIHsKQEAgLTkxMSw2ICsxMDAxLDggQEAgcHJvdGVjdF90cG0yX2Fk ZCAocHJvdGVjdF9hcmdzX3QgKmFyZ3MpCiAgIGdydWJfc2l6ZV90IGtleV9zaXplOwogICBUUE1f SEFORExFX3Qgc3JrOwogICBUUE0yQl9ESUdFU1RfdCBwb2xpY3lfZGlnZXN0OworICB2b2lkICpv dXRfYnVmID0gTlVMTDsKKyAgaW50IG91dF9idWZfc2l6ZTsKICAgdHBtMl9zZWFsZWRfa2V5X3Qg c2VhbGVkX2tleTsKIAogICBlcnIgPSBwcm90ZWN0X3RwbTJfb3Blbl9kZXZpY2UgKGFyZ3MtPnRw bTJfZGV2aWNlKTsKQEAgLTk0MCwxNSArMTAzMiw1MSBAQCBwcm90ZWN0X3RwbTJfYWRkIChwcm90 ZWN0X2FyZ3NfdCAqYXJncykKICAgaWYgKGVyciAhPSBHUlVCX0VSUl9OT05FKQogICAgIGdvdG8g ZXhpdDM7CiAKLSAgaWYgKGFyZ3MtPnRwbTJfdHBtMmtleSAhPSAwKQotICAgIGVyciA9IHByb3Rl Y3RfdHBtMl9leHBvcnRfdHBtMmtleSAoYXJncywgJnNlYWxlZF9rZXkpOworICBpZiAoYXJncy0+ dHBtMl90cG0ya2V5ID09IHRydWUpCisgICAgeworICAgICAgZXJyID0gcHJvdGVjdF90cG0yX2V4 cG9ydF90cG0ya2V5IChhcmdzLCAmc2VhbGVkX2tleSwgJm91dF9idWYsICZvdXRfYnVmX3NpemUp OworICAgICAgaWYgKGVyciAhPSBHUlVCX0VSUl9OT05FKQorCXsKKwkgIGZwcmludGYgKHN0ZGVy ciwgTl8oIkNvdWxkIG5vdCBleHBvcnQgdG8gVFBNIDIuMCBLZXkgRmlsZSBmb3JtYXRcbiIpKTsK KwkgIGdvdG8gZXhpdDM7CisJfQorICAgIH0KICAgZWxzZQotICAgIGVyciA9IHByb3RlY3RfdHBt Ml9leHBvcnRfc2VhbGVkX2tleSAoYXJncy0+dHBtMl9vdXRmaWxlLCAmc2VhbGVkX2tleSk7Ci0g IGlmIChlcnIgIT0gR1JVQl9FUlJfTk9ORSkKLSAgICBnb3RvIGV4aXQzOworICAgIHsKKyAgICAg IGVyciA9IHByb3RlY3RfdHBtMl9leHBvcnRfcmF3ICgmc2VhbGVkX2tleSwgJm91dF9idWYsICZv dXRfYnVmX3NpemUpOworICAgICAgaWYgKGVyciAhPSBHUlVCX0VSUl9OT05FKQorCXsKKwkgIGZw cmludGYgKHN0ZGVyciwgTl8oIkNvdWxkIG5vdCBleHBvcnQgdG8gdGhlIHJhdyBmb3JtYXRcbiIp KTsKKwkgIGdvdG8gZXhpdDM7CisJfQorICAgIH0KKworICBpZiAoYXJncy0+dHBtMl9vdXRmaWxl ICE9IE5VTEwpCisgICAgeworICAgICAgZXJyID0gcHJvdGVjdF93cml0ZV9maWxlIChhcmdzLT50 cG0yX291dGZpbGUsIG91dF9idWYsIG91dF9idWZfc2l6ZSk7CisgICAgICBpZiAoZXJyICE9IEdS VUJfRVJSX05PTkUpCisJeworCSAgZnByaW50ZiAoc3RkZXJyLCBOXygiQ291bGQgbm90IHdyaXRl IGtleSBmaWxlICglcykuXG4iKSwgc3RyZXJyb3IgKGVycm5vKSk7CisJICBnb3RvIGV4aXQzOwor CX0KKyAgICB9CisKKyAgaWYgKFRQTV9IVF9JU19OVklOREVYIChhcmdzLT50cG0yX252aW5kZXgp ID09IHRydWUpCisgICAgeworICAgICAgZXJyID0gcHJvdGVjdF90cG0yX2V4cG9ydF9udmluZGV4 IChhcmdzLCBvdXRfYnVmLCBvdXRfYnVmX3NpemUpOworICAgICAgaWYgKGVyciAhPSBHUlVCX0VS Ul9OT05FKQorCWdvdG8gZXhpdDM7CisgICAgfQorICBlbHNlIGlmIChUUE1fSFRfSVNfUEVSU0lT VEVOVCAoYXJncy0+dHBtMl9udmluZGV4KSA9PSB0cnVlKQorICAgIHsKKyAgICAgIGVyciA9IHBy b3RlY3RfdHBtMl9leHBvcnRfcGVyc2lzdGVudCAoYXJncywgc3JrLCAmc2VhbGVkX2tleSk7Cisg ICAgICBpZiAoZXJyICE9IEdSVUJfRVJSX05PTkUpCisJZ290byBleGl0MzsKKyAgICB9CiAKICBl eGl0MzoKICAgZ3J1Yl90cG0yX2ZsdXNoY29udGV4dCAoc3JrKTsKKyAgZ3J1Yl9mcmVlIChvdXRf YnVmKTsKIAogIGV4aXQyOgogICBncnViX2ZyZWUgKGtleSk7CkBAIC05NjAsMTQgKzEwODgsNjYg QEAgcHJvdGVjdF90cG0yX2FkZCAocHJvdGVjdF9hcmdzX3QgKmFyZ3MpCiB9CiAKIHN0YXRpYyBn cnViX2Vycl90Ci1wcm90ZWN0X3RwbTJfcmVtb3ZlIChwcm90ZWN0X2FyZ3NfdCAqYXJncykKK3By b3RlY3RfdHBtMl9ldmljdCAoVFBNX0hBTkRMRV90IGhhbmRsZSkKIHsKICAgVFBNX1JDX3QgcmM7 CiAgIFRQTTJCX1BVQkxJQ190IHB1YmxpYzsKLSAgVFBNU19BVVRIX0NPTU1BTkRfdCBhdXRoQ29t bWFuZCA9IHswfTsKKyAgVFBNU19BVVRIX0NPTU1BTkRfdCBhdXRoQ21kID0gezB9OworCisgIC8q IEZpbmQgdGhlIHBlcnNpc3RlbnQgaGFuZGxlICovCisgIHJjID0gZ3J1Yl90cG0yX3JlYWRwdWJs aWMgKGhhbmRsZSwgTlVMTCwgJnB1YmxpYyk7CisgIGlmIChyYyAhPSBUUE1fUkNfU1VDQ0VTUykK KyAgICB7CisgICAgICBmcHJpbnRmIChzdGRlcnIsICJIYW5kbGUgMHgleCBub3QgZm91bmQuXG4i LCBoYW5kbGUpOworICAgICAgcmV0dXJuIEdSVUJfRVJSX0JBRF9BUkdVTUVOVDsKKyAgICB9CisK KyAgLyogRXZpY3QgdGhlIHBlcnNpc3RlbnQgaGFuZGxlICovCisgIGF1dGhDbWQuc2Vzc2lvbkhh bmRsZSA9IFRQTV9SU19QVzsKKyAgcmMgPSBncnViX3RwbTJfZXZpY3Rjb250cm9sIChUUE1fUkhf T1dORVIsIGhhbmRsZSwgJmF1dGhDbWQsIGhhbmRsZSwgTlVMTCk7CisgIGlmIChyYyAhPSBUUE1f UkNfU1VDQ0VTUykKKyAgICB7CisgICAgICBmcHJpbnRmIChzdGRlcnIsICJGYWlsZWQgdG8gZXZp Y3QgaGFuZGxlIDB4JXggKFRQTTJfRXZpY3RDb250cm9sOiAweCV4KS5cbiIsIGhhbmRsZSwgcmMp OworICAgICAgcmV0dXJuIEdSVUJfRVJSX0JBRF9ERVZJQ0U7CisgICAgfQorCisgIHJldHVybiBH UlVCX0VSUl9OT05FOworfQorCitzdGF0aWMgZ3J1Yl9lcnJfdAorcHJvdGVjdF90cG0yX252X3Vu ZGVmaW5lIChUUE1fSEFORExFX3QgaGFuZGxlKQoreworICBUUE1fUkNfdCByYzsKKyAgVFBNMkJf TlZfUFVCTElDX3QgbnZfcHVibGljOworICBUUE1TX0FVVEhfQ09NTUFORF90IGF1dGhDbWQgPSB7 MH07CisgIFRQTTJCX05BTUVfdCBudl9uYW1lOworCisgIC8qIEZpbmQgdGhlIG52aW5kZXggaGFu ZGxlICovCisgIHJjID0gZ3J1Yl90cG0yX252X3JlYWRwdWJsaWMgKGhhbmRsZSwgTlVMTCwgJm52 X3B1YmxpYywgJm52X25hbWUpOworICBpZiAocmMgIT0gVFBNX1JDX1NVQ0NFU1MpCisgICAgewor ICAgICAgZnByaW50ZiAoc3RkZXJyLCAiSGFuZGxlIDB4JXggbm90IGZvdW5kLlxuIiwgaGFuZGxl KTsKKyAgICAgIHJldHVybiBHUlVCX0VSUl9CQURfQVJHVU1FTlQ7CisgICAgfQorCisgIC8qIFVu ZGVmaW5lIHRoZSBudmluZGV4IGhhbmRsZSAqLworICBhdXRoQ21kLnNlc3Npb25IYW5kbGUgPSBU UE1fUlNfUFc7CisgIHJjID0gZ3J1Yl90cG0yX252X3VuZGVmaW5lc3BhY2UgKFRQTV9SSF9PV05F UiwgaGFuZGxlLCAmYXV0aENtZCk7CisgIGlmIChyYyAhPSBUUE1fUkNfU1VDQ0VTUykKKyAgICB7 CisgICAgICBmcHJpbnRmIChzdGRlcnIsICJGYWlsZWQgdG8gdW5kZWZpbmUgaGFuZGxlIDB4JXgg KFRQTTJfTlZfVW5kZWZpbmVTcGFjZTogMHgleCkuXG4iLCBoYW5kbGUsIHJjKTsKKyAgICAgIHJl dHVybiBHUlVCX0VSUl9CQURfREVWSUNFOworICAgIH0KKworICByZXR1cm4gR1JVQl9FUlJfTk9O RTsKK30KKworc3RhdGljIGdydWJfZXJyX3QKK3Byb3RlY3RfdHBtMl9yZW1vdmUgKHByb3RlY3Rf YXJnc190ICphcmdzKQorewogICBncnViX2Vycl90IGVycjsKIAotICBpZiAoYXJncy0+dHBtMl9l dmljdCA9PSAwKQorICBpZiAoYXJncy0+dHBtMl9ldmljdCA9PSBmYWxzZSkKICAgICB7CiAgICAg ICBwcmludGYgKCItLXRwbTItZXZpY3Qgbm90IHNwZWNpZmllZCwgbm90aGluZyB0byBkby5cbiIp OwogICAgICAgcmV0dXJuIEdSVUJfRVJSX05PTkU7CkBAIC05NzcsMzUgKzExNTcsNDEgQEAgcHJv dGVjdF90cG0yX3JlbW92ZSAocHJvdGVjdF9hcmdzX3QgKmFyZ3MpCiAgIGlmIChlcnIgIT0gR1JV Ql9FUlJfTk9ORSkKICAgICByZXR1cm4gZXJyOwogCi0gIC8qIEZpbmQgU1JLICovCi0gIHJjID0g Z3J1Yl90cG0yX3JlYWRwdWJsaWMgKGFyZ3MtPnRwbTJfc3JrLCBOVUxMLCAmcHVibGljKTsKLSAg aWYgKHJjICE9IFRQTV9SQ19TVUNDRVNTKQorICBpZiAoYXJncy0+dHBtMl9zcmsgIT0gMCkKICAg ICB7Ci0gICAgICBmcHJpbnRmIChzdGRlcnIsICJTUksgd2l0aCBoYW5kbGUgMHgleCBub3QgZm91 bmQuXG4iLCBhcmdzLT50cG0yX3Nyayk7Ci0gICAgICBlcnIgPSBHUlVCX0VSUl9CQURfQVJHVU1F TlQ7Ci0gICAgICBnb3RvIGV4aXQxOworICAgICAgZXJyID0gcHJvdGVjdF90cG0yX2V2aWN0IChh cmdzLT50cG0yX3Nyayk7CisgICAgICBpZiAoZXJyICE9IEdSVUJfRVJSX05PTkUpCisJZ290byBl eGl0OwogICAgIH0KIAotICAvKiBFdmljdCBTUksgKi8KLSAgYXV0aENvbW1hbmQuc2Vzc2lvbkhh bmRsZSA9IFRQTV9SU19QVzsKLQotICByYyA9IGdydWJfdHBtMl9ldmljdGNvbnRyb2wgKFRQTV9S SF9PV05FUiwgYXJncy0+dHBtMl9zcmssICZhdXRoQ29tbWFuZCwgYXJncy0+dHBtMl9zcmssIE5V TEwpOwotICBpZiAocmMgIT0gVFBNX1JDX1NVQ0NFU1MpCisgIGlmIChhcmdzLT50cG0yX252aW5k ZXggIT0gMCkKICAgICB7Ci0gICAgICBmcHJpbnRmIChzdGRlcnIsICJGYWlsZWQgdG8gZXZpY3Qg U1JLIHdpdGggaGFuZGxlIDB4JXggKFRQTTJfRXZpY3RDb250cm9sOiAweCV4KS5cbiIsIGFyZ3Mt PnRwbTJfc3JrLCByYyk7Ci0gICAgICBlcnIgPSBHUlVCX0VSUl9CQURfREVWSUNFOwotICAgICAg Z290byBleGl0MjsKKyAgICAgIGlmIChUUE1fSFRfSVNfUEVSU0lTVEVOVCAoYXJncy0+dHBtMl9u dmluZGV4KSA9PSB0cnVlKQorCXsKKwkgIGVyciA9IHByb3RlY3RfdHBtMl9ldmljdCAoYXJncy0+ dHBtMl9udmluZGV4KTsKKwkgIGlmIChlcnIgIT0gR1JVQl9FUlJfTk9ORSkKKwkgICAgZ290byBl eGl0OworCX0KKyAgICAgIGVsc2UgaWYgKFRQTV9IVF9JU19OVklOREVYIChhcmdzLT50cG0yX252 aW5kZXgpID09IHRydWUpCisJeworCSAgZXJyID0gcHJvdGVjdF90cG0yX252X3VuZGVmaW5lIChh cmdzLT50cG0yX252aW5kZXgpOworCSAgaWYgKGVyciAhPSBHUlVCX0VSUl9OT05FKQorCSAgICBn b3RvIGV4aXQ7CisJfQorICAgICAgZWxzZQorCXsKKwkgIGZwcmludGYgKHN0ZGVyciwgIlVuc3Vw cG9ydGVkIGhhbmRsZSAweCV4XG4iLCBhcmdzLT50cG0yX252aW5kZXgpOworCSAgZXJyID0gR1JV Ql9FUlJfQkFEX0FSR1VNRU5UOworCSAgZ290byBleGl0OworCX0KICAgICB9CiAKICAgZXJyID0g R1JVQl9FUlJfTk9ORTsKIAotIGV4aXQyOgotICBncnViX3RwbTJfZmx1c2hjb250ZXh0IChhcmdz LT50cG0yX3Nyayk7Ci0KLSBleGl0MToKKyBleGl0OgogICBwcm90ZWN0X3RwbTJfY2xvc2VfZGV2 aWNlICgpOwogCi0gIHJldHVybiBHUlVCX0VSUl9OT05FOworICByZXR1cm4gZXJyOwogfQogCiBz dGF0aWMgZ3J1Yl9lcnJfdApAQCAtMTA0NSw5ICsxMjMxLDM2IEBAIHByb3RlY3RfdHBtMl9hcmdz X3ZlcmlmeSAocHJvdGVjdF9hcmdzX3QgKmFyZ3MpCiAJICByZXR1cm4gR1JVQl9FUlJfQkFEX0FS R1VNRU5UOwogCX0KIAotICAgICAgaWYgKGFyZ3MtPnRwbTJfb3V0ZmlsZSA9PSBOVUxMKQorICAg ICAgaWYgKGFyZ3MtPnRwbTJfb3V0ZmlsZSA9PSBOVUxMICYmIGFyZ3MtPnRwbTJfbnZpbmRleCA9 PSAwKQogCXsKLQkgIGZwcmludGYgKHN0ZGVyciwgTl8oIi0tdHBtMi1vdXRmaWxlIG11c3QgYmUg c3BlY2lmaWVkLlxuIikpOworCSAgZnByaW50ZiAoc3RkZXJyLCBOXygiLS10cG0yLW91dGZpbGUg b3IgLS10cG0yLW52aW5kZXggbXVzdCBiZSBzcGVjaWZpZWQuXG4iKSk7CisJICByZXR1cm4gR1JV Ql9FUlJfQkFEX0FSR1VNRU5UOworCX0KKworICAgICAgaWYgKGFyZ3MtPnRwbTJfbnZpbmRleCAh PSAwKQorCXsKKwkgIGlmIChhcmdzLT50cG0yX3RwbTJrZXkgPT0gdHJ1ZSAmJiBUUE1fSFRfSVNf UEVSU0lTVEVOVCAoYXJncy0+dHBtMl9udmluZGV4KSA9PSB0cnVlKQorCSAgICB7CisJICAgICAg ZnByaW50ZiAoc3RkZXJyLCBOXygiUGVyc2lzdGVudCBoYW5kbGUgZG9lcyBub3Qgc3VwcG9ydCBU UE0gMi4wIEtleSBGaWxlIGZvcm1hdC5cbiIpKTsKKwkgICAgICByZXR1cm4gR1JVQl9FUlJfQkFE X0FSR1VNRU5UOworCSAgICB9CisKKwkgIGlmIChUUE1fSFRfSVNfUEVSU0lTVEVOVCAoYXJncy0+ dHBtMl9udmluZGV4KSA9PSBmYWxzZSAmJiBUUE1fSFRfSVNfTlZJTkRFWCAoYXJncy0+dHBtMl9u dmluZGV4KSA9PSBmYWxzZSkKKwkgICAgeworCSAgICAgIGZwcmludGYgKHN0ZGVyciwgTl8oIi0t dHBtMi1udmluZGV4IG11c3QgYmUgYSBwZXJzaXN0ZW50IG9yIE5WIGluZGV4IGhhbmRsZS5cbiIp KTsKKwkgICAgICByZXR1cm4gR1JVQl9FUlJfQkFEX0FSR1VNRU5UOworCSAgICB9CisKKwkgIGlm IChhcmdzLT50cG0yX252aW5kZXggPT0gYXJncy0+dHBtMl9zcmspCisJICAgIHsKKwkgICAgICBm cHJpbnRmIChzdGRlcnIsIE5fKCItLXRwbTItbnZpbmRleCBhbmQgLS10cG0yLXNyayBtdXN0IGJl IGRpZmZlcmVudC5cbiIpKTsKKwkgICAgICByZXR1cm4gR1JVQl9FUlJfQkFEX0FSR1VNRU5UOwor CSAgICB9CisJfQorCisgICAgICBpZiAoYXJncy0+dHBtMl9zcmsgIT0gMCAmJiBUUE1fSFRfSVNf UEVSU0lTVEVOVChhcmdzLT50cG0yX3NyaykgPT0gZmFsc2UpCisJeworCSAgZnByaW50ZiAoc3Rk ZXJyLCBOXygiLS10cG0yLXNyayBtdXN0IGJlIGEgcGVyc2lzdGVudCBoYW5kbGUsIGUuZy4gMHg4 MTAwMDAwMC5cbiIpKTsKIAkgIHJldHVybiBHUlVCX0VSUl9CQURfQVJHVU1FTlQ7CiAJfQogCkBA IC0xMDk5LDkgKzEzMTIsOSBAQCBwcm90ZWN0X3RwbTJfYXJnc192ZXJpZnkgKHByb3RlY3RfYXJn c190ICphcmdzKQogCSAgcmV0dXJuIEdSVUJfRVJSX0JBRF9BUkdVTUVOVDsKIAl9CiAKLSAgICAg IGlmIChhcmdzLT50cG0yX3NyayA9PSAwKQorICAgICAgaWYgKGFyZ3MtPnRwbTJfc3JrID09IDAg JiYgYXJncy0+dHBtMl9udmluZGV4ID09IDApCiAJewotCSAgZnByaW50ZiAoc3RkZXJyLCBOXygi LS10cG0yLXNyayBpcyBub3Qgc3BlY2lmaWVkIHdoZW4gLS1hY3Rpb24gaXMgJ3JlbW92ZScuXG4i KSk7CisJICBmcHJpbnRmIChzdGRlcnIsIE5fKCJtaXNzaW5nIC0tdHBtMi1zcmsgb3IgLS10cG0y LW52aW5kZXggZm9yIC0tYWN0aW9uICdyZW1vdmUnLlxuIikpOwogCSAgcmV0dXJuIEdSVUJfRVJS X0JBRF9BUkdVTUVOVDsKIAl9CiAKQEAgLTEyNzQsNyArMTQ4Nyw3IEBAIHByb3RlY3RfYXJncF9w YXJzZXIgKGludCBrZXksIGNoYXIgKmFyZywgc3RydWN0IGFyZ3Bfc3RhdGUgKnN0YXRlKQogCSAg cmV0dXJuIEVJTlZBTDsKIAl9CiAKLSAgICAgIGFyZ3MtPnRwbTJfZXZpY3QgPSAxOworICAgICAg YXJncy0+dHBtMl9ldmljdCA9IHRydWU7CiAgICAgICBhcmdzLT5hcmdzIHw9IFBST1RFQ1RfQVJH X1RQTTJfRVZJQ1Q7CiAgICAgICBicmVhazsKIApAQCAtMTI4NSwxMCArMTQ5OCwyOCBAQCBwcm90 ZWN0X2FyZ3BfcGFyc2VyIChpbnQga2V5LCBjaGFyICphcmcsIHN0cnVjdCBhcmdwX3N0YXRlICpz dGF0ZSkKIAkgIHJldHVybiBFSU5WQUw7CiAJfQogCi0gICAgICBhcmdzLT50cG0yX3RwbTJrZXkg PSAxOworICAgICAgYXJncy0+dHBtMl90cG0ya2V5ID0gdHJ1ZTsKICAgICAgIGFyZ3MtPmFyZ3Mg fD0gUFJPVEVDVF9BUkdfVFBNMl9UUE0yS0VZOwogICAgICAgYnJlYWs7CiAKKyAgICBjYXNlIFBS T1RFQ1RfT1BUX1RQTTJfTlZJTkRFWDoKKyAgICAgIGlmIChhcmdzLT5hcmdzICYgUFJPVEVDVF9B UkdfVFBNMl9OVklOREVYKQorCXsKKwkgIGZwcmludGYgKHN0ZGVyciwgTl8oIi0tdHBtMi1udmlu ZGV4IGNhbiBvbmx5IGJlIHNwZWNpZmllZCBvbmNlLlxuIikpOworCSAgcmV0dXJuIEVJTlZBTDsK Kwl9CisKKyAgICAgIGVyciA9IGdydWJfdHBtMl9wcm90ZWN0b3JfcGFyc2VfdHBtX2hhbmRsZSAo YXJnLCAmYXJncy0+dHBtMl9udmluZGV4KTsKKyAgICAgIGlmIChlcnIgIT0gR1JVQl9FUlJfTk9O RSkKKwl7CisJICBpZiAoZ3J1Yl9lcnJubyAhPSBHUlVCX0VSUl9OT05FKQorCSAgICBncnViX3By aW50X2Vycm9yICgpOworCSAgcmV0dXJuIEVJTlZBTDsKKwl9CisKKyAgICAgIGFyZ3MtPmFyZ3Mg fD0gUFJPVEVDVF9BUkdfVFBNMl9OVklOREVYOworICAgICAgYnJlYWs7CisKICAgICBkZWZhdWx0 OgogICAgICAgcmV0dXJuIEFSR1BfRVJSX1VOS05PV047CiAgICAgfQotLSAKMi40My4wCgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KR3J1Yi1kZXZlbCBt YWlsaW5nIGxpc3QKR3J1Yi1kZXZlbEBnbnUub3JnCmh0dHBzOi8vbGlzdHMuZ251Lm9yZy9tYWls bWFuL2xpc3RpbmZvL2dydWItZGV2ZWwK