Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gS3fp-0005VT-U2 for pgsql-hackers@arkaria.postgresql.org; Wed, 28 Nov 2018 17:30:54 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1gS3fn-0008Fa-TP for pgsql-hackers@arkaria.postgresql.org; Wed, 28 Nov 2018 17:30:51 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gS3fn-0008FS-KL for pgsql-hackers@lists.postgresql.org; Wed, 28 Nov 2018 17:30:51 +0000 Received: from out4-smtp.messagingengine.com ([66.111.4.28]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gS3fg-0003aw-0V for pgsql-hackers@postgresql.org; Wed, 28 Nov 2018 17:30:51 +0000 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id ED43B228CF; Wed, 28 Nov 2018 12:30:41 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Wed, 28 Nov 2018 12:30:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=krSIQJ 8M7ppYC9RF78RYsA0CwMwd+6i+u09LxZn0Mto=; b=QDczpmFFG01WTwvGfQRkfN P86h6xCUp7woXOQBpMeZsyKel3uI45PM9CsYG7X8koNhbfCbh/+tJMV7Z9t6n3TM KQACNPjNCCssED42rO7RECrZuCdso4m1ZA2ew3thQk4NwvNWunCgmpAYtdPk2bRv DSyGLt8fhLTcQN1EVYxG5Mi/cE8yirNkfB2NporKVOnT1UM1h2bwVY0qStO99yDN wkYK3aHFTp+uaxDZRYF309S1eqR4v/OIa5pG+waHbg6ZnPUObZnEvk0HmxqcNlED tj+N6iKTH3zZLxf3GxKC2q+ys/ahb6OZK9VXZLWkkLdzZmEbkXULH/cOYQG8lHPw == X-ME-Sender: X-ME-Proxy: Received: from april.pezone.net (p5df34ab1.dip0.t-ipconnect.de [93.243.74.177]) by mail.messagingengine.com (Postfix) with ESMTPA id EDC68E4394; Wed, 28 Nov 2018 12:30:39 -0500 (EST) Subject: Re: pg_stat_ssl additions To: Thomas Munro References: <398754d8-6bb5-c5cf-e7b8-22e5f0983caf@2ndquadrant.com> Cc: Pg Hackers From: Peter Eisentraut Openpgp: preference=signencrypt Autocrypt: addr=peter.eisentraut@2ndquadrant.com; prefer-encrypt=mutual; keydata= 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 3jI= Organization: 2ndQuadrant Message-ID: <7148b156-789c-3045-01f8-8d73dda7fe20@2ndquadrant.com> Date: Wed, 28 Nov 2018 18:30:38 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------4AA556F5643E4B5DEB7E35AC" Content-Language: en-US List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk This is a multi-part message in MIME format. --------------4AA556F5643E4B5DEB7E35AC Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 27/11/2018 00:29, Thomas Munro wrote: > On Thu, Oct 18, 2018 at 11:05 AM Peter Eisentraut > wrote: >> - Adds tests under src/test/ssl/ for the pg_stat_ssl view. > > Hi Peter, > > Your new tests fail when run by cfbot (Ubuntu), and also on my Debian > buster machine, but pass on my FreeBSD 13-CURRENT box. I think the > problem is that you match cipher names with \w+, but some cipher names > sometimes (on some library versions?) have hyphens in them instead of > underscores. Right, this is a TLSv1.3 vs earlier thing. Updated patches attached. -- Peter Eisentraut http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services --------------4AA556F5643E4B5DEB7E35AC Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="v2-0001-doc-Add-link-from-sslinfo-to-pg_stat_ssl.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="v2-0001-doc-Add-link-from-sslinfo-to-pg_stat_ssl.patch" RnJvbSBjZGVmOTM5NTI3NWQ4OGQ4ZDRhYzcxOGM2ZTIwZjJkZWNjNWY3ZjVmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlcl9lQGdteC5u ZXQ+CkRhdGU6IFR1ZSwgMiBPY3QgMjAxOCAxMjoxNzoyMiArMDIwMApTdWJqZWN0OiBbUEFU Q0ggdjIgMS80XSBkb2M6IEFkZCBsaW5rIGZyb20gc3NsaW5mbyB0byBwZ19zdGF0X3NzbAoK LS0tCiBkb2Mvc3JjL3NnbWwvc3NsaW5mby5zZ21sIHwgNSArKysrKwogMSBmaWxlIGNoYW5n ZWQsIDUgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RvYy9zcmMvc2dtbC9zc2xpbmZv LnNnbWwgYi9kb2Mvc3JjL3NnbWwvc3NsaW5mby5zZ21sCmluZGV4IGNkYTA5YWFhZmQuLjBm ZGUwZmMxMGUgMTAwNjQ0Ci0tLSBhL2RvYy9zcmMvc2dtbC9zc2xpbmZvLnNnbWwKKysrIGIv ZG9jL3NyYy9zZ21sL3NzbGluZm8uc2dtbApAQCAtMTQsNiArMTQsMTEgQEAgPHRpdGxlPnNz bGluZm88L3RpdGxlPgogICB3aWxsIHJldHVybiBOVUxMKSBpZiB0aGUgY3VycmVudCBjb25u ZWN0aW9uIGRvZXMgbm90IHVzZSBTU0wuCiAgPC9wYXJhPgogCisgPHBhcmE+CisgIFNvbWUg b2YgdGhlIGluZm9ybWF0aW9uIGF2YWlsYWJsZSB0aHJvdWdoIHRoaXMgbW9kdWxlIGNhbiBh bHNvIGJlIG9idGFpbmVkCisgIHVzaW5nIHRoZSBidWlsdC1pbiBzeXN0ZW0gdmlldyA8eHJl ZiBsaW5rZW5kPSJwZy1zdGF0LXNzbC12aWV3Ii8+LgorIDwvcGFyYT4KKwogIDxwYXJhPgog ICBUaGlzIGV4dGVuc2lvbiB3b24ndCBidWlsZCBhdCBhbGwgdW5sZXNzIHRoZSBpbnN0YWxs YXRpb24gd2FzCiAgIGNvbmZpZ3VyZWQgd2l0aCA8bGl0ZXJhbD4tLXdpdGgtb3BlbnNzbDwv bGl0ZXJhbD4uCgpiYXNlLWNvbW1pdDogMGY5Y2RkN2RjYTY5NGQ0ODdhYjY2M2Q0NjNiMzA4 OTE5ZjU5MWMwMgotLSAKMi4xOS4xCgo= --------------4AA556F5643E4B5DEB7E35AC Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="v2-0002-Add-tests-for-pg_stat_ssl-system-view.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="v2-0002-Add-tests-for-pg_stat_ssl-system-view.patch" RnJvbSAyMzU5MmZhY2U2YjMwNjFmNGFiYWU2NzE2NTIzZjNiNDU0NjliNDBiIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlcl9lQGdteC5u ZXQ+CkRhdGU6IFR1ZSwgMjEgQXVnIDIwMTggMjE6MTE6MzYgKzAyMDAKU3ViamVjdDogW1BB VENIIHYyIDIvNF0gQWRkIHRlc3RzIGZvciBwZ19zdGF0X3NzbCBzeXN0ZW0gdmlldwoKLS0t CiBzcmMvdGVzdC9zc2wvdC8wMDFfc3NsdGVzdHMucGwgfCAyMiArKysrKysrKysrKysrKysr KysrKystCiAxIGZpbGUgY2hhbmdlZCwgMjEgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigt KQoKZGlmZiAtLWdpdCBhL3NyYy90ZXN0L3NzbC90LzAwMV9zc2x0ZXN0cy5wbCBiL3NyYy90 ZXN0L3NzbC90LzAwMV9zc2x0ZXN0cy5wbAppbmRleCAyYjg3NWEzYzk1Li4yYmNiYjFiNDJh IDEwMDY0NAotLS0gYS9zcmMvdGVzdC9zc2wvdC8wMDFfc3NsdGVzdHMucGwKKysrIGIvc3Jj L3Rlc3Qvc3NsL3QvMDAxX3NzbHRlc3RzLnBsCkBAIC04LDcgKzgsNyBAQAogCiBpZiAoJEVO Vnt3aXRoX29wZW5zc2x9IGVxICd5ZXMnKQogewotCXBsYW4gdGVzdHMgPT4gNjU7CisJcGxh biB0ZXN0cyA9PiA3MTsKIH0KIGVsc2UKIHsKQEAgLTMwOSw2ICszMDksMTYgQEAKIAlxci9T U0wgZXJyb3IvLAogCSJkb2VzIG5vdCBjb25uZWN0IHdpdGggY2xpZW50LXNpZGUgQ1JMIik7 CiAKKyMgcGdfc3RhdF9zc2wKK2NvbW1hbmRfbGlrZShbCisJJ3BzcWwnLCAnLVgnLCAnLUEn LCAnLUYnLCAnLCcsICctUCcsICdudWxsPV9udWxsXycsCisJJy1kJywgJGNvbW1vbl9jb25u c3RyLAorCSctYycsICJTRUxFQ1QgKiBGUk9NIHBnX3N0YXRfc3NsIFdIRVJFIHBpZCA9IHBn X2JhY2tlbmRfcGlkKCkiCisJCQkgXSwKKwkJCSBxcntecGlkLHNzbCx2ZXJzaW9uLGNpcGhl cixiaXRzLGNvbXByZXNzaW9uLGNsaWVudGRuXG4KKwkJCQleXGQrLHQsVExTdltcZC5dKyxb XHctXSssXGQrLGYsJH1teCwKKwkJCSAncGdfc3RhdF9zc2wgdmlldyB3aXRob3V0IGNsaWVu dCBjZXJ0aWZpY2F0ZScpOworCiAjIyMgU2VydmVyLXNpZGUgdGVzdHMuCiAjIyMKICMjIyBU ZXN0IGNlcnRpZmljYXRlIGF1dGhvcml6YXRpb24uCkBAIC0zMzEsNiArMzQxLDE2IEBACiAJ InVzZXI9c3NsdGVzdHVzZXIgc3NsY2VydD1zc2wvY2xpZW50LmNydCBzc2xrZXk9c3NsL2Ns aWVudF90bXAua2V5IiwKIAkiY2VydGlmaWNhdGUgYXV0aG9yaXphdGlvbiBzdWNjZWVkcyB3 aXRoIGNvcnJlY3QgY2xpZW50IGNlcnQiKTsKIAorIyBwZ19zdGF0X3NzbAorY29tbWFuZF9s aWtlKFsKKwkncHNxbCcsICctWCcsICctQScsICctRicsICcsJywgJy1QJywgJ251bGw9X251 bGxfJywKKwknLWQnLCAiJGNvbW1vbl9jb25uc3RyIHVzZXI9c3NsdGVzdHVzZXIgc3NsY2Vy dD1zc2wvY2xpZW50LmNydCBzc2xrZXk9c3NsL2NsaWVudF90bXAua2V5IiwKKwknLWMnLCAi U0VMRUNUICogRlJPTSBwZ19zdGF0X3NzbCBXSEVSRSBwaWQgPSBwZ19iYWNrZW5kX3BpZCgp IgorCQkJIF0sCisJCQkgcXJ7XnBpZCxzc2wsdmVyc2lvbixjaXBoZXIsYml0cyxjb21wcmVz c2lvbixjbGllbnRkblxuCisJCQkJXlxkKyx0LFRMU3ZbXGQuXSssW1x3LV0rLFxkKyxmLC9D Tj1zc2x0ZXN0dXNlciR9bXgsCisJCQkgJ3BnX3N0YXRfc3NsIHdpdGggY2xpZW50IGNlcnRp ZmljYXRlJyk7CisKICMgY2xpZW50IGtleSB3aXRoIHdyb25nIHBlcm1pc3Npb25zCiB0ZXN0 X2Nvbm5lY3RfZmFpbHMoCiAJJGNvbW1vbl9jb25uc3RyLAotLSAKMi4xOS4xCgo= --------------4AA556F5643E4B5DEB7E35AC Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="v2-0003-Fix-pg_stat_ssl.clientdn.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="v2-0003-Fix-pg_stat_ssl.clientdn.patch" RnJvbSAzYzAyZGRhYTMwMWFjN2ZjODJhYzU0ZjQzZjNhNzA2ZmJjODc3YTUxIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlcl9lQGdteC5u ZXQ+CkRhdGU6IE1vbiwgMTUgT2N0IDIwMTggMTU6Mjg6MzAgKzAyMDAKU3ViamVjdDogW1BB VENIIHYyIDMvNF0gRml4IHBnX3N0YXRfc3NsLmNsaWVudGRuCgpSZXR1cm4gbnVsbCBpZiB0 aGVyZSBpcyBubyBjbGllbnQgY2VydGlmaWNhdGUuICBUaGlzIGlzIGhvdyBpdCBoYXMKYWx3 YXlzIGJlZW4gZG9jdW1lbnRlZCwgYnV0IGluIHJlYWxpdHkgaXQgcmV0dXJuZWQgYW4gZW1w dHkgc3RyaW5nLgotLS0KIHNyYy9iYWNrZW5kL3V0aWxzL2FkdC9wZ3N0YXRmdW5jcy5jIHwg NSArKysrLQogc3JjL3Rlc3Qvc3NsL3QvMDAxX3NzbHRlc3RzLnBsICAgICAgfCAyICstCiAy IGZpbGVzIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9zcmMvYmFja2VuZC91dGlscy9hZHQvcGdzdGF0ZnVuY3MuYyBiL3NyYy9iYWNr ZW5kL3V0aWxzL2FkdC9wZ3N0YXRmdW5jcy5jCmluZGV4IGY5NTVmMTkxMmEuLjUxNzhlMTZh MGMgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3V0aWxzL2FkdC9wZ3N0YXRmdW5jcy5jCisr KyBiL3NyYy9iYWNrZW5kL3V0aWxzL2FkdC9wZ3N0YXRmdW5jcy5jCkBAIC02NTIsNyArNjUy LDEwIEBAIHBnX3N0YXRfZ2V0X2FjdGl2aXR5KFBHX0ZVTkNUSU9OX0FSR1MpCiAJCQl2YWx1 ZXNbMjBdID0gQ1N0cmluZ0dldFRleHREYXR1bShiZWVudHJ5LT5zdF9zc2xzdGF0dXMtPnNz bF9jaXBoZXIpOwogCQkJdmFsdWVzWzIxXSA9IEludDMyR2V0RGF0dW0oYmVlbnRyeS0+c3Rf c3Nsc3RhdHVzLT5zc2xfYml0cyk7CiAJCQl2YWx1ZXNbMjJdID0gQm9vbEdldERhdHVtKGJl ZW50cnktPnN0X3NzbHN0YXR1cy0+c3NsX2NvbXByZXNzaW9uKTsKLQkJCXZhbHVlc1syM10g PSBDU3RyaW5nR2V0VGV4dERhdHVtKGJlZW50cnktPnN0X3NzbHN0YXR1cy0+c3NsX2NsaWVu dGRuKTsKKwkJCWlmIChiZWVudHJ5LT5zdF9zc2xzdGF0dXMtPnNzbF9jbGllbnRkblswXSkK KwkJCQl2YWx1ZXNbMjNdID0gQ1N0cmluZ0dldFRleHREYXR1bShiZWVudHJ5LT5zdF9zc2xz dGF0dXMtPnNzbF9jbGllbnRkbik7CisJCQllbHNlCisJCQkJbnVsbHNbMjNdID0gdHJ1ZTsK IAkJfQogCQllbHNlCiAJCXsKZGlmZiAtLWdpdCBhL3NyYy90ZXN0L3NzbC90LzAwMV9zc2x0 ZXN0cy5wbCBiL3NyYy90ZXN0L3NzbC90LzAwMV9zc2x0ZXN0cy5wbAppbmRleCAyYmNiYjFi NDJhLi5mZjdhMjAzMDdmIDEwMDY0NAotLS0gYS9zcmMvdGVzdC9zc2wvdC8wMDFfc3NsdGVz dHMucGwKKysrIGIvc3JjL3Rlc3Qvc3NsL3QvMDAxX3NzbHRlc3RzLnBsCkBAIC0zMTYsNyAr MzE2LDcgQEAKIAknLWMnLCAiU0VMRUNUICogRlJPTSBwZ19zdGF0X3NzbCBXSEVSRSBwaWQg PSBwZ19iYWNrZW5kX3BpZCgpIgogCQkJIF0sCiAJCQkgcXJ7XnBpZCxzc2wsdmVyc2lvbixj aXBoZXIsYml0cyxjb21wcmVzc2lvbixjbGllbnRkblxuCi0JCQkJXlxkKyx0LFRMU3ZbXGQu XSssW1x3LV0rLFxkKyxmLCR9bXgsCisJCQkJXlxkKyx0LFRMU3ZbXGQuXSssW1x3LV0rLFxk KyxmLF9udWxsXyR9bXgsCiAJCQkgJ3BnX3N0YXRfc3NsIHZpZXcgd2l0aG91dCBjbGllbnQg Y2VydGlmaWNhdGUnKTsKIAogIyMjIFNlcnZlci1zaWRlIHRlc3RzLgotLSAKMi4xOS4xCgo= --------------4AA556F5643E4B5DEB7E35AC Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="v2-0004-Add-more-columns-to-pg_stat_ssl.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="v2-0004-Add-more-columns-to-pg_stat_ssl.patch" RnJvbSA3ZGQwMmU2ODQzZjAzNWYzMTJhNmU2NWYxZGM2MjMwMGViNzMwMDI1IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlcl9lQGdteC5u ZXQ+CkRhdGU6IE1vbiwgMTUgT2N0IDIwMTggMTU6Mzk6NTQgKzAyMDAKU3ViamVjdDogW1BB VENIIHYyIDQvNF0gQWRkIG1vcmUgY29sdW1ucyB0byBwZ19zdGF0X3NzbAoKQWRkIGNvbHVt bnMgY2xpZW50c2VyaWFsIGFuZCBpc3N1ZXJkbiB0byBwZ19zdGF0X3NzbC4gIFRoZXNlIGFs bG93CnVuaXF1ZWx5IGlkZW50aWZ5aW5nIHRoZSBjbGllbnQgY2VydGlmaWNhdGUuCi0tLQog ZG9jL3NyYy9zZ21sL21vbml0b3Jpbmcuc2dtbCAgICAgICAgICB8IDE4ICsrKysrKysrKysr KysrKystCiBzcmMvYmFja2VuZC9jYXRhbG9nL3N5c3RlbV92aWV3cy5zcWwgIHwgIDQgKysr LQogc3JjL2JhY2tlbmQvbGlicHEvYmUtc2VjdXJlLW9wZW5zc2wuYyB8IDI5ICsrKysrKysr KysrKysrKysrKysrKysrKysrKwogc3JjL2JhY2tlbmQvcG9zdG1hc3Rlci9wZ3N0YXQuYyAg ICAgICB8ICAyICsrCiBzcmMvYmFja2VuZC91dGlscy9hZHQvcGdzdGF0ZnVuY3MuYyAgIHwg MTggKysrKysrKysrKysrKysrLS0KIHNyYy9pbmNsdWRlL2NhdGFsb2cvcGdfcHJvYy5kYXQg ICAgICAgfCAgNiArKystLS0KIHNyYy9pbmNsdWRlL2xpYnBxL2xpYnBxLWJlLmggICAgICAg ICAgfCAgMiArKwogc3JjL2luY2x1ZGUvcGdzdGF0LmggICAgICAgICAgICAgICAgICB8IDE2 ICsrKysrKysrKysrKy0tLQogc3JjL3Rlc3QvcmVncmVzcy9leHBlY3RlZC9ydWxlcy5vdXQg ICB8IDEwICsrKysrLS0tLQogc3JjL3Rlc3Qvc3NsL3QvMDAxX3NzbHRlc3RzLnBsICAgICAg ICB8ICA4ICsrKystLS0tCiAxMCBmaWxlcyBjaGFuZ2VkLCA5NSBpbnNlcnRpb25zKCspLCAx OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kb2Mvc3JjL3NnbWwvbW9uaXRvcmluZy5z Z21sIGIvZG9jL3NyYy9zZ21sL21vbml0b3Jpbmcuc2dtbAppbmRleCA3YWFkYTE0NDE3Li5i Mzg0NTg5MTEzIDEwMDY0NAotLS0gYS9kb2Mvc3JjL3NnbWwvbW9uaXRvcmluZy5zZ21sCisr KyBiL2RvYy9zcmMvc2dtbC9tb25pdG9yaW5nLnNnbWwKQEAgLTIyMDYsOSArMjIwNiwyNSBA QCA8dGl0bGU+PHN0cnVjdG5hbWU+cGdfc3RhdF9zc2w8L3N0cnVjdG5hbWU+IFZpZXc8L3Rp dGxlPgogICAgICAgdXNlZCwgb3IgTlVMTCBpZiBubyBjbGllbnQgY2VydGlmaWNhdGUgd2Fz IHN1cHBsaWVkIG9yIGlmIFNTTAogICAgICAgaXMgbm90IGluIHVzZSBvbiB0aGlzIGNvbm5l Y3Rpb24uIFRoaXMgZmllbGQgaXMgdHJ1bmNhdGVkIGlmIHRoZQogICAgICAgRE4gZmllbGQg aXMgbG9uZ2VyIHRoYW4gPHN5bWJvbD5OQU1FREFUQUxFTjwvc3ltYm9sPiAoNjQgY2hhcmFj dGVycwotICAgICAgaW4gYSBzdGFuZGFyZCBidWlsZCkKKyAgICAgIGluIGEgc3RhbmRhcmQg YnVpbGQpLgogICAgICA8L2VudHJ5PgogICAgIDwvcm93PgorICAgIDxyb3c+CisgICAgIDxl bnRyeT48c3RydWN0ZmllbGQ+Y2xpZW50c2VyaWFsPC9zdHJ1Y3RmaWVsZD48L2VudHJ5Pgor ICAgICA8ZW50cnk+PHR5cGU+bnVtZXJpYzwvdHlwZT48L2VudHJ5PgorICAgICA8ZW50cnk+ U2VyaWFsIG51bWJlciBvZiB0aGUgY2xpZW50IGNlcnRpZmljYXRlLCBvciBOVUxMIGlmIG5v IGNsaWVudAorICAgICBjZXJ0aWZpY2F0ZSB3YXMgc3VwcGxpZWQgb3IgaWYgU1NMIGlzIG5v dCBpbiB1c2Ugb24gdGhpcyBjb25uZWN0aW9uLiAgVGhlCisgICAgIGNvbWJpbmF0aW9uIG9m IGNlcnRpZmljYXRlIHNlcmlhbCBudW1iZXIgYW5kIGNlcnRpZmljYXRlIGlzc3VlciB1bmlx dWVseQorICAgICBpZGVudGlmaWVzIGEgY2VydGlmaWNhdGUgKHVubGVzcyB0aGUgaXNzdWVy IGVycm9uZW91c2x5IHJldXNlcyBzZXJpYWwKKyAgICAgbnVtYmVycykuPC9lbnRyeT4KKyAg ICA8L3Jvdz4KKyAgICA8cm93PgorICAgICA8ZW50cnk+PHN0cnVjdGZpZWxkPmlzc3VlcmRu PC9zdHJ1Y3RmaWVsZD48L2VudHJ5PgorICAgICA8ZW50cnk+PHR5cGU+dGV4dDwvdHlwZT48 L2VudHJ5PgorICAgICA8ZW50cnk+RE4gb2YgdGhlIGlzc3VlciBvZiB0aGUgY2xpZW50IGNl cnRpZmljYXRlLCBvciBOVUxMIGlmIG5vIGNsaWVudAorICAgICBjZXJ0aWZpY2F0ZSB3YXMg c3VwcGxpZWQgb3IgaWYgU1NMIGlzIG5vdCBpbiB1c2Ugb24gdGhpcyBjb25uZWN0aW9uLgor ICAgICBUaGlzIGZpZWxkIGlzIHRydW5jYXRlZCBsaWtlIDxzdHJ1Y3RmaWVsZD5jbGllbnRk bjwvc3RydWN0ZmllbGQ+LjwvZW50cnk+CisgICAgPC9yb3c+CiAgICA8L3Rib2R5PgogICAg PC90Z3JvdXA+CiAgIDwvdGFibGU+CmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC9jYXRhbG9n L3N5c3RlbV92aWV3cy5zcWwgYi9zcmMvYmFja2VuZC9jYXRhbG9nL3N5c3RlbV92aWV3cy5z cWwKaW5kZXggNzE1OTk1ZGQ4OC4uMzM0MGZjZTJjNiAxMDA2NDQKLS0tIGEvc3JjL2JhY2tl bmQvY2F0YWxvZy9zeXN0ZW1fdmlld3Muc3FsCisrKyBiL3NyYy9iYWNrZW5kL2NhdGFsb2cv c3lzdGVtX3ZpZXdzLnNxbApAQCAtNzgxLDcgKzc4MSw5IEBAIENSRUFURSBWSUVXIHBnX3N0 YXRfc3NsIEFTCiAgICAgICAgICAgICBTLnNzbGNpcGhlciBBUyBjaXBoZXIsCiAgICAgICAg ICAgICBTLnNzbGJpdHMgQVMgYml0cywKICAgICAgICAgICAgIFMuc3NsY29tcHJlc3Npb24g QVMgY29tcHJlc3Npb24sCi0gICAgICAgICAgICBTLnNzbGNsaWVudGRuIEFTIGNsaWVudGRu CisgICAgICAgICAgICBTLnNzbGNsaWVudGRuIEFTIGNsaWVudGRuLAorICAgICAgICAgICAg Uy5zc2xjbGllbnRzZXJpYWwgQVMgY2xpZW50c2VyaWFsLAorICAgICAgICAgICAgUy5zc2xp c3N1ZXJkbiBBUyBpc3N1ZXJkbgogICAgIEZST00gcGdfc3RhdF9nZXRfYWN0aXZpdHkoTlVM TCkgQVMgUzsKIAogQ1JFQVRFIFZJRVcgcGdfcmVwbGljYXRpb25fc2xvdHMgQVMKZGlmZiAt LWdpdCBhL3NyYy9iYWNrZW5kL2xpYnBxL2JlLXNlY3VyZS1vcGVuc3NsLmMgYi9zcmMvYmFj a2VuZC9saWJwcS9iZS1zZWN1cmUtb3BlbnNzbC5jCmluZGV4IDY5NTVkNzIzMGMuLjM3OGE2 M2IyNzkgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL2xpYnBxL2JlLXNlY3VyZS1vcGVuc3Ns LmMKKysrIGIvc3JjL2JhY2tlbmQvbGlicHEvYmUtc2VjdXJlLW9wZW5zc2wuYwpAQCAtMTEx Nyw2ICsxMTE3LDM1IEBAIGJlX3Rsc19nZXRfcGVlcmRuX25hbWUoUG9ydCAqcG9ydCwgY2hh ciAqcHRyLCBzaXplX3QgbGVuKQogCQlwdHJbMF0gPSAnXDAnOwogfQogCit2b2lkCitiZV90 bHNfZ2V0X2lzc3Vlcl9uYW1lKFBvcnQgKnBvcnQsIGNoYXIgKnB0ciwgc2l6ZV90IGxlbikK K3sKKwlpZiAocG9ydC0+cGVlcikKKwkJc3RybGNweShwdHIsIFg1MDlfTkFNRV90b19jc3Ry aW5nKFg1MDlfZ2V0X2lzc3Vlcl9uYW1lKHBvcnQtPnBlZXIpKSwgbGVuKTsKKwllbHNlCisJ CXB0clswXSA9ICdcMCc7Cit9CisKK3ZvaWQKK2JlX3Rsc19nZXRfcGVlcl9zZXJpYWwoUG9y dCAqcG9ydCwgY2hhciAqcHRyLCBzaXplX3QgbGVuKQoreworCWlmIChwb3J0LT5wZWVyKQor CXsKKwkJQVNOMV9JTlRFR0VSICpzZXJpYWw7CisJCUJJR05VTQkgICAqYjsKKwkJY2hhcgkg ICAqZGVjaW1hbDsKKworCQlzZXJpYWwgPSBYNTA5X2dldF9zZXJpYWxOdW1iZXIocG9ydC0+ cGVlcik7CisJCWIgPSBBU04xX0lOVEVHRVJfdG9fQk4oc2VyaWFsLCBOVUxMKTsKKwkJZGVj aW1hbCA9IEJOX2JuMmRlYyhiKTsKKwkJQk5fZnJlZShiKTsKKwkJc3RybGNweShwdHIsIGRl Y2ltYWwsIGxlbik7CisJCU9QRU5TU0xfZnJlZShkZWNpbWFsKTsKKwl9CisJZWxzZQorCQlw dHJbMF0gPSAnXDAnOworfQorCiAjaWZkZWYgSEFWRV9YNTA5X0dFVF9TSUdOQVRVUkVfTklE CiBjaGFyICoKIGJlX3Rsc19nZXRfY2VydGlmaWNhdGVfaGFzaChQb3J0ICpwb3J0LCBzaXpl X3QgKmxlbikKZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIvcGdzdGF0LmMg Yi9zcmMvYmFja2VuZC9wb3N0bWFzdGVyL3Bnc3RhdC5jCmluZGV4IDg2NzYwODhlNTcuLmVh NGIxMDEzOWMgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIvcGdzdGF0LmMK KysrIGIvc3JjL2JhY2tlbmQvcG9zdG1hc3Rlci9wZ3N0YXQuYwpAQCAtMjkwOCw2ICsyOTA4 LDggQEAgcGdzdGF0X2Jlc3RhcnQodm9pZCkKIAkJc3RybGNweShiZWVudHJ5LT5zdF9zc2xz dGF0dXMtPnNzbF92ZXJzaW9uLCBiZV90bHNfZ2V0X3ZlcnNpb24oTXlQcm9jUG9ydCksIE5B TUVEQVRBTEVOKTsKIAkJc3RybGNweShiZWVudHJ5LT5zdF9zc2xzdGF0dXMtPnNzbF9jaXBo ZXIsIGJlX3Rsc19nZXRfY2lwaGVyKE15UHJvY1BvcnQpLCBOQU1FREFUQUxFTik7CiAJCWJl X3Rsc19nZXRfcGVlcmRuX25hbWUoTXlQcm9jUG9ydCwgYmVlbnRyeS0+c3Rfc3Nsc3RhdHVz LT5zc2xfY2xpZW50ZG4sIE5BTUVEQVRBTEVOKTsKKwkJYmVfdGxzX2dldF9wZWVyX3Nlcmlh bChNeVByb2NQb3J0LCBiZWVudHJ5LT5zdF9zc2xzdGF0dXMtPnNzbF9jbGllbnRfc2VyaWFs LCBOQU1FREFUQUxFTik7CisJCWJlX3Rsc19nZXRfaXNzdWVyX25hbWUoTXlQcm9jUG9ydCwg YmVlbnRyeS0+c3Rfc3Nsc3RhdHVzLT5zc2xfaXNzdWVyX2RuLCBOQU1FREFUQUxFTik7CiAJ fQogCWVsc2UKIAl7CmRpZmYgLS1naXQgYS9zcmMvYmFja2VuZC91dGlscy9hZHQvcGdzdGF0 ZnVuY3MuYyBiL3NyYy9iYWNrZW5kL3V0aWxzL2FkdC9wZ3N0YXRmdW5jcy5jCmluZGV4IDUx NzhlMTZhMGMuLmNjMjM1MWQwOWUgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5kL3V0aWxzL2Fk dC9wZ3N0YXRmdW5jcy5jCisrKyBiL3NyYy9iYWNrZW5kL3V0aWxzL2FkdC9wZ3N0YXRmdW5j cy5jCkBAIC01NDEsNyArNTQxLDcgQEAgcGdfc3RhdF9nZXRfcHJvZ3Jlc3NfaW5mbyhQR19G VU5DVElPTl9BUkdTKQogRGF0dW0KIHBnX3N0YXRfZ2V0X2FjdGl2aXR5KFBHX0ZVTkNUSU9O X0FSR1MpCiB7Ci0jZGVmaW5lIFBHX1NUQVRfR0VUX0FDVElWSVRZX0NPTFMJMjQKKyNkZWZp bmUgUEdfU1RBVF9HRVRfQUNUSVZJVFlfQ09MUwkyNgogCWludAkJCW51bV9iYWNrZW5kcyA9 IHBnc3RhdF9mZXRjaF9zdGF0X251bWJhY2tlbmRzKCk7CiAJaW50CQkJY3Vycl9iYWNrZW5k OwogCWludAkJCXBpZCA9IFBHX0FSR0lTTlVMTCgwKSA/IC0xIDogUEdfR0VUQVJHX0lOVDMy KDApOwpAQCAtNjUyLDE1ICs2NTIsMjkgQEAgcGdfc3RhdF9nZXRfYWN0aXZpdHkoUEdfRlVO Q1RJT05fQVJHUykKIAkJCXZhbHVlc1syMF0gPSBDU3RyaW5nR2V0VGV4dERhdHVtKGJlZW50 cnktPnN0X3NzbHN0YXR1cy0+c3NsX2NpcGhlcik7CiAJCQl2YWx1ZXNbMjFdID0gSW50MzJH ZXREYXR1bShiZWVudHJ5LT5zdF9zc2xzdGF0dXMtPnNzbF9iaXRzKTsKIAkJCXZhbHVlc1sy Ml0gPSBCb29sR2V0RGF0dW0oYmVlbnRyeS0+c3Rfc3Nsc3RhdHVzLT5zc2xfY29tcHJlc3Np b24pOworCiAJCQlpZiAoYmVlbnRyeS0+c3Rfc3Nsc3RhdHVzLT5zc2xfY2xpZW50ZG5bMF0p CiAJCQkJdmFsdWVzWzIzXSA9IENTdHJpbmdHZXRUZXh0RGF0dW0oYmVlbnRyeS0+c3Rfc3Ns c3RhdHVzLT5zc2xfY2xpZW50ZG4pOwogCQkJZWxzZQogCQkJCW51bGxzWzIzXSA9IHRydWU7 CisKKwkJCWlmIChiZWVudHJ5LT5zdF9zc2xzdGF0dXMtPnNzbF9jbGllbnRfc2VyaWFsWzBd KQorCQkJCXZhbHVlc1syNF0gPSBEaXJlY3RGdW5jdGlvbkNhbGwzKG51bWVyaWNfaW4sCisJ CQkJCQkJCQkJCQkgQ1N0cmluZ0dldERhdHVtKGJlZW50cnktPnN0X3NzbHN0YXR1cy0+c3Ns X2NsaWVudF9zZXJpYWwpLAorCQkJCQkJCQkJCQkJIE9iamVjdElkR2V0RGF0dW0oSW52YWxp ZE9pZCksCisJCQkJCQkJCQkJCQkgSW50MzJHZXREYXR1bSgtMSkpOworCQkJZWxzZQorCQkJ CW51bGxzWzI0XSA9IHRydWU7CisKKwkJCWlmIChiZWVudHJ5LT5zdF9zc2xzdGF0dXMtPnNz bF9pc3N1ZXJfZG5bMF0pCisJCQkJdmFsdWVzWzI1XSA9IENTdHJpbmdHZXRUZXh0RGF0dW0o YmVlbnRyeS0+c3Rfc3Nsc3RhdHVzLT5zc2xfaXNzdWVyX2RuKTsKKwkJCWVsc2UKKwkJCQlu dWxsc1syNV0gPSB0cnVlOwogCQl9CiAJCWVsc2UKIAkJewogCQkJdmFsdWVzWzE4XSA9IEJv b2xHZXREYXR1bShmYWxzZSk7CS8qIHNzbCAqLwotCQkJbnVsbHNbMTldID0gbnVsbHNbMjBd ID0gbnVsbHNbMjFdID0gbnVsbHNbMjJdID0gbnVsbHNbMjNdID0gdHJ1ZTsKKwkJCW51bGxz WzE5XSA9IG51bGxzWzIwXSA9IG51bGxzWzIxXSA9IG51bGxzWzIyXSA9IG51bGxzWzIzXSA9 IG51bGxzWzI0XSA9IG51bGxzWzI1XSA9IHRydWU7CiAJCX0KIAogCQkvKiBWYWx1ZXMgb25s eSBhdmFpbGFibGUgdG8gcm9sZSBtZW1iZXIgb3IgcGdfcmVhZF9hbGxfc3RhdHMgKi8KZGlm ZiAtLWdpdCBhL3NyYy9pbmNsdWRlL2NhdGFsb2cvcGdfcHJvYy5kYXQgYi9zcmMvaW5jbHVk ZS9jYXRhbG9nL3BnX3Byb2MuZGF0CmluZGV4IDAzNGE0MWViNTUuLjg5YmQzNWViZTQgMTAw NjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL2NhdGFsb2cvcGdfcHJvYy5kYXQKKysrIGIvc3JjL2lu Y2x1ZGUvY2F0YWxvZy9wZ19wcm9jLmRhdApAQCAtNTAwNSw5ICs1MDA1LDkgQEAKICAgcHJv bmFtZSA9PiAncGdfc3RhdF9nZXRfYWN0aXZpdHknLCBwcm9yb3dzID0+ICcxMDAnLCBwcm9p c3N0cmljdCA9PiAnZicsCiAgIHByb3JldHNldCA9PiAndCcsIHByb3ZvbGF0aWxlID0+ICdz JywgcHJvcGFyYWxsZWwgPT4gJ3InLAogICBwcm9yZXR0eXBlID0+ICdyZWNvcmQnLCBwcm9h cmd0eXBlcyA9PiAnaW50NCcsCi0gIHByb2FsbGFyZ3R5cGVzID0+ICd7aW50NCxvaWQsaW50 NCxvaWQsdGV4dCx0ZXh0LHRleHQsdGV4dCx0ZXh0LHRpbWVzdGFtcHR6LHRpbWVzdGFtcHR6 LHRpbWVzdGFtcHR6LHRpbWVzdGFtcHR6LGluZXQsdGV4dCxpbnQ0LHhpZCx4aWQsdGV4dCxi b29sLHRleHQsdGV4dCxpbnQ0LGJvb2wsdGV4dH0nLAotICBwcm9hcmdtb2RlcyA9PiAne2ks byxvLG8sbyxvLG8sbyxvLG8sbyxvLG8sbyxvLG8sbyxvLG8sbyxvLG8sbyxvLG99JywKLSAg cHJvYXJnbmFtZXMgPT4gJ3twaWQsZGF0aWQscGlkLHVzZXN5c2lkLGFwcGxpY2F0aW9uX25h bWUsc3RhdGUscXVlcnksd2FpdF9ldmVudF90eXBlLHdhaXRfZXZlbnQseGFjdF9zdGFydCxx dWVyeV9zdGFydCxiYWNrZW5kX3N0YXJ0LHN0YXRlX2NoYW5nZSxjbGllbnRfYWRkcixjbGll bnRfaG9zdG5hbWUsY2xpZW50X3BvcnQsYmFja2VuZF94aWQsYmFja2VuZF94bWluLGJhY2tl bmRfdHlwZSxzc2wsc3NsdmVyc2lvbixzc2xjaXBoZXIsc3NsYml0cyxzc2xjb21wcmVzc2lv bixzc2xjbGllbnRkbn0nLAorICBwcm9hbGxhcmd0eXBlcyA9PiAne2ludDQsb2lkLGludDQs b2lkLHRleHQsdGV4dCx0ZXh0LHRleHQsdGV4dCx0aW1lc3RhbXB0eix0aW1lc3RhbXB0eix0 aW1lc3RhbXB0eix0aW1lc3RhbXB0eixpbmV0LHRleHQsaW50NCx4aWQseGlkLHRleHQsYm9v bCx0ZXh0LHRleHQsaW50NCxib29sLHRleHQsbnVtZXJpYyx0ZXh0fScsCisgIHByb2FyZ21v ZGVzID0+ICd7aSxvLG8sbyxvLG8sbyxvLG8sbyxvLG8sbyxvLG8sbyxvLG8sbyxvLG8sbyxv LG8sbyxvLG99JywKKyAgcHJvYXJnbmFtZXMgPT4gJ3twaWQsZGF0aWQscGlkLHVzZXN5c2lk LGFwcGxpY2F0aW9uX25hbWUsc3RhdGUscXVlcnksd2FpdF9ldmVudF90eXBlLHdhaXRfZXZl bnQseGFjdF9zdGFydCxxdWVyeV9zdGFydCxiYWNrZW5kX3N0YXJ0LHN0YXRlX2NoYW5nZSxj bGllbnRfYWRkcixjbGllbnRfaG9zdG5hbWUsY2xpZW50X3BvcnQsYmFja2VuZF94aWQsYmFj a2VuZF94bWluLGJhY2tlbmRfdHlwZSxzc2wsc3NsdmVyc2lvbixzc2xjaXBoZXIsc3NsYml0 cyxzc2xjb21wcmVzc2lvbixzc2xjbGllbnRkbixzc2xjbGllbnRzZXJpYWwsc3NsaXNzdWVy ZG59JywKICAgcHJvc3JjID0+ICdwZ19zdGF0X2dldF9hY3Rpdml0eScgfSwKIHsgb2lkID0+ ICczMzE4JywKICAgZGVzY3IgPT4gJ3N0YXRpc3RpY3M6IGluZm9ybWF0aW9uIGFib3V0IHBy b2dyZXNzIG9mIGJhY2tlbmRzIHJ1bm5pbmcgbWFpbnRlbmFuY2UgY29tbWFuZCcsCmRpZmYg LS1naXQgYS9zcmMvaW5jbHVkZS9saWJwcS9saWJwcS1iZS5oIGIvc3JjL2luY2x1ZGUvbGli cHEvbGlicHEtYmUuaAppbmRleCBiMmM1OWRmNTRlLi42ZTU5OWU5ZmNmIDEwMDY0NAotLS0g YS9zcmMvaW5jbHVkZS9saWJwcS9saWJwcS1iZS5oCisrKyBiL3NyYy9pbmNsdWRlL2xpYnBx L2xpYnBxLWJlLmgKQEAgLTI1OSw2ICsyNTksOCBAQCBleHRlcm4gYm9vbCBiZV90bHNfZ2V0 X2NvbXByZXNzaW9uKFBvcnQgKnBvcnQpOwogZXh0ZXJuIGNvbnN0IGNoYXIgKmJlX3Rsc19n ZXRfdmVyc2lvbihQb3J0ICpwb3J0KTsKIGV4dGVybiBjb25zdCBjaGFyICpiZV90bHNfZ2V0 X2NpcGhlcihQb3J0ICpwb3J0KTsKIGV4dGVybiB2b2lkIGJlX3Rsc19nZXRfcGVlcmRuX25h bWUoUG9ydCAqcG9ydCwgY2hhciAqcHRyLCBzaXplX3QgbGVuKTsKK2V4dGVybiB2b2lkIGJl X3Rsc19nZXRfaXNzdWVyX25hbWUoUG9ydCAqcG9ydCwgY2hhciAqcHRyLCBzaXplX3QgbGVu KTsKK2V4dGVybiB2b2lkIGJlX3Rsc19nZXRfcGVlcl9zZXJpYWwoUG9ydCAqcG9ydCwgY2hh ciAqcHRyLCBzaXplX3QgbGVuKTsKIAogLyoKICAqIEdldCB0aGUgc2VydmVyIGNlcnRpZmlj YXRlIGhhc2ggZm9yIFNDUkFNIGNoYW5uZWwgYmluZGluZyB0eXBlCmRpZmYgLS1naXQgYS9z cmMvaW5jbHVkZS9wZ3N0YXQuaCBiL3NyYy9pbmNsdWRlL3Bnc3RhdC5oCmluZGV4IGYxYzEw ZDE2YjguLjgzODIzYTRjZWMgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL3Bnc3RhdC5oCisr KyBiL3NyYy9pbmNsdWRlL3Bnc3RhdC5oCkBAIC05NTAsMTUgKzk1MCwyNSBAQCB0eXBlZGVm IGVudW0gUHJvZ3Jlc3NDb21tYW5kVHlwZQogICoKICAqIEZvciBlYWNoIGJhY2tlbmQsIHdl IGtlZXAgdGhlIFNTTCBzdGF0dXMgaW4gYSBzZXBhcmF0ZSBzdHJ1Y3QsIHRoYXQKICAqIGlz IG9ubHkgZmlsbGVkIGluIGlmIFNTTCBpcyBlbmFibGVkLgorICoKKyAqIEFsbCBjaGFyIGFy cmF5cyBtdXN0IGJlIG51bGwtdGVybWluYXRlZC4KICAqLwogdHlwZWRlZiBzdHJ1Y3QgUGdC YWNrZW5kU1NMU3RhdHVzCiB7CiAJLyogSW5mb3JtYXRpb24gYWJvdXQgU1NMIGNvbm5lY3Rp b24gKi8KIAlpbnQJCQlzc2xfYml0czsKIAlib29sCQlzc2xfY29tcHJlc3Npb247Ci0JY2hh cgkJc3NsX3ZlcnNpb25bTkFNRURBVEFMRU5dOwkvKiBNVVNUIGJlIG51bGwtdGVybWluYXRl ZCAqLwotCWNoYXIJCXNzbF9jaXBoZXJbTkFNRURBVEFMRU5dOwkvKiBNVVNUIGJlIG51bGwt dGVybWluYXRlZCAqLwotCWNoYXIJCXNzbF9jbGllbnRkbltOQU1FREFUQUxFTl07CS8qIE1V U1QgYmUgbnVsbC10ZXJtaW5hdGVkICovCisJY2hhcgkJc3NsX3ZlcnNpb25bTkFNRURBVEFM RU5dOworCWNoYXIJCXNzbF9jaXBoZXJbTkFNRURBVEFMRU5dOworCWNoYXIJCXNzbF9jbGll bnRkbltOQU1FREFUQUxFTl07CisKKwkvKgorCSAqIHNlcmlhbCBudW1iZXIgaXMgbWF4ICIy MCBvY3RldHMiIHBlciBSRkMgNTI4MCwgc28gdGhpcyBzaXplIHNob3VsZCBiZQorCSAqIGZp bmUKKwkgKi8KKwljaGFyCQlzc2xfY2xpZW50X3NlcmlhbFtOQU1FREFUQUxFTl07CisKKwlj aGFyCQlzc2xfaXNzdWVyX2RuW05BTUVEQVRBTEVOXTsKIH0gUGdCYWNrZW5kU1NMU3RhdHVz OwogCiAKZGlmZiAtLWdpdCBhL3NyYy90ZXN0L3JlZ3Jlc3MvZXhwZWN0ZWQvcnVsZXMub3V0 IGIvc3JjL3Rlc3QvcmVncmVzcy9leHBlY3RlZC9ydWxlcy5vdXQKaW5kZXggNzM1ZGQzN2Fj Zi4uMGRmOGJkZmQ1NSAxMDA2NDQKLS0tIGEvc3JjL3Rlc3QvcmVncmVzcy9leHBlY3RlZC9y dWxlcy5vdXQKKysrIGIvc3JjL3Rlc3QvcmVncmVzcy9leHBlY3RlZC9ydWxlcy5vdXQKQEAg LTE3MzEsNyArMTczMSw3IEBAIHBnX3N0YXRfYWN0aXZpdHl8IFNFTEVDVCBzLmRhdGlkLAog ICAgIHMuYmFja2VuZF94bWluLAogICAgIHMucXVlcnksCiAgICAgcy5iYWNrZW5kX3R5cGUK LSAgIEZST00gKChwZ19zdGF0X2dldF9hY3Rpdml0eShOVUxMOjppbnRlZ2VyKSBzKGRhdGlk LCBwaWQsIHVzZXN5c2lkLCBhcHBsaWNhdGlvbl9uYW1lLCBzdGF0ZSwgcXVlcnksIHdhaXRf ZXZlbnRfdHlwZSwgd2FpdF9ldmVudCwgeGFjdF9zdGFydCwgcXVlcnlfc3RhcnQsIGJhY2tl bmRfc3RhcnQsIHN0YXRlX2NoYW5nZSwgY2xpZW50X2FkZHIsIGNsaWVudF9ob3N0bmFtZSwg Y2xpZW50X3BvcnQsIGJhY2tlbmRfeGlkLCBiYWNrZW5kX3htaW4sIGJhY2tlbmRfdHlwZSwg c3NsLCBzc2x2ZXJzaW9uLCBzc2xjaXBoZXIsIHNzbGJpdHMsIHNzbGNvbXByZXNzaW9uLCBz c2xjbGllbnRkbikKKyAgIEZST00gKChwZ19zdGF0X2dldF9hY3Rpdml0eShOVUxMOjppbnRl Z2VyKSBzKGRhdGlkLCBwaWQsIHVzZXN5c2lkLCBhcHBsaWNhdGlvbl9uYW1lLCBzdGF0ZSwg cXVlcnksIHdhaXRfZXZlbnRfdHlwZSwgd2FpdF9ldmVudCwgeGFjdF9zdGFydCwgcXVlcnlf c3RhcnQsIGJhY2tlbmRfc3RhcnQsIHN0YXRlX2NoYW5nZSwgY2xpZW50X2FkZHIsIGNsaWVu dF9ob3N0bmFtZSwgY2xpZW50X3BvcnQsIGJhY2tlbmRfeGlkLCBiYWNrZW5kX3htaW4sIGJh Y2tlbmRfdHlwZSwgc3NsLCBzc2x2ZXJzaW9uLCBzc2xjaXBoZXIsIHNzbGJpdHMsIHNzbGNv bXByZXNzaW9uLCBzc2xjbGllbnRkbiwgc3NsY2xpZW50c2VyaWFsLCBzc2xpc3N1ZXJkbikK ICAgICAgTEVGVCBKT0lOIHBnX2RhdGFiYXNlIGQgT04gKChzLmRhdGlkID0gZC5vaWQpKSkK ICAgICAgTEVGVCBKT0lOIHBnX2F1dGhpZCB1IE9OICgocy51c2VzeXNpZCA9IHUub2lkKSkp OwogcGdfc3RhdF9hbGxfaW5kZXhlc3wgU0VMRUNUIGMub2lkIEFTIHJlbGlkLApAQCAtMTg2 Miw3ICsxODYyLDcgQEAgcGdfc3RhdF9yZXBsaWNhdGlvbnwgU0VMRUNUIHMucGlkLAogICAg IHcucmVwbGF5X2xhZywKICAgICB3LnN5bmNfcHJpb3JpdHksCiAgICAgdy5zeW5jX3N0YXRl Ci0gICBGUk9NICgocGdfc3RhdF9nZXRfYWN0aXZpdHkoTlVMTDo6aW50ZWdlcikgcyhkYXRp ZCwgcGlkLCB1c2VzeXNpZCwgYXBwbGljYXRpb25fbmFtZSwgc3RhdGUsIHF1ZXJ5LCB3YWl0 X2V2ZW50X3R5cGUsIHdhaXRfZXZlbnQsIHhhY3Rfc3RhcnQsIHF1ZXJ5X3N0YXJ0LCBiYWNr ZW5kX3N0YXJ0LCBzdGF0ZV9jaGFuZ2UsIGNsaWVudF9hZGRyLCBjbGllbnRfaG9zdG5hbWUs IGNsaWVudF9wb3J0LCBiYWNrZW5kX3hpZCwgYmFja2VuZF94bWluLCBiYWNrZW5kX3R5cGUs IHNzbCwgc3NsdmVyc2lvbiwgc3NsY2lwaGVyLCBzc2xiaXRzLCBzc2xjb21wcmVzc2lvbiwg c3NsY2xpZW50ZG4pCisgICBGUk9NICgocGdfc3RhdF9nZXRfYWN0aXZpdHkoTlVMTDo6aW50 ZWdlcikgcyhkYXRpZCwgcGlkLCB1c2VzeXNpZCwgYXBwbGljYXRpb25fbmFtZSwgc3RhdGUs IHF1ZXJ5LCB3YWl0X2V2ZW50X3R5cGUsIHdhaXRfZXZlbnQsIHhhY3Rfc3RhcnQsIHF1ZXJ5 X3N0YXJ0LCBiYWNrZW5kX3N0YXJ0LCBzdGF0ZV9jaGFuZ2UsIGNsaWVudF9hZGRyLCBjbGll bnRfaG9zdG5hbWUsIGNsaWVudF9wb3J0LCBiYWNrZW5kX3hpZCwgYmFja2VuZF94bWluLCBi YWNrZW5kX3R5cGUsIHNzbCwgc3NsdmVyc2lvbiwgc3NsY2lwaGVyLCBzc2xiaXRzLCBzc2xj b21wcmVzc2lvbiwgc3NsY2xpZW50ZG4sIHNzbGNsaWVudHNlcmlhbCwgc3NsaXNzdWVyZG4p CiAgICAgIEpPSU4gcGdfc3RhdF9nZXRfd2FsX3NlbmRlcnMoKSB3KHBpZCwgc3RhdGUsIHNl bnRfbHNuLCB3cml0ZV9sc24sIGZsdXNoX2xzbiwgcmVwbGF5X2xzbiwgd3JpdGVfbGFnLCBm bHVzaF9sYWcsIHJlcGxheV9sYWcsIHN5bmNfcHJpb3JpdHksIHN5bmNfc3RhdGUpIE9OICgo cy5waWQgPSB3LnBpZCkpKQogICAgICBMRUZUIEpPSU4gcGdfYXV0aGlkIHUgT04gKChzLnVz ZXN5c2lkID0gdS5vaWQpKSk7CiBwZ19zdGF0X3NzbHwgU0VMRUNUIHMucGlkLApAQCAtMTg3 MSw4ICsxODcxLDEwIEBAIHBnX3N0YXRfc3NsfCBTRUxFQ1Qgcy5waWQsCiAgICAgcy5zc2xj aXBoZXIgQVMgY2lwaGVyLAogICAgIHMuc3NsYml0cyBBUyBiaXRzLAogICAgIHMuc3NsY29t cHJlc3Npb24gQVMgY29tcHJlc3Npb24sCi0gICAgcy5zc2xjbGllbnRkbiBBUyBjbGllbnRk bgotICAgRlJPTSBwZ19zdGF0X2dldF9hY3Rpdml0eShOVUxMOjppbnRlZ2VyKSBzKGRhdGlk LCBwaWQsIHVzZXN5c2lkLCBhcHBsaWNhdGlvbl9uYW1lLCBzdGF0ZSwgcXVlcnksIHdhaXRf ZXZlbnRfdHlwZSwgd2FpdF9ldmVudCwgeGFjdF9zdGFydCwgcXVlcnlfc3RhcnQsIGJhY2tl bmRfc3RhcnQsIHN0YXRlX2NoYW5nZSwgY2xpZW50X2FkZHIsIGNsaWVudF9ob3N0bmFtZSwg Y2xpZW50X3BvcnQsIGJhY2tlbmRfeGlkLCBiYWNrZW5kX3htaW4sIGJhY2tlbmRfdHlwZSwg c3NsLCBzc2x2ZXJzaW9uLCBzc2xjaXBoZXIsIHNzbGJpdHMsIHNzbGNvbXByZXNzaW9uLCBz c2xjbGllbnRkbik7CisgICAgcy5zc2xjbGllbnRkbiBBUyBjbGllbnRkbiwKKyAgICBzLnNz bGNsaWVudHNlcmlhbCBBUyBjbGllbnRzZXJpYWwsCisgICAgcy5zc2xpc3N1ZXJkbiBBUyBp c3N1ZXJkbgorICAgRlJPTSBwZ19zdGF0X2dldF9hY3Rpdml0eShOVUxMOjppbnRlZ2VyKSBz KGRhdGlkLCBwaWQsIHVzZXN5c2lkLCBhcHBsaWNhdGlvbl9uYW1lLCBzdGF0ZSwgcXVlcnks IHdhaXRfZXZlbnRfdHlwZSwgd2FpdF9ldmVudCwgeGFjdF9zdGFydCwgcXVlcnlfc3RhcnQs IGJhY2tlbmRfc3RhcnQsIHN0YXRlX2NoYW5nZSwgY2xpZW50X2FkZHIsIGNsaWVudF9ob3N0 bmFtZSwgY2xpZW50X3BvcnQsIGJhY2tlbmRfeGlkLCBiYWNrZW5kX3htaW4sIGJhY2tlbmRf dHlwZSwgc3NsLCBzc2x2ZXJzaW9uLCBzc2xjaXBoZXIsIHNzbGJpdHMsIHNzbGNvbXByZXNz aW9uLCBzc2xjbGllbnRkbiwgc3NsY2xpZW50c2VyaWFsLCBzc2xpc3N1ZXJkbik7CiBwZ19z dGF0X3N1YnNjcmlwdGlvbnwgU0VMRUNUIHN1Lm9pZCBBUyBzdWJpZCwKICAgICBzdS5zdWJu YW1lLAogICAgIHN0LnBpZCwKZGlmZiAtLWdpdCBhL3NyYy90ZXN0L3NzbC90LzAwMV9zc2x0 ZXN0cy5wbCBiL3NyYy90ZXN0L3NzbC90LzAwMV9zc2x0ZXN0cy5wbAppbmRleCBmZjdhMjAz MDdmLi5lYzcwNzNmMzQwIDEwMDY0NAotLS0gYS9zcmMvdGVzdC9zc2wvdC8wMDFfc3NsdGVz dHMucGwKKysrIGIvc3JjL3Rlc3Qvc3NsL3QvMDAxX3NzbHRlc3RzLnBsCkBAIC0zMTUsOCAr MzE1LDggQEAKIAknLWQnLCAkY29tbW9uX2Nvbm5zdHIsCiAJJy1jJywgIlNFTEVDVCAqIEZS T00gcGdfc3RhdF9zc2wgV0hFUkUgcGlkID0gcGdfYmFja2VuZF9waWQoKSIKIAkJCSBdLAot CQkJIHFye15waWQsc3NsLHZlcnNpb24sY2lwaGVyLGJpdHMsY29tcHJlc3Npb24sY2xpZW50 ZG5cbgotCQkJCV5cZCssdCxUTFN2W1xkLl0rLFtcdy1dKyxcZCssZixfbnVsbF8kfW14LAor CQkJIHFye15waWQsc3NsLHZlcnNpb24sY2lwaGVyLGJpdHMsY29tcHJlc3Npb24sY2xpZW50 ZG4sY2xpZW50c2VyaWFsLGlzc3VlcmRuXG4KKwkJCQleXGQrLHQsVExTdltcZC5dKyxbXHct XSssXGQrLGYsX251bGxfLF9udWxsXyxfbnVsbF8kfW14LAogCQkJICdwZ19zdGF0X3NzbCB2 aWV3IHdpdGhvdXQgY2xpZW50IGNlcnRpZmljYXRlJyk7CiAKICMjIyBTZXJ2ZXItc2lkZSB0 ZXN0cy4KQEAgLTM0Nyw4ICszNDcsOCBAQAogCSctZCcsICIkY29tbW9uX2Nvbm5zdHIgdXNl cj1zc2x0ZXN0dXNlciBzc2xjZXJ0PXNzbC9jbGllbnQuY3J0IHNzbGtleT1zc2wvY2xpZW50 X3RtcC5rZXkiLAogCSctYycsICJTRUxFQ1QgKiBGUk9NIHBnX3N0YXRfc3NsIFdIRVJFIHBp ZCA9IHBnX2JhY2tlbmRfcGlkKCkiCiAJCQkgXSwKLQkJCSBxcntecGlkLHNzbCx2ZXJzaW9u LGNpcGhlcixiaXRzLGNvbXByZXNzaW9uLGNsaWVudGRuXG4KLQkJCQleXGQrLHQsVExTdltc ZC5dKyxbXHctXSssXGQrLGYsL0NOPXNzbHRlc3R1c2VyJH1teCwKKwkJCSBxcntecGlkLHNz bCx2ZXJzaW9uLGNpcGhlcixiaXRzLGNvbXByZXNzaW9uLGNsaWVudGRuLGNsaWVudHNlcmlh bCxpc3N1ZXJkblxuCisJCQkJXlxkKyx0LFRMU3ZbXGQuXSssW1x3LV0rLFxkKyxmLC9DTj1z c2x0ZXN0dXNlciwxLFxRL0NOPVRlc3QgQ0EgZm9yIFBvc3RncmVTUUwgU1NMIHJlZ3Jlc3Np b24gdGVzdCBjbGllbnQgY2VydHNcRSR9bXgsCiAJCQkgJ3BnX3N0YXRfc3NsIHdpdGggY2xp ZW50IGNlcnRpZmljYXRlJyk7CiAKICMgY2xpZW50IGtleSB3aXRoIHdyb25nIHBlcm1pc3Np b25zCi0tIAoyLjE5LjEKCg== --------------4AA556F5643E4B5DEB7E35AC--