From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jared Finder via "Emacs development discussions." Newsgroups: gmane.emacs.devel Subject: Additional cleanup around xterm-mouse Date: Sun, 15 Nov 2020 00:49:03 -0800 Message-ID: <55b9d194841a7c65a8ca52b1ea0d3293@finder.org> Reply-To: Jared Finder Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=_770b1630496ad7df873c9c7da5c46834" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11891"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Roundcube Webmail/1.3.15 To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Nov 15 09:49:46 2020 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1keDjF-0002z6-QE for ged-emacs-devel@m.gmane-mx.org; Sun, 15 Nov 2020 09:49:46 +0100 Original-Received: from localhost ([::1]:35330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1keDjE-0007qo-R6 for ged-emacs-devel@m.gmane-mx.org; Sun, 15 Nov 2020 03:49:44 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keDig-0007Mc-Jn for emacs-devel@gnu.org; Sun, 15 Nov 2020 03:49:10 -0500 Original-Received: from greenhill.hpalace.com ([2600:3c01::f03c:91ff:fe73:2daa]:38796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keDid-0008M7-SE for emacs-devel@gnu.org; Sun, 15 Nov 2020 03:49:10 -0500 Original-Received: from mail.finder.org (greenhill.hpalace.com [IPv6:2600:3c01::f03c:91ff:fe73:2daa]) by greenhill.hpalace.com (Postfix) with ESMTPSA id 482C1A17 for ; Sun, 15 Nov 2020 08:49:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=finder.org; s=2018; t=1605430144; bh=0MsJaZc/rn0hlimudssRHR0MdBmPbKs3wcRvh4PadiI=; h=Date:From:To:Subject:From; b=WOJTLdY3/dYI2b/MrXemybb4f4VowTrIEJiJzMXKlzIujbmRw8WkKoRJu/38Q3fFX tdDGzgMZlz9Wge0rQV0fa2YX5jNpQ4sozKcvG1+zBTGO8m2SPTAnufO7WGJz+i1x3K n+IxEZwn0Bqx1EZpjgcGjtDhCNusfqUBakQyoDZixlLNePRlJMoeGXoX2283r0LSvC BREKHDUSDX26EN4XREN9yyIdK4mYqsEuCXrmu1QXBA5pBBkG/QzPubheCJd0S9SeHt GiaLKIDXc8ZfYnsr41aYtQ4XIcJH/2ee2ycdnGcXZqWsbT1wc4zT2qpKRmtR6J/vpf cvdEwcsNp36Tg== X-Sender: jared@finder.org Received-SPF: pass client-ip=2600:3c01::f03c:91ff:fe73:2daa; envelope-from=jared@finder.org; helo=greenhill.hpalace.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:259192 Archived-At: --=_770b1630496ad7df873c9c7da5c46834 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Two more patches doing misc cleanup around xterm-mouse. The first patch is very straightforward and should be trivial to review and merge. I have a question about the right way to proceed with the second patch. Redirecting to read-key seems like the right solution here as it is "read-event but also take input-decode-map into account". I needed to make a change to read-key's implementation to make it also return button down events and I saw two ways to do that. I would like advice on which way is preferred. In the patch you can see the two options commented in subr.el with Option 1 enabled by default. Let me know what you think. -- MJF --=_770b1630496ad7df873c9c7da5c46834 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; charset=us-ascii; name=0001-Migrate-usage-of-GPM_CLICK_EVENT-to-MOUSE_CLICK_EVEN.patch Content-Disposition: attachment; filename=0001-Migrate-usage-of-GPM_CLICK_EVENT-to-MOUSE_CLICK_EVEN.patch; size=3555 RnJvbSBkOWFjMWJiNmNkYjI3MGMxYWIzYjNiNjYwODM3NTkwYjUzNWE2OGE1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYXJlZCBGaW5kZXIgPGphcmVkQGZpbmRlci5vcmc+CkRhdGU6 IFNhdCwgMTQgTm92IDIwMjAgMjM6NDQ6MjYgLTA4MDAKU3ViamVjdDogW1BBVENIIDEvMl0gTWln cmF0ZSB1c2FnZSBvZiBHUE1fQ0xJQ0tfRVZFTlQgdG8gTU9VU0VfQ0xJQ0tfRVZFTlQuCgoqIHNy Yy90ZXJtaG9va3MuaCAoZW51bSBldmVudF9raW5kKToKKiBzcmMvdGVybS5jICh0ZXJtX21vdXNl X2NsaWNrLCBoYW5kbGVfb25lX3Rlcm1fZXZlbnQpOgoqIHNyYy9rZXlib2FyZC5jIChkaXNjYXJk X21vdXNlX2V2ZW50cywgbWFrZV9saXNweV9ldmVudCk6IE1pZ3JhdGUKdXNhZ2Ugb2YgR1BNX0NM SUNLX0VWRU5UIHRvIE1PVVNFX0NMSUNLX0VWRU5ULgotLS0KIHNyYy9rZXlib2FyZC5jICB8IDEy ICstLS0tLS0tLS0tLQogc3JjL3Rlcm0uYyAgICAgIHwgIDggKysrKy0tLS0KIHNyYy90ZXJtaG9v a3MuaCB8ICA0IC0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCAxOSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMva2V5Ym9hcmQuYyBiL3NyYy9rZXlib2FyZC5jCmlu ZGV4IDQ5YTBhOGJkMjMuLjQ1ZTlhYmMyMjkgMTAwNjQ0Ci0tLSBhL3NyYy9rZXlib2FyZC5jCisr KyBiL3NyYy9rZXlib2FyZC5jCkBAIC0zNzM2LDkgKzM3MzYsNiBAQCBkaXNjYXJkX21vdXNlX2V2 ZW50cyAodm9pZCkKICAgICAgIGlmIChzcC0+a2luZCA9PSBNT1VTRV9DTElDS19FVkVOVAogCSAg fHwgc3AtPmtpbmQgPT0gV0hFRUxfRVZFTlQKICAgICAgICAgICB8fCBzcC0+a2luZCA9PSBIT1JJ Wl9XSEVFTF9FVkVOVAotI2lmZGVmIEhBVkVfR1BNCi0JICB8fCBzcC0+a2luZCA9PSBHUE1fQ0xJ Q0tfRVZFTlQKLSNlbmRpZgogCSAgfHwgc3AtPmtpbmQgPT0gU0NST0xMX0JBUl9DTElDS19FVkVO VAogCSAgfHwgc3AtPmtpbmQgPT0gSE9SSVpPTlRBTF9TQ1JPTExfQkFSX0NMSUNLX0VWRU5UKQog CXsKQEAgLTU1NDIsOSArNTUzOSw2IEBAIG1ha2VfbGlzcHlfZXZlbnQgKHN0cnVjdCBpbnB1dF9l dmVudCAqZXZlbnQpCiAgICAgICAvKiBBIG1vdXNlIGNsaWNrLiAgRmlndXJlIG91dCB3aGVyZSBp dCBpcywgZGVjaWRlIHdoZXRoZXIgaXQncwogICAgICAgICAgYSBwcmVzcywgY2xpY2sgb3IgZHJh ZywgYW5kIGJ1aWxkIHRoZSBhcHByb3ByaWF0ZSBzdHJ1Y3R1cmUuICAqLwogICAgIGNhc2UgTU9V U0VfQ0xJQ0tfRVZFTlQ6Ci0jaWZkZWYgSEFWRV9HUE0KLSAgICBjYXNlIEdQTV9DTElDS19FVkVO VDoKLSNlbmRpZgogI2lmbmRlZiBVU0VfVE9PTEtJVF9TQ1JPTExfQkFSUwogICAgIGNhc2UgU0NS T0xMX0JBUl9DTElDS19FVkVOVDoKICAgICBjYXNlIEhPUklaT05UQUxfU0NST0xMX0JBUl9DTElD S19FVkVOVDoKQEAgLTU1NTksMTEgKzU1NTMsNyBAQCBtYWtlX2xpc3B5X2V2ZW50IChzdHJ1Y3Qg aW5wdXRfZXZlbnQgKmV2ZW50KQogCXBvc2l0aW9uID0gUW5pbDsKIAogCS8qIEJ1aWxkIHRoZSBw b3NpdGlvbiBhcyBhcHByb3ByaWF0ZSBmb3IgdGhpcyBtb3VzZSBjbGljay4gICovCi0JaWYgKGV2 ZW50LT5raW5kID09IE1PVVNFX0NMSUNLX0VWRU5UCi0jaWZkZWYgSEFWRV9HUE0KLQkgICAgfHwg ZXZlbnQtPmtpbmQgPT0gR1BNX0NMSUNLX0VWRU5UCi0jZW5kaWYKLQkgICAgKQorCWlmIChldmVu dC0+a2luZCA9PSBNT1VTRV9DTElDS19FVkVOVCkKIAkgIHsKIAkgICAgc3RydWN0IGZyYW1lICpm ID0gWEZSQU1FIChldmVudC0+ZnJhbWVfb3Jfd2luZG93KTsKIAkgICAgaW50IHJvdywgY29sdW1u OwpkaWZmIC0tZ2l0IGEvc3JjL3Rlcm0uYyBiL3NyYy90ZXJtLmMKaW5kZXggYTA3Mzg1OTRiZi4u ZmVlM2I1NTU3NSAxMDA2NDQKLS0tIGEvc3JjL3Rlcm0uYworKysgYi9zcmMvdGVybS5jCkBAIC0y NDgxLDcgKzI0ODEsNyBAQCB0ZXJtX21vdXNlX2NsaWNrIChzdHJ1Y3QgaW5wdXRfZXZlbnQgKnJl c3VsdCwgR3BtX0V2ZW50ICpldmVudCwKIHsKICAgaW50IGksIGo7CiAKLSAgcmVzdWx0LT5raW5k ID0gR1BNX0NMSUNLX0VWRU5UOworICByZXN1bHQtPmtpbmQgPSBNT1VTRV9DTElDS19FVkVOVDsK ICAgZm9yIChpID0gMCwgaiA9IEdQTV9CX0xFRlQ7IGkgPCAzOyBpKyssIGogPj49IDEgKQogICAg IHsKICAgICAgIGlmIChldmVudC0+YnV0dG9ucyAmIGopIHsKQEAgLTI1NjcsMTEgKzI1NjcsMTEg QEAgaGFuZGxlX29uZV90ZXJtX2V2ZW50IChzdHJ1Y3QgdHR5X2Rpc3BsYXlfaW5mbyAqdHR5LCBH cG1fRXZlbnQgKmV2ZW50KQogICAgIHsKICAgICAgIGYtPm1vdXNlX21vdmVkID0gMDsKICAgICAg IHRlcm1fbW91c2VfY2xpY2sgKCZpZSwgZXZlbnQsIGYpOwotICAgICAgLyogZWFzc2VydCAoaWUu a2luZCA9PSBHUE1fQ0xJQ0tfRVZFTlQpOyAqLworICAgICAgLyogZWFzc2VydCAoaWUua2luZCA9 PSBNT1VTRV9DTElDS19FVkVOVCk7ICovCiAgICAgICBpZiAodHR5X2hhbmRsZV90YWJfYmFyX2Ns aWNrIChmLCBldmVudC0+eCwgZXZlbnQtPnksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAoaWUubW9kaWZpZXJzICYgZG93bl9tb2RpZmllcikgIT0gMCwgJmllKSkKICAgICAg ICAgewotICAgICAgICAgIC8qIGVhc3NlcnQgKGllLmtpbmQgPT0gR1BNX0NMSUNLX0VWRU5UCisg ICAgICAgICAgLyogZWFzc2VydCAoaWUua2luZCA9PSBNT1VTRV9DTElDS19FVkVOVAogICAgICAg ICAgICAqICAgICAgICAgIHx8IGllLmtpbmQgPT0gVEFCX0JBUl9FVkVOVCk7ICovCiAgICAgICAg ICAgLyogdHR5X2hhbmRsZV90YWJfYmFyX2NsaWNrIHN0b3JlcyAyIGV2ZW50cyBpbiB0aGUgZXZl bnQKICAgICAgICAgICAgICBxdWV1ZSwgc28gd2UgYXJlIGRvbmUgaGVyZS4gICovCkBAIC0yNTgx LDcgKzI1ODEsNyBAQCBoYW5kbGVfb25lX3Rlcm1fZXZlbnQgKHN0cnVjdCB0dHlfZGlzcGxheV9p bmZvICp0dHksIEdwbV9FdmVudCAqZXZlbnQpCiAgICAgICAgICAgY291bnQgKz0gMjsKICAgICAg ICAgICByZXR1cm4gY291bnQ7CiAgICAgICAgIH0KLSAgICAgIC8qIGVhc3NlcnQgKGllLmtpbmQg PT0gR1BNX0NMSUNLX0VWRU5UKTsgKi8KKyAgICAgIC8qIGVhc3NlcnQgKGllLmtpbmQgPT0gTU9V U0VfQ0xJQ0tfRVZFTlQpOyAqLwogICAgICAga2JkX2J1ZmZlcl9zdG9yZV9ldmVudCAoJmllKTsK ICAgICAgIGNvdW50Kys7CiAgICAgfQpkaWZmIC0tZ2l0IGEvc3JjL3Rlcm1ob29rcy5oIGIvc3Jj L3Rlcm1ob29rcy5oCmluZGV4IDZhYjA2Y2VmZjkuLjQ0YWIxNDIyNWYgMTAwNjQ0Ci0tLSBhL3Ny Yy90ZXJtaG9va3MuaAorKysgYi9zcmMvdGVybWhvb2tzLmgKQEAgLTIyMCwxMCArMjIwLDYgQEAg I2RlZmluZSBFTUFDU19URVJNSE9PS1NfSAogICAgICBzYXZlIHlvdXJzZWxmIGJlZm9yZSBzaHV0 ZG93bi4gKi8KICAgU0FWRV9TRVNTSU9OX0VWRU5UCiAKLSNpZmRlZiBIQVZFX0dQTQotICAsIEdQ TV9DTElDS19FVkVOVAotI2VuZGlmCi0KICNpZmRlZiBIQVZFX0RCVVMKICAgLCBEQlVTX0VWRU5U CiAjZW5kaWYKLS0gCjIuMjAuMQoK --=_770b1630496ad7df873c9c7da5c46834 Content-Transfer-Encoding: base64 Content-Type: text/x-diff; charset=us-ascii; name=0002-Options-for-making-libraries-work-with-xt-mouse.patch Content-Disposition: attachment; filename=0002-Options-for-making-libraries-work-with-xt-mouse.patch; size=14729 RnJvbSA4YTJjYzM5YWIxN2ExZTJlNmY4ZWEwMjk0YjUzOGE4OTcxMTQ2YTY4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYXJlZCBGaW5kZXIgPGphcmVkQGZpbmRlci5vcmc+CkRhdGU6 IFNhdCwgMTQgTm92IDIwMjAgMjE6NDI6MzQgLTA4MDAKU3ViamVjdDogW1BBVENIIDIvMl0gT3B0 aW9ucyBmb3IgbWFraW5nIGxpYnJhcmllcyB3b3JrIHdpdGggeHQtbW91c2UuCgpMaWJyYXJpZXMg Y2hhbmdlZCBieSBtYWtpbmcgdGhlbSBjYWxsIGByZWFkLWtleScgaW5zdGVhZCBvZgpgcmVhZC1l dmVudCcuCi0tLQogbGlzcC9mb2xkb3V0LmVsICAgICAgICAgIHwgIDIgKy0KIGxpc3AvaXNlYXJj aC5lbCAgICAgICAgICB8ICAyICstCiBsaXNwL21vdXNlLWRyYWcuZWwgICAgICAgfCAgNCArKy0t CiBsaXNwL21vdXNlLmVsICAgICAgICAgICAgfCAgMiArLQogbGlzcC9ydWxlci1tb2RlLmVsICAg ICAgIHwgIDQgKystLQogbGlzcC9zdHJva2VzLmVsICAgICAgICAgIHwgMjIgKysrKysrKysrKyst LS0tLS0tLS0tLQogbGlzcC9zdWJyLmVsICAgICAgICAgICAgIHwgMjMgKysrKysrKysrKysrKysr KysrKysrKysKIGxpc3AvdGV4dG1vZGVzL2FydGlzdC5lbCB8ICA2ICsrKy0tLQogbGlzcC92Yy9l ZGlmZi13aW5kLmVsICAgIHwgIDQgKystLQogbGlzcC92Yy9lZGlmZi5lbCAgICAgICAgIHwgIDIg Ky0KIGxpc3Avd2lkLWVkaXQuZWwgICAgICAgICB8ICA5ICsrKysrKy0tLQogc3JjL2tleWJvYXJk LmMgICAgICAgICAgIHwgMTAgKysrKysrKysrLQogc3JjL2xyZWFkLmMgICAgICAgICAgICAgIHwg IDYgKysrKysrCiAxMyBmaWxlcyBjaGFuZ2VkLCA2OCBpbnNlcnRpb25zKCspLCAyOCBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL2ZvbGRvdXQuZWwgYi9saXNwL2ZvbGRvdXQuZWwKaW5k ZXggMGQ3YTdhODhhNi4uMGEzMzA5OWRhZiAxMDA2NDQKLS0tIGEvbGlzcC9mb2xkb3V0LmVsCisr KyBiL2xpc3AvZm9sZG91dC5lbApAQCAtNDg3LDcgKzQ4Nyw3IEBAIGZvbGRvdXQtbW91c2Utc3dh bGxvdy1ldmVudHMKIFNpZ25hbCBhbiBlcnJvciBpZiB0aGUgZmluYWwgZXZlbnQgaXNuJ3QgdGhl IHNhbWUgdHlwZSBhcyB0aGUgZmlyc3Qgb25lLiIKICAgKGxldCAoKGluaXRpYWwtZXZlbnQtdHlw ZSAoZXZlbnQtYmFzaWMtdHlwZSBldmVudCkpKQogICAgICh3aGlsZSAobnVsbCAoc2l0LWZvciAo LyBkb3VibGUtY2xpY2stdGltZSAxMDAwLjApICdub2Rpc3BsYXkpKQotICAgICAgKHNldHEgZXZl bnQgKHJlYWQtZXZlbnQpKSkKKyAgICAgIChzZXRxIGV2ZW50IChyZWFkLWtleSkpKQogICAgIChv ciAoZXEgaW5pdGlhbC1ldmVudC10eXBlIChldmVudC1iYXNpYy10eXBlIGV2ZW50KSkKIAkoZXJy b3IgIiIpKSkKICAgZXZlbnQpCmRpZmYgLS1naXQgYS9saXNwL2lzZWFyY2guZWwgYi9saXNwL2lz ZWFyY2guZWwKaW5kZXggNGZiYTQzNzBkOS4uYWE2MjM2NTJiMyAxMDA2NDQKLS0tIGEvbGlzcC9p c2VhcmNoLmVsCisrKyBiL2xpc3AvaXNlYXJjaC5lbApAQCAtMjk2Nyw3ICsyOTY3LDcgQEAgaXNl YXJjaC1wcmUtY29tbWFuZC1ob29rCiAgICAgICgoYW5kIChlcSAoY2FyLXNhZmUgbWFpbi1ldmVu dCkgJ2Rvd24tbW91c2UtMSkKIAkgICAod2luZG93LW1pbmlidWZmZXItcCAocG9zbi13aW5kb3cg KGV2ZW50LXN0YXJ0IG1haW4tZXZlbnQpKSkpCiAgICAgICA7OyBTd2FsbG93IHRoZSB1cC1ldmVu dC4KLSAgICAgIChyZWFkLWV2ZW50KQorICAgICAgKHJlYWQta2V5KQogICAgICAgKHNldHEgdGhp cy1jb21tYW5kICdpc2VhcmNoLWVkaXQtc3RyaW5nKSkKICAgICAgOzsgRG9uJ3QgdGVybWluYXRl IHRoZSBzZWFyY2ggZm9yIG1vdGlvbiBjb21tYW5kcy4KICAgICAgKChhbmQgaXNlYXJjaC15YW5r LW9uLW1vdmUKZGlmZiAtLWdpdCBhL2xpc3AvbW91c2UtZHJhZy5lbCBiL2xpc3AvbW91c2UtZHJh Zy5lbAppbmRleCBlODBlYmJhMjhkLi5kY2ZmYmYwODc1IDEwMDY0NAotLS0gYS9saXNwL21vdXNl LWRyYWcuZWwKKysrIGIvbGlzcC9tb3VzZS1kcmFnLmVsCkBAIC0yMjUsNyArMjI1LDcgQEAgbW91 c2UtZHJhZy10aHJvdwogICAgICAgOzsgRG9uJ3QgY2hhbmdlIHRoZSBtb3VzZSBwb2ludGVyIHNo YXBlIHdoaWxlIHdlIGRyYWcuCiAgICAgICAoc2V0cSB0cmFjay1tb3VzZSAnZHJhZ2dpbmcpCiAg ICAgICAod2hpbGUgKHByb2duCi0JICAgICAgIChzZXRxIGV2ZW50IChyZWFkLWV2ZW50KQorCSAg ICAgICAoc2V0cSBldmVudCAocmVhZC1rZXkpCiAJCSAgICAgZW5kIChldmVudC1lbmQgZXZlbnQp CiAJCSAgICAgcm93IChjZHIgKHBvc24tY29sLXJvdyBlbmQpKQogCQkgICAgIGNvbCAoY2FyIChw b3NuLWNvbC1yb3cgZW5kKSkpCkBAIC0yODYsNyArMjg2LDcgQEAgbW91c2UtZHJhZy1kcmFnCiAJ ICB3aW5kb3ctbGFzdC1jb2wgKC0gKHdpbmRvdy13aWR0aCkgMikpCiAgICAgKHRyYWNrLW1vdXNl CiAgICAgICAod2hpbGUgKHByb2duCi0JICAgICAgIChzZXRxIGV2ZW50IChyZWFkLWV2ZW50KQor CSAgICAgICAoc2V0cSBldmVudCAocmVhZC1rZXkpCiAJCSAgICAgZW5kIChldmVudC1lbmQgZXZl bnQpCiAJCSAgICAgcm93IChjZHIgKHBvc24tY29sLXJvdyBlbmQpKQogCQkgICAgIGNvbCAoY2Fy IChwb3NuLWNvbC1yb3cgZW5kKSkpCmRpZmYgLS1naXQgYS9saXNwL21vdXNlLmVsIGIvbGlzcC9t b3VzZS5lbAppbmRleCA5ZDQ0OTJmMWJkLi5kMGNkMmY3NzY5IDEwMDY0NAotLS0gYS9saXNwL21v dXNlLmVsCisrKyBiL2xpc3AvbW91c2UuZWwKQEAgLTE3OTIsNyArMTc5Miw3IEBAIG1vdXNlLWRy YWctc2Vjb25kYXJ5CiAgICAgICAobGV0IChldmVudCBlbmQgZW5kLXBvaW50KQogCSh0cmFjay1t b3VzZQogCSAgKHdoaWxlIChwcm9nbgotCQkgICAoc2V0cSBldmVudCAocmVhZC1ldmVudCkpCisJ CSAgIChzZXRxIGV2ZW50IChyZWFkLWtleSkpCiAJCSAgIChvciAobW91c2UtbW92ZW1lbnQtcCBl dmVudCkKIAkJICAgICAgIChtZW1xIChjYXItc2FmZSBldmVudCkgJyhzd2l0Y2gtZnJhbWUgc2Vs ZWN0LXdpbmRvdykpKSkKIApkaWZmIC0tZ2l0IGEvbGlzcC9ydWxlci1tb2RlLmVsIGIvbGlzcC9y dWxlci1tb2RlLmVsCmluZGV4IDgyZTYxNzhkYTEuLjI5YWZhNDQzMjMgMTAwNjQ0Ci0tLSBhL2xp c3AvcnVsZXItbW9kZS5lbAorKysgYi9saXNwL3J1bGVyLW1vZGUuZWwKQEAgLTQyOSw3ICs0Mjks NyBAQCBydWxlci1tb2RlLW1vdXNlLWdyYWItYW55LWNvbHVtbgogICAgICAgICAgOzsgYGRpbmcn IGZsdXNoZXMgdGhlIG5leHQgbWVzc2FnZXMgYWJvdXQgc2V0dGluZyBnb2FsCiAgICAgICAgICA7 OyBjb2x1bW4uICBTbyBoZXJlIEkgZm9yY2UgZmV0Y2ggdGhlIGV2ZW50KG1vdXNlLTIpIGFuZAog ICAgICAgICAgOzsgdGhyb3cgYXdheS4KLSAgICAgICAgIChyZWFkLWV2ZW50KQorICAgICAgICAg KHJlYWQta2V5KQogICAgICAgICAgOzsgRGluZyBCRUZPUkUgYG1lc3NhZ2UnIGlzIE9LLgogICAg ICAgICAgKHdoZW4gcnVsZXItbW9kZS1zZXQtZ29hbC1jb2x1bW4tZGluZy1mbGFnCiAgICAgICAg ICAgIChkaW5nKSkKQEAgLTQ2MCw3ICs0NjAsNyBAQCBydWxlci1tb2RlLW1vdXNlLWRyYWctYW55 LWNvbHVtbi1pdGVyYXRpb24KICAgICAodHJhY2stbW91c2UKICAgICAgIDs7IFNpZ25hbCB0aGUg ZGlzcGxheSBlbmdpbmUgdG8gZnJlZXplIHRoZSBtb3VzZSBwb2ludGVyIHNoYXBlLgogICAgICAg KHNldHEgdHJhY2stbW91c2UgJ2RyYWdnaW5nKQotICAgICAgKHdoaWxlIChtb3VzZS1tb3ZlbWVu dC1wIChzZXRxIGV2ZW50IChyZWFkLWV2ZW50KSkpCisgICAgICAod2hpbGUgKG1vdXNlLW1vdmVt ZW50LXAgKHNldHEgZXZlbnQgKHJlYWQta2V5KSkpCiAgICAgICAgIChzZXRxIGRyYWdzICgxKyBk cmFncykpCiAgICAgICAgICh3aGVuIChlcSB3aW5kb3cgKHBvc24td2luZG93IChldmVudC1lbmQg ZXZlbnQpKSkKICAgICAgICAgICAocnVsZXItbW9kZS1tb3VzZS1kcmFnLWFueS1jb2x1bW4gZXZl bnQpCmRpZmYgLS1naXQgYS9saXNwL3N0cm9rZXMuZWwgYi9saXNwL3N0cm9rZXMuZWwKaW5kZXgg YzJmMDNjYWMwZi4uNzg4OTMwYzEwNSAxMDA2NDQKLS0tIGEvbGlzcC9zdHJva2VzLmVsCisrKyBi L2xpc3Avc3Ryb2tlcy5lbApAQCAtNzU3LDEyICs3NTcsMTIgQEAgc3Ryb2tlcy1yZWFkLXN0cm9r ZQogCSAgICAgIChzdHJva2VzLWZpbGwtY3VycmVudC1idWZmZXItd2l0aC13aGl0ZXNwYWNlKSkK IAkgICAgKHdoZW4gcHJvbXB0CiAJICAgICAgKG1lc3NhZ2UgIiVzIiBwcm9tcHQpCi0JICAgICAg KHNldHEgZXZlbnQgKHJlYWQtZXZlbnQpKQorCSAgICAgIChzZXRxIGV2ZW50IChyZWFkLWtleSkp CiAJICAgICAgKG9yIChzdHJva2VzLWJ1dHRvbi1wcmVzcy1ldmVudC1wIGV2ZW50KQogCQkgIChl cnJvciAiWW91IG11c3QgZHJhdyB3aXRoIHRoZSBtb3VzZSIpKSkKIAkgICAgKHVud2luZC1wcm90 ZWN0CiAJCSh0cmFjay1tb3VzZQotCQkgIChvciBldmVudCAoc2V0cSBldmVudCAocmVhZC1ldmVu dCkKKwkJICAob3IgZXZlbnQgKHNldHEgZXZlbnQgKHJlYWQta2V5KQogCQkJCSAgc2FmZS10by1k cmF3LXAgdCkpCiAJCSAgKHdoaWxlIChub3QgKHN0cm9rZXMtYnV0dG9uLXJlbGVhc2UtZXZlbnQt cCBldmVudCkpCiAJCSAgICAoaWYgKHN0cm9rZXMtbW91c2UtZXZlbnQtcCBldmVudCkKQEAgLTc3 Nyw3ICs3NzcsNyBAQCBzdHJva2VzLXJlYWQtc3Ryb2tlCiAJCQkgICAgKHNldHEgc2FmZS10by1k cmF3LXAgdCkpCiAJCQkgIChwdXNoIChjZHIgKG1vdXNlLXBpeGVsLXBvc2l0aW9uKSkKIAkJCQlw aXgtbG9jcykpKQotCQkgICAgKHNldHEgZXZlbnQgKHJlYWQtZXZlbnQpKSkpKQorCQkgICAgKHNl dHEgZXZlbnQgKHJlYWQta2V5KSkpKSkKIAkgICAgOzsgcHJvdGVjdGVkCiAJICAgIDs7IGNsZWFu IHVwIHN0cm9rZXMgYnVmZmVyIGFuZCB0aGVuIGJ1cnkgaXQuCiAJICAgICh3aGVuIChlcXVhbCAo YnVmZmVyLW5hbWUpIHN0cm9rZXMtYnVmZmVyLW5hbWUpCkBAIC03ODgsMTYgKzc4OCwxNiBAQCBz dHJva2VzLXJlYWQtc3Ryb2tlCiAgICAgICA7OyBPdGhlcndpc2UsIGRvbid0IHVzZSBzdHJva2Vz IGJ1ZmZlciBhbmQgcmVhZCBzdHJva2Ugc2lsZW50bHkKICAgICAgICh3aGVuIHByb21wdAogCSht ZXNzYWdlICIlcyIgcHJvbXB0KQotCShzZXRxIGV2ZW50IChyZWFkLWV2ZW50KSkKKwkoc2V0cSBl dmVudCAocmVhZC1rZXkpKQogCShvciAoc3Ryb2tlcy1idXR0b24tcHJlc3MtZXZlbnQtcCBldmVu dCkKIAkgICAgKGVycm9yICJZb3UgbXVzdCBkcmF3IHdpdGggdGhlIG1vdXNlIikpKQogICAgICAg KHRyYWNrLW1vdXNlCi0JKG9yIGV2ZW50IChzZXRxIGV2ZW50IChyZWFkLWV2ZW50KSkpCisJKG9y IGV2ZW50IChzZXRxIGV2ZW50IChyZWFkLWtleSkpKQogCSh3aGlsZSAobm90IChzdHJva2VzLWJ1 dHRvbi1yZWxlYXNlLWV2ZW50LXAgZXZlbnQpKQogCSAgKGlmIChzdHJva2VzLW1vdXNlLWV2ZW50 LXAgZXZlbnQpCiAJICAgICAgKHB1c2ggKGNkciAobW91c2UtcGl4ZWwtcG9zaXRpb24pKQogCQkg ICAgcGl4LWxvY3MpKQotCSAgKHNldHEgZXZlbnQgKHJlYWQtZXZlbnQpKSkpCisJICAoc2V0cSBl dmVudCAocmVhZC1rZXkpKSkpCiAgICAgICAoc2V0cSBncmlkLWxvY3MgKHN0cm9rZXMtcmVub3Jt YWxpemUtdG8tZ3JpZCAobnJldmVyc2UgcGl4LWxvY3MpKSkKICAgICAgIChzdHJva2VzLWZpbGwt c3Ryb2tlCiAgICAgICAgKHN0cm9rZXMtZWxpbWluYXRlLWNvbnNlY3V0aXZlLXJlZHVuZGFuY2ll cyBncmlkLWxvY3MpKSkpKQpAQCAtODE4LDEwICs4MTgsMTAgQEAgc3Ryb2tlcy1yZWFkLWNvbXBs ZXgtc3Ryb2tlCiAJKGlmIHByb21wdAogCSAgICAod2hpbGUgKG5vdCAoc3Ryb2tlcy1idXR0b24t cHJlc3MtZXZlbnQtcCBldmVudCkpCiAJICAgICAgKG1lc3NhZ2UgIiVzIiBwcm9tcHQpCi0JICAg ICAgKHNldHEgZXZlbnQgKHJlYWQtZXZlbnQpKSkpCisJICAgICAgKHNldHEgZXZlbnQgKHJlYWQt a2V5KSkpKQogCSh1bndpbmQtcHJvdGVjdAogCSAgICAodHJhY2stbW91c2UKLQkgICAgICAob3Ig ZXZlbnQgKHNldHEgZXZlbnQgKHJlYWQtZXZlbnQpKSkKKwkgICAgICAob3IgZXZlbnQgKHNldHEg ZXZlbnQgKHJlYWQta2V5KSkpCiAJICAgICAgKHdoaWxlIChub3QgKGFuZCAoc3Ryb2tlcy1idXR0 b24tcHJlc3MtZXZlbnQtcCBldmVudCkKIAkJCSAgICAgICAoZXEgJ21vdXNlLTMKIAkJCQkgICAo Y2FyIChnZXQgKGNhciBldmVudCkKQEAgLTgzNSwxNCArODM1LDE0IEBAIHN0cm9rZXMtcmVhZC1j b21wbGV4LXN0cm9rZQogCQkJCQkJP1xzIHN0cm9rZXMtY2hhcmFjdGVyKSkKIAkJCShwdXNoIChj ZHIgKG1vdXNlLXBpeGVsLXBvc2l0aW9uKSkKIAkJCSAgICAgIHBpeC1sb2NzKSkpCi0JCSAgKHNl dHEgZXZlbnQgKHJlYWQtZXZlbnQpKSkKKwkJICAoc2V0cSBldmVudCAocmVhZC1rZXkpKSkKIAkJ KHB1c2ggc3Ryb2tlcy1saWZ0IHBpeC1sb2NzKQogCQkod2hpbGUgKG5vdCAoc3Ryb2tlcy1idXR0 b24tcHJlc3MtZXZlbnQtcCBldmVudCkpCi0JCSAgKHNldHEgZXZlbnQgKHJlYWQtZXZlbnQpKSkp CisJCSAgKHNldHEgZXZlbnQgKHJlYWQta2V5KSkpKQogCSAgICAgIDs7ICMjIyBLTFVER0UhICMj IyBzaXQgYW5kIHdhaXQKIAkgICAgICA7OyBmb3Igc29tZSB1c2VsZXNzIGV2ZW50IHRvCiAJICAg ICAgOzsgaGFwcGVuIHRvIGZpeCB0aGUgbWluaWJ1ZmZlciBidWcuCi0JICAgICAgKHdoaWxlIChu b3QgKHN0cm9rZXMtYnV0dG9uLXJlbGVhc2UtZXZlbnQtcCAocmVhZC1ldmVudCkpKSkKKwkgICAg ICAod2hpbGUgKG5vdCAoc3Ryb2tlcy1idXR0b24tcmVsZWFzZS1ldmVudC1wIChyZWFkLWtleSkp KSkKIAkgICAgICAoc2V0cSBwaXgtbG9jcyAobnJldmVyc2UgKGNkciBwaXgtbG9jcykpCiAJCSAg ICBncmlkLWxvY3MgKHN0cm9rZXMtcmVub3JtYWxpemUtdG8tZ3JpZCBwaXgtbG9jcykpCiAJICAg ICAgKHN0cm9rZXMtZmlsbC1zdHJva2UKZGlmZiAtLWdpdCBhL2xpc3Avc3Vici5lbCBiL2xpc3Av c3Vici5lbAppbmRleCA2ZTlmNjZmZTk3Li4zNjM4MWRjNGU2IDEwMDY0NAotLS0gYS9saXNwL3N1 YnIuZWwKKysrIGIvbGlzcC9zdWJyLmVsCkBAIC0yNDQ2LDYgKzI0NDYsOSBAQCByZWFkLWtleQog CShvdmVycmlkaW5nLWxvY2FsLW1hcCByZWFkLWtleS1lbXB0eS1tYXApCiAgICAgICAgIChlY2hv LWtleXN0cm9rZXMgMCkKIAkob2xkLWdsb2JhbC1tYXAgKGN1cnJlbnQtZ2xvYmFsLW1hcCkpCisg ICAgICAgIDs7IE9wdGlvbiAxOiBOZXcgdmFyaWFibGUgdGhhdCBwcmV2ZW50cyBtb3VzZSBldmVu dHMgZnJvbQorICAgICAgICA7OyBiZWluZyB0cmFuc2Zvcm1lZCBvciBkaXNjYXJkZWQuCisgICAg ICAgIChpbmhpYml0LS11bmJvdW5kLW1vdXNlLWZhbGxiYWNrIHQpCiAgICAgICAgICh0aW1lciAo cnVuLXdpdGgtaWRsZS10aW1lcgogICAgICAgICAgICAgICAgIDs7IFdhaXQgbG9uZyBlbm91Z2gg dGhhdCBFbWFjcyBoYXMgdGhlIHRpbWUgdG8gcmVjZWl2ZSBhbmQKICAgICAgICAgICAgICAgICA7 OyBwcm9jZXNzIGFsbCB0aGUgcmF3IGV2ZW50cyBhc3NvY2lhdGVkIHdpdGggdGhlIHNpbmdsZS1r ZXkuCkBAIC0yNDgxLDYgKzI0ODQsMjYgQEAgcmVhZC1rZXkKIAkgICAgICAgOzsgVGhpcyBoYWNr IGF2b2lkcyBldmFsdWF0aW5nIHRoZSA6ZmlsdGVyIChCdWcjOTkyMikuCiAJICAgICAgIChvciAo Y2RyIChhc3NxICd0b29sLWJhciBnbG9iYWwtbWFwKSkKIAkJICAgKGxvb2t1cC1rZXkgZ2xvYmFs LW1hcCBbdG9vbC1iYXJdKSkpCisgICAgICAgICAgICAgOzsgT3B0aW9uIDI6IEJpbmQgYWxsIHRo ZSBtb3VzZSBldmVudHMgdG8gcHJldmVudAorICAgICAgICAgICAgIDs7IGRyb3BwaW5nIC8gdHJh bnNmb3JtYXRpb24uCisgICAgICAgICAgICAgOzsKKyAgICAgICAgICAgICA7OyBOb3RlOiB0aGlz IGlzIG5vdCBhbiBleGhhdXN0aXZlIGxpc3QuICBUbyBmdWxseSB3b3JrLAorICAgICAgICAgICAg IDs7IHRoaXMgc2hvdWxkIGJpbmQgYWxsIHBvc3NpYmxlIHByZWZpeCBjb21iaW5hdGlvbnMgKHRo ZQorICAgICAgICAgICAgIDs7IHBvd2VyIHNldCBvZiBBLSwgQy0sIEgtLCBTLSwgcy0pIGZvciBh bGwgcG9zc2libGUKKyAgICAgICAgICAgICA7OyBtb3VzZSBldmVudHMuICBGb3IgZXhhbXBsZSwg dGhpcyBjdXJyZW50bHkgZG9lcyBub3QKKyAgICAgICAgICAgICA7OyBiaW5kIEMtUy1kb3duLW1v dXNlLTEuCisgICAgICAgICAgICAgOzsgKGRlZmluZS1rZXkgbWFwIFtkb3duLW1vdXNlLTFdICdp Z25vcmUpCisgICAgICAgICAgICAgOzsgKGRlZmluZS1rZXkgbWFwIFtDLWRvd24tbW91c2UtMV0g J2lnbm9yZSkKKyAgICAgICAgICAgICA7OyAoZGVmaW5lLWtleSBtYXAgW00tZG93bi1tb3VzZS0x XSAnaWdub3JlKQorICAgICAgICAgICAgIDs7IChkZWZpbmUta2V5IG1hcCBbQy1NLWRvd24tbW91 c2UtMV0gJ2lnbm9yZSkKKyAgICAgICAgICAgICA7OyAoZGVmaW5lLWtleSBtYXAgW2Rvd24tbW91 c2UtMl0gJ2lnbm9yZSkKKyAgICAgICAgICAgICA7OyAoZGVmaW5lLWtleSBtYXAgW0MtZG93bi1t b3VzZS0yXSAnaWdub3JlKQorICAgICAgICAgICAgIDs7IChkZWZpbmUta2V5IG1hcCBbTS1kb3du LW1vdXNlLTJdICdpZ25vcmUpCisgICAgICAgICAgICAgOzsgKGRlZmluZS1rZXkgbWFwIFtDLU0t ZG93bi1tb3VzZS0zXSAnaWdub3JlKQorICAgICAgICAgICAgIDs7IChkZWZpbmUta2V5IG1hcCBb ZG93bi1tb3VzZS0zXSAnaWdub3JlKQorICAgICAgICAgICAgIDs7IChkZWZpbmUta2V5IG1hcCBb Qy1kb3duLW1vdXNlLTNdICdpZ25vcmUpCisgICAgICAgICAgICAgOzsgKGRlZmluZS1rZXkgbWFw IFtNLWRvd24tbW91c2UtM10gJ2lnbm9yZSkKKyAgICAgICAgICAgICA7OyAoZGVmaW5lLWtleSBt YXAgW0MtTS1kb3duLW1vdXNlLTNdICdpZ25vcmUpCiAgICAgICAgICAgICAgbWFwKSkKICAgICAg ICAgICAobGV0KiAoKGtleXMKICAgICAgICAgICAgICAgICAgIChjYXRjaCAncmVhZC1rZXkgKHJl YWQta2V5LXNlcXVlbmNlLXZlY3RvciBwcm9tcHQgbmlsIHQpKSkKZGlmZiAtLWdpdCBhL2xpc3Av dGV4dG1vZGVzL2FydGlzdC5lbCBiL2xpc3AvdGV4dG1vZGVzL2FydGlzdC5lbAppbmRleCA1Y2U5 YTkwZWE2Li41MTU1ZDQxMDBjIDEwMDY0NAotLS0gYS9saXNwL3RleHRtb2Rlcy9hcnRpc3QuZWwK KysrIGIvbGlzcC90ZXh0bW9kZXMvYXJ0aXN0LmVsCkBAIC01MDE2LDcgKzUwMTYsNyBAQCBhcnRp c3QtbW91c2UtZHJhdy1jb250aW5vdXNseQogICAgICAgICAgICAgICAgICAgKHNldHEgdGltZXIg KHJ1bi1hdC10aW1lIGludGVydmFsIGludGVydmFsIGRyYXctZm4geDEgeTEpKSkpCiAKICAgICAg ICAgICAgIDs7IFJlYWQgbmV4dCBldmVudAotICAgICAgICAgICAgKHNldHEgZXYgKHJlYWQtZXZl bnQpKSkpCisgICAgICAgICAgICAoc2V0cSBldiAocmVhZC1rZXkpKSkpCiAgICAgICA7OyBDbGVh bnVwOiBnZXQgcmlkIG9mIGFueSBhY3RpdmUgdGltZXIuCiAgICAgICAoaWYgdGltZXIKICAgICAg ICAgICAoY2FuY2VsLXRpbWVyIHRpbWVyKSkpCkBAIC01MjI0LDcgKzUyMjQsNyBAQCBhcnRpc3Qt bW91c2UtZHJhdy1wb2x5CiAKIAk7OyBSZWFkIG5leHQgZXZlbnQgKG9ubHkgaWYgd2Ugc2hvdWxk IG5vdCBzdG9wKQogCShpZiAobm90IGRvbmUpCi0JICAgIChzZXRxIGV2IChyZWFkLWV2ZW50KSkp KSkKKwkgICAgKHNldHEgZXYgKHJlYWQta2V5KSkpKSkKIAogICAgIDs7IFJldmVyc2UgcG9pbnQt bGlzdCAobGFzdCBwb2ludHMgYXJlIGNvbmQnZWQgZmlyc3QpCiAgICAgKHNldHEgcG9pbnQtbGlz dCAocmV2ZXJzZSBwb2ludC1saXN0KSkKQEAgLTUzNTEsNyArNTM1MSw3IEBAIGFydGlzdC1tb3Vz ZS1kcmF3LTJwb2ludHMKIAogCiAJOzsgUmVhZCBuZXh0IGV2ZW50Ci0JKHNldHEgZXYgKHJlYWQt ZXZlbnQpKSkpCisJKHNldHEgZXYgKHJlYWQta2V5KSkpKQogCiAgICAgOzsgSWYgd2UgYXJlIG5v dCBydWJiZXItYmFuZGluZyAodGhhdCBpcywgd2Ugd2VyZSBtb3ZpbmcgYXJvdW5kIHRoZSBgMicp CiAgICAgOzsgZHJhdyB0aGUgc2hhcGUKZGlmZiAtLWdpdCBhL2xpc3AvdmMvZWRpZmYtd2luZC5l bCBiL2xpc3AvdmMvZWRpZmYtd2luZC5lbAppbmRleCBhMjNkNzIwNzBhLi45ODQzNjY5ZTc4IDEw MDY0NAotLS0gYS9saXNwL3ZjL2VkaWZmLXdpbmQuZWwKKysrIGIvbGlzcC92Yy9lZGlmZi13aW5k LmVsCkBAIC0yNjksMTEgKzI2OSwxMSBAQCBlZGlmZi1nZXQtd2luZG93LWJ5LWNsaWNraW5nCiAg IChsZXQgKGV2ZW50KQogICAgIChtZXNzYWdlCiAgICAgICJTZWxlY3Qgd2luZG93cyBieSBjbGlj a2luZy4gIFBsZWFzZSBjbGljayBvbiBXaW5kb3cgJWQgIiB3aW5kLW51bWJlcikKLSAgICAod2hp bGUgKG5vdCAoZWRpZmYtbW91c2UtZXZlbnQtcCAoc2V0cSBldmVudCAocmVhZC1ldmVudCkpKSkK KyAgICAod2hpbGUgKG5vdCAoZWRpZmYtbW91c2UtZXZlbnQtcCAoc2V0cSBldmVudCAocmVhZC1r ZXkpKSkpCiAgICAgICAoaWYgKHNpdC1mb3IgMSkgOyBpZiBzZXF1ZW5jZSBvZiBldmVudHMsIHdh aXQgdGlsbCB0aGUgZmluYWwgd29yZAogCSAgKGJlZXAgMSkpCiAgICAgICAobWVzc2FnZSAiUGxl YXNlIGNsaWNrIG9uIFdpbmRvdyAlZCAiIHdpbmQtbnVtYmVyKSkKLSAgICAocmVhZC1ldmVudCkg OyBkaXNjYXJkIGV2ZW50CisgICAgKHJlYWQta2V5KSA7IGRpc2NhcmQgZXZlbnQKICAgICAocG9z bi13aW5kb3cgKGV2ZW50LXN0YXJ0IGV2ZW50KSkpKQogCiAKZGlmZiAtLWdpdCBhL2xpc3AvdmMv ZWRpZmYuZWwgYi9saXNwL3ZjL2VkaWZmLmVsCmluZGV4IGFlMmY4YWQ2YzEuLmJmMzVjZDJiZDEg MTAwNjQ0Ci0tLSBhL2xpc3AvdmMvZWRpZmYuZWwKKysrIGIvbGlzcC92Yy9lZGlmZi5lbApAQCAt OTM5LDcgKzkzOSw3IEBAIGVkaWZmLXdpbmRvd3MtbGluZXdpc2UKIDs7IElmIFdJTkQtQSBpcyBu aWwsIHVzZSBzZWxlY3RlZCB3aW5kb3cuCiA7OyBJZiBXSU5ELUIgaXMgbmlsLCB1c2Ugd2luZG93 IG5leHQgdG8gV0lORC1BLgogKGRlZnVuIGVkaWZmLXdpbmRvd3MgKGR1bWItbW9kZSB3aW5kLUEg d2luZC1CIHN0YXJ0dXAtaG9va3Mgam9iLW5hbWUgd29yZC1tb2RlKQotICAoaWYgKG9yIGR1bWIt bW9kZSAobm90IChlZGlmZi13aW5kb3ctZGlzcGxheS1wKSkpCisgIChpZiAob3IgZHVtYi1tb2Rl IChub3QgKGRpc3BsYXktbW91c2UtcCkpKQogICAgICAgKHNldHEgd2luZC1BIChlZGlmZi1nZXQt bmV4dC13aW5kb3cgd2luZC1BIG5pbCkKIAkgICAgd2luZC1CIChlZGlmZi1nZXQtbmV4dC13aW5k b3cgd2luZC1CIHdpbmQtQSkpCiAgICAgKHNldHEgd2luZC1BIChlZGlmZi1nZXQtd2luZG93LWJ5 LWNsaWNraW5nIHdpbmQtQSBuaWwgMSkKZGlmZiAtLWdpdCBhL2xpc3Avd2lkLWVkaXQuZWwgYi9s aXNwL3dpZC1lZGl0LmVsCmluZGV4IDRlMmNmNzQxNmQuLmJkY2Y4MjU1YTEgMTAwNjQ0Ci0tLSBh L2xpc3Avd2lkLWVkaXQuZWwKKysrIGIvbGlzcC93aWQtZWRpdC5lbApAQCAtMTA4OCw3ICsxMDg4 LDcgQEAgd2lkZ2V0LWJ1dHRvbi0tY2hlY2stYW5kLWNhbGwtYnV0dG9uCiAJCSAgKHVubGVzcyAo d2lkZ2V0LWFwcGx5IGJ1dHRvbiA6bW91c2UtZG93bi1hY3Rpb24gZXZlbnQpCiAJCSAgICAobGV0 ICgodHJhY2stbW91c2UgdCkpCiAJCSAgICAgICh3aGlsZSAobm90ICh3aWRnZXQtYnV0dG9uLXJl bGVhc2UtZXZlbnQtcCBldmVudCkpCi0JCSAgICAgICAgKHNldHEgZXZlbnQgKHJlYWQtZXZlbnQp KQorICAgICAgICAgICAgICAgICAgICAgICAgKHNldHEgZXZlbnQgKHJlYWQta2V5KSkKIAkJICAg ICAgICAod2hlbiAoYW5kIG1vdXNlLTEgKG1vdXNlLW1vdmVtZW50LXAgZXZlbnQpKQogCQkJICAo cHVzaCBldmVudCB1bnJlYWQtY29tbWFuZC1ldmVudHMpCiAJCQkgIChzZXRxIGV2ZW50IG9ldmVu dCkKQEAgLTExNTMsNiArMTE1Myw5IEBAIHdpZGdldC1idXR0b24tY2xpY2sKIAkgICAgKHdoZW4g dXAKIAkgICAgICA7OyBEb24ndCBleGVjdXRlIHVwIGV2ZW50cyB0d2ljZS4KIAkgICAgICAod2hp bGUgKG5vdCAod2lkZ2V0LWJ1dHRvbi1yZWxlYXNlLWV2ZW50LXAgZXZlbnQpKQorICAgICAgICAg ICAgICAgIDs7IEZJWE1FOiBUaGlzIHNob3VsZCBwcm9iYWJseSBiZSByZWFkLWtleSB0byBnZXQK KyAgICAgICAgICAgICAgICA7OyBtb3VzZSBldmVudHMgdGhyb3VnaCB4dGVybS1tb3VzZS1tb2Rl LCBidXQgaXQgaXMKKyAgICAgICAgICAgICAgICA7OyB1bmNsZWFyIGhvdyB0byB0cmlnZ2VyIHRo aXMgY29kZSBwYXRoIG5vcm1hbGx5LgogCQkoc2V0cSBldmVudCAocmVhZC1ldmVudCkpKSkKIAkg ICAgKHdoZW4gY29tbWFuZAogCSAgICAgIChjYWxsLWludGVyYWN0aXZlbHkgY29tbWFuZCkpKSkp CkBAIC0zNDY1LDkgKzM0NjgsOSBAQCAna2V5LXNlcXVlbmNlCiAoZGVmdW4gd2lkZ2V0LWtleS1z ZXF1ZW5jZS1yZWFkLWV2ZW50IChldikKICAgKGludGVyYWN0aXZlIChsaXN0CiAJCShsZXQgKChp bmhpYml0LXF1aXQgdCkgcXVpdC1mbGFnKQotCQkgIChyZWFkLWV2ZW50ICJJbnNlcnQgS0VZLCBF VkVOVCwgb3IgQ09ERTogIikpKSkKKwkJICAocmVhZC1rZXkgIkluc2VydCBLRVksIEVWRU5ULCBv ciBDT0RFOiAiKSkpKQogICAobGV0ICgoZXYyIChhbmQgKG1lbXEgJ2Rvd24gKGV2ZW50LW1vZGlm aWVycyBldikpCi0JCSAgKHJlYWQtZXZlbnQpKSkKKwkJICAocmVhZC1rZXkpKSkKIAkodHIgKGFu ZCAoa2V5bWFwcCBmdW5jdGlvbi1rZXktbWFwKQogCQkgKGxvb2t1cC1rZXkgZnVuY3Rpb24ta2V5 LW1hcCAodmVjdG9yIGV2KSkpKSkKICAgICAod2hlbiAoYW5kIChpbnRlZ2VycCBldikKZGlmZiAt LWdpdCBhL3NyYy9rZXlib2FyZC5jIGIvc3JjL2tleWJvYXJkLmMKaW5kZXggNDVlOWFiYzIyOS4u NDgzYWY3NTE1OCAxMDA2NDQKLS0tIGEvc3JjL2tleWJvYXJkLmMKKysrIGIvc3JjL2tleWJvYXJk LmMKQEAgLTk4MjcsNyArOTgyNyw3IEBAIHJlYWRfa2V5X3NlcXVlbmNlIChMaXNwX09iamVjdCAq a2V5YnVmLCBMaXNwX09iamVjdCBwcm9tcHQsCiAgICAgICBuZXdfYmluZGluZyA9IGZvbGxvd19r ZXkgKGN1cnJlbnRfYmluZGluZywga2V5KTsKIAogICAgICAgLyogSWYgS0VZIHdhc24ndCBib3Vu ZCwgd2UnbGwgdHJ5IHNvbWUgZmFsbGJhY2tzLiAgKi8KLSAgICAgIGlmICghTklMUCAobmV3X2Jp bmRpbmcpKQorICAgICAgaWYgKCFOSUxQIChuZXdfYmluZGluZykgfHwgaW5oaWJpdF91bmJvdW5k X21vdXNlX2ZhbGxiYWNrKQogCS8qIFRoaXMgaXMgbmVlZGVkIGZvciB0aGUgZm9sbG93aW5nIHNj ZW5hcmlvOgogCSAgIGV2ZW50IDA6IGEgZG93bi1ldmVudCB0aGF0IGdldHMgZHJvcHBlZCBieSBj YWxsaW5nIHJlcGxheV9rZXkuCiAJICAgZXZlbnQgMTogc29tZSBub3JtYWwgcHJlZml4IGxpa2Ug Qy1oLgpAQCAtMTIzOTMsNiArMTIzOTMsMTQgQEAgc3ltc19vZl9rZXlib2FyZCAodm9pZCkKIG1h Y3JvcywgZHJpYmJsZSBmaWxlLCBhbmQgYHJlY2VudC1rZXlzJy4KIEludGVybmFsIHVzZSBvbmx5 LiAgKi8pOwogCisgIERFRlZBUl9CT09MICgiaW5oaWJpdC0tdW5ib3VuZC1tb3VzZS1mYWxsYmFj ayIsCisgICAgICAgICAgICAgICBpbmhpYml0X3VuYm91bmRfbW91c2VfZmFsbGJhY2ssCisgICAg ICAgICAgICAgICBkb2M6IC8qIElmIG5vbi1uaWwsIGByZWFkLWtleS1zZXF1ZW5jZScgZG9lcyBu b3QKK3RyYW5zZm9ybSBhbnkgdW5ib3VuZCBtb3VzZSBldmVudHMuCitUaGlzIHByZXZlbnRzIHRo ZSB1c3VhbCBiZWhhdmlvciBpbiBgcmVhZC1rZXktc2VxdWVuY2UnIHdoZXJlIHVuYm91bmQKK2J1 dHRvbi1kb3duIGV2ZW50cywgZHJhZyBldmVudHMsIGFuZCBtdWx0aXBsZS1jbGljayBldmVudHMg Z2V0Cit0cmFuc2Zvcm1lZCBvciBkcm9wcGVkLiAgSW50ZXJuYWwgdXNlIG9ubHkuICAqLyk7CisK ICAgcGR1bXBlcl9kb19ub3dfYW5kX2FmdGVyX2xvYWQgKHN5bXNfb2Zfa2V5Ym9hcmRfZm9yX3Bk dW1wZXIpOwogfQogCmRpZmYgLS1naXQgYS9zcmMvbHJlYWQuYyBiL3NyYy9scmVhZC5jCmluZGV4 IGEzZDVmZDdiYjguLmU4MTFkZTQ3YzEgMTAwNjQ0Ci0tLSBhL3NyYy9scmVhZC5jCisrKyBiL3Ny Yy9scmVhZC5jCkBAIC03ODIsNiArNzgyLDEyIEBAIERFRlVOICgicmVhZC1jaGFyIiwgRnJlYWRf Y2hhciwgU3JlYWRfY2hhciwgMCwgMywgMCwKIAogREVGVU4gKCJyZWFkLWV2ZW50IiwgRnJlYWRf ZXZlbnQsIFNyZWFkX2V2ZW50LCAwLCAzLCAwLAogICAgICAgIGRvYzogLyogUmVhZCBhbiBldmVu dCBvYmplY3QgZnJvbSB0aGUgaW5wdXQgc3RyZWFtLgorCitJZiB5b3Ugd2FudCB0byByZWFkIG1v dXNlIGV2ZW50cyAoZm9yIGV4YW1wbGUsIHRvIGRpc2NhcmQgYW4gZXhwZWN0ZWQKK2J1dHRvbiB1 cCBldmVudCBpbnNpZGUgYSBidXR0b24gZG93biBjb21tYW5kKSwgY2FsbCBgcmVhZC1rZXknIHdo aWNoCitjYW4gcmV0dXJuIGV2ZW50cyB2aWEgYGlucHV0LWRlY29kZS1tYXAnIHN1Y2ggYXMgYWxs IG1vdXNlIGV2ZW50cworZ2VuZXJhdGVkIGJ5IGB4dGVybS1tb3VzZS1tb2RlJy4KKwogSWYgdGhl IG9wdGlvbmFsIGFyZ3VtZW50IFBST01QVCBpcyBub24tbmlsLCBkaXNwbGF5IHRoYXQgYXMgYSBw cm9tcHQuCiBJZiBQUk9NUFQgaXMgbmlsIG9yIHRoZSBzdHJpbmcgXCJcIiwgdGhlIGtleSBzZXF1 ZW5jZS9ldmVudHMgdGhhdCBsZWQKIHRvIHRoZSBjdXJyZW50IGNvbW1hbmQgaXMgdXNlZCBhcyB0 aGUgcHJvbXB0LgotLSAKMi4yMC4xCgo= --=_770b1630496ad7df873c9c7da5c46834--