Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rfnuf-002Opv-DW for pgsql-hackers@arkaria.postgresql.org; Thu, 29 Feb 2024 21:25:58 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1rfnud-008jlX-Us for pgsql-hackers@arkaria.postgresql.org; Thu, 29 Feb 2024 21:25:56 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rfnud-008jlP-4w for pgsql-hackers@lists.postgresql.org; Thu, 29 Feb 2024 21:25:56 +0000 Received: from meesny.iki.fi ([195.140.195.201]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rfnuW-002DXp-06 for pgsql-hackers@postgresql.org; Thu, 29 Feb 2024 21:25:54 +0000 Received: from [172.20.6.221] (unknown [178.134.136.147]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: hlinnaka) by meesny.iki.fi (Postfix) with ESMTPSA id 4Tm45P158QzyPp for ; Thu, 29 Feb 2024 23:25:44 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=meesny; t=1709241945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=Aj8xV0r2uGHAFBoT9Zf8BZQok0xfZAu1XRIwQ102ebA=; b=o2MIcdOvUZQQoabd2zRLRj4+r/6s43o0DQtwecBJ1qdYaE2m6Rh2r4N2M7UQY0lafVp4K5 PWtoa2pw20Ya5VfPIloBdkrfDXXKGiyxUlCnY+7O1LJnC/JEcqwIwfor4pNWEKqGpRO2sW rleOoWJsjTYsYp40mibMxpDFMkQih+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=meesny; t=1709241945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=Aj8xV0r2uGHAFBoT9Zf8BZQok0xfZAu1XRIwQ102ebA=; b=Fg3JsrjkjPs8e6RrJP7MxwtDSun0eBla8zRxrn5TsD+6XRMX1+To6Vm3udrhWqlGuHaq+C 9myNSrRZC0uQ4KQPBShmYZLfm+J64hlTES/+PEb8UtG3TBarZr/yQcNaz5q+KhrY6vaDig w7Hkim/IgbyVNqvsjNar72OCO5IMq4I= ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=hlinnaka smtp.mailfrom=hlinnaka@iki.fi ARC-Seal: i=1; s=meesny; d=iki.fi; t=1709241945; a=rsa-sha256; cv=none; b=GMVMuL0C1M8b4CwHlU50Sxk46GsnM5bPh4tIOuoa0UfvWQIQklPUVKwIJYSOTVQYz6fkPJ fG3fbVW47HGysENCt4pjANB+WDqpGVqAwIopVzugX29blEBEcDkqiDv5ktKdL/QXa6maC6 0Wb/CTL1YPF3x5DX7tsq8H3hsonvPlA= Content-Type: multipart/mixed; boundary="------------kS0yn1i60V10fYafsNw0t0Qb" Message-ID: <508d0505-8b7a-4864-a681-e7e5edfe32aa@iki.fi> Date: Thu, 29 Feb 2024 23:25:43 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Heikki Linnakangas Subject: Make query cancellation keys longer To: pgsql-hackers List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------kS0yn1i60V10fYafsNw0t0Qb Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Currently, cancel request key is a 32-bit token, which isn't very much entropy. If you want to cancel another session's query, you can brute-force it. In most environments, an unauthorized cancellation of a query isn't very serious, but it nevertheless would be nice to have more protection from it. The attached patch makes it longer. It is an optional protocol feature, so it's fully backwards-compatible with clients that don't support longer keys. If the client requests the "_pq_.extended_query_cancel" protocol feature, the server will generate a longer 256-bit cancellation key. However, the new longer key length is no longer hardcoded in the protocol. The client is expected to deal with variable length keys, up to some reasonable upper limit (TODO: document the maximum). This flexibility allows e.g. a connection pooler to add more information to the cancel key, which could be useful. If the client doesn't request the protocol feature, the server generates a 32-bit key like before. One complication with this was that because we no longer know how long the key should be, 4-bytes or something longer, until the backend has performed the protocol negotiation, we cannot generate the key in the postmaster before forking the process anymore. The first patch here changes things so that the cancellation key is generated later, in the backend, and the backend advertises the key in the PMSignalState array. This is similar to how this has always worked in EXEC_BACKEND mode with the ShmemBackendArray, but instead of having a separate array, I added fields to the PMSignalState slots. This removes a bunch of EXEC_BACKEND-specific code, which is nice. Any thoughts on this? Documentation is still missing, and there's one TODO on adding a portable time-constant memcmp() function; I'll add those if there's agreement on this otherwise. -- Heikki Linnakangas Neon (https://neon.tech) --------------kS0yn1i60V10fYafsNw0t0Qb Content-Type: text/x-patch; charset=UTF-8; name="0001-Move-cancel-key-generation-to-after-forking-the-back.patch" Content-Disposition: attachment; filename*0="0001-Move-cancel-key-generation-to-after-forking-the-back.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBmODcxZTkxNWZlZTA4YjNjYzI3ZTczMjY0NmYzYTYyZWMxYzMwMjRiIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBIZWlra2kgTGlubmFrYW5nYXMgPGhlaWtraS5saW5u YWthbmdhc0Bpa2kuZmk+CkRhdGU6IFRodSwgMjkgRmViIDIwMjQgMjM6MjA6NTIgKzAyMDAK U3ViamVjdDogW1BBVENIIDEvMl0gTW92ZSBjYW5jZWwga2V5IGdlbmVyYXRpb24gdG8gYWZ0 ZXIgZm9ya2luZyB0aGUgYmFja2VuZAoKTW92ZSByZXNwb25zaWJpbGl0eSBvZiBnZW5lcmF0 aW5nIHRoZSBjYW5jZWwga2V5IHRvIHRoZSBiYWNrZW5kCnByb2Nlc3MuIFRoZSBjYW5jZWwg a2V5IGlzIG5vdyBnZW5lcmF0ZWQgYWZ0ZXIgZm9ya2luZywgYW5kIHRoZQpiYWNrZW5kIGFk dmVydGlzZXMgaXQgaW4gdGhlIFBNU2lnbmFsU3RhdGUgYXJyYXkuIFdoZW4gYSBjYW5jZWwK cmVxdWVzdCBhcnJpdmVzLCB0aGUgYmFja2VuZCBoYW5kbGluZyBpdCBzY2FucyB0aGUgUE1T aWduYWxTdGF0ZSBhcnJheQp0byBmaW5kIHRoZSB0YXJnZXQgcGlkIGFuZCBjYW5jZWwga2V5 LiBUaGlzIGlzIHNpbWlsYXIgdG8gaG93IHRoaXMKcHJldmlvdXNseSB3b3JrZWQgaW4gdGhl IEVYRUNfQkFDS0VORCBjYXNlIHdpdGggdGhlIFNobWVtQmFja2VuZEFycmF5LApidXQgaW5z dGVhZCBvZiBoYXZpbmcgdGhlIHNlcGFyYXRlIGFycmF5LCB3ZSBzdG9yZSB0aGUgY2FuY2Vs IGtleXMgaW4KUE1TaWduYWxTdGF0ZSBhcnJheSwgYW5kIHVzZSBpdCBhbHNvIGluIHRoZSAh RVhFQ19CQUNLRU5EIGNhc2UuCgpXaGlsZSB3ZSdyZSBhdCBpdCwgc3dpdGNoIHRvIHVzaW5n IGF0b21pY3MgaW4gcG1zaWduYWwuYyBmb3IgdGhlIHN0YXRlCmZpZWxkLiBUaGF0IGZlZWxz IGVhc2llciB0byByZWFzb24gYWJvdXQgdGhhbiB2b2xhdGlsZQpwb2ludGVycy4gKFRPRE86 IGFsc28gc3dpdGNoIHRvIHBnX2F0b21pY19mbGFnIGZvciBQTVNpZ25hbEZsYWdzCmFycmF5 LiBXZWlyZGx5IHdlIGRvbid0IGhhdmUgInBnX2F0b21pY190ZXN0X2NsZWFyX2ZsYWciIG5v cgoicGdfYXRvbWljX3NldF9mbGFnIi4gVGhvc2Ugd291bGQgYmUgdGhlIG5hdHVyYWwgb3Bl cnRpb25zIGZvcgpQTVNpZ25hbEZsYWdzLiBNYXliZSB3ZSBzaG91bGQgYWRkIHRob3NlLCBi dXQgSSBkaWRuJ3Qgd2FudCB0byBnbyB0aGF0CmRlZXAgZG93biB0aGUgcmFiYml0IGhvbGUg aW4gdGhpcyBwYXRjaC4pCgpUaGlzIGlzIG5lZWRlZCBieSB0aGUgbmV4dCBwYXRjaCwgc28g dGhhdCB3ZSBjYW4gZ2VuZXJhdGUgdGhlIGNhbmNlbAprZXkgbGF0ZXIsIGFmdGVyIG5lZ290 aWF0aW5nIHRoZSBwcm90b2NvbCB2ZXJzaW9uIHdpdGggdGhlIGNsaWVudC4KLS0tCiBzcmMv YmFja2VuZC9wb3N0bWFzdGVyL3Bvc3RtYXN0ZXIuYyB8IDE4NSArLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tCiBzcmMvYmFja2VuZC9zdG9yYWdlL2lwYy9pcGNpLmMgICAgICB8ICAx MSAtLQogc3JjL2JhY2tlbmQvc3RvcmFnZS9pcGMvcG1zaWduYWwuYyAgfCAxMjQgKysrKysr KysrKysrKystLS0tLQogc3JjL2JhY2tlbmQvc3RvcmFnZS9sbWdyL3Byb2MuYyAgICAgfCAg MTYgKystCiBzcmMvaW5jbHVkZS9wb3N0bWFzdGVyL3Bvc3RtYXN0ZXIuaCB8ICAgMyAtCiBz cmMvaW5jbHVkZS9zdG9yYWdlL3Btc2lnbmFsLmggICAgICB8ICAgMyArLQogc3JjL3Rvb2xz L3BnaW5kZW50L3R5cGVkZWZzLmxpc3QgICAgfCAgIDEgKwogNyBmaWxlcyBjaGFuZ2VkLCAx MTYgaW5zZXJ0aW9ucygrKSwgMjI3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9i YWNrZW5kL3Bvc3RtYXN0ZXIvcG9zdG1hc3Rlci5jIGIvc3JjL2JhY2tlbmQvcG9zdG1hc3Rl ci9wb3N0bWFzdGVyLmMKaW5kZXggZGEwYzYyNzEwN2UuLjQwOGY4ZmI5YjZkIDEwMDY0NAot LS0gYS9zcmMvYmFja2VuZC9wb3N0bWFzdGVyL3Bvc3RtYXN0ZXIuYworKysgYi9zcmMvYmFj a2VuZC9wb3N0bWFzdGVyL3Bvc3RtYXN0ZXIuYwpAQCAtMTc3LDcgKzE3Nyw2IEBACiB0eXBl ZGVmIHN0cnVjdCBia2VuZAogewogCXBpZF90CQlwaWQ7CQkJLyogcHJvY2VzcyBpZCBvZiBi YWNrZW5kICovCi0JaW50MzIJCWNhbmNlbF9rZXk7CQkvKiBjYW5jZWwga2V5IGZvciBjYW5j ZWxzIGZvciB0aGlzIGJhY2tlbmQgKi8KIAlpbnQJCQljaGlsZF9zbG90OwkJLyogUE1DaGls ZFNsb3QgZm9yIHRoaXMgYmFja2VuZCwgaWYgYW55ICovCiAJaW50CQkJYmtlbmRfdHlwZTsJ CS8qIGNoaWxkIHByb2Nlc3MgZmxhdm9yLCBzZWUgYWJvdmUgKi8KIAlib29sCQlkZWFkX2Vu ZDsJCS8qIGlzIGl0IGdvaW5nIHRvIHNlbmQgYW4gZXJyb3IgYW5kIHF1aXQ/ICovCkBAIC0x ODcsMTAgKzE4Niw2IEBAIHR5cGVkZWYgc3RydWN0IGJrZW5kCiAKIHN0YXRpYyBkbGlzdF9o ZWFkIEJhY2tlbmRMaXN0ID0gRExJU1RfU1RBVElDX0lOSVQoQmFja2VuZExpc3QpOwogCi0j aWZkZWYgRVhFQ19CQUNLRU5ECi1zdGF0aWMgQmFja2VuZCAqU2htZW1CYWNrZW5kQXJyYXk7 Ci0jZW5kaWYKLQogQmFja2dyb3VuZFdvcmtlciAqTXlCZ3dvcmtlckVudHJ5ID0gTlVMTDsK IAogCkBAIC00MzAsNyArNDI1LDYgQEAgc3RhdGljIHZvaWQgU2VuZE5lZ290aWF0ZVByb3Rv Y29sVmVyc2lvbihMaXN0ICp1bnJlY29nbml6ZWRfcHJvdG9jb2xfb3B0aW9ucyk7CiBzdGF0 aWMgdm9pZCBwcm9jZXNzQ2FuY2VsUmVxdWVzdChQb3J0ICpwb3J0LCB2b2lkICpwa3QpOwog c3RhdGljIHZvaWQgcmVwb3J0X2ZvcmtfZmFpbHVyZV90b19jbGllbnQoUG9ydCAqcG9ydCwg aW50IGVycm51bSk7CiBzdGF0aWMgQ0FDX3N0YXRlIGNhbkFjY2VwdENvbm5lY3Rpb25zKGlu dCBiYWNrZW5kX3R5cGUpOwotc3RhdGljIGJvb2wgUmFuZG9tQ2FuY2VsS2V5KGludDMyICpj YW5jZWxfa2V5KTsKIHN0YXRpYyB2b2lkIHNpZ25hbF9jaGlsZChwaWRfdCBwaWQsIGludCBz aWduYWwpOwogc3RhdGljIHZvaWQgc2lncXVpdF9jaGlsZChwaWRfdCBwaWQpOwogc3RhdGlj IGJvb2wgU2lnbmFsU29tZUNoaWxkcmVuKGludCBzaWduYWwsIGludCB0YXJnZXQpOwpAQCAt NTE3LDcgKzUxMSw2IEBAIHR5cGVkZWYgc3RydWN0CiAjZW5kaWYKIAl2b2lkCSAgICpVc2Vk U2htZW1TZWdBZGRyOwogCXNsb2NrX3QgICAgKlNobWVtTG9jazsKLQlCYWNrZW5kICAgICpT aG1lbUJhY2tlbmRBcnJheTsKICNpZm5kZWYgSEFWRV9TUElOTE9DS1MKIAlQR1NlbWFwaG9y ZSAqU3BpbmxvY2tTZW1hQXJyYXk7CiAjZW5kaWYKQEAgLTU1OSw5ICs1NTIsNiBAQCBzdGF0 aWMgYm9vbCBzYXZlX2JhY2tlbmRfdmFyaWFibGVzKEJhY2tlbmRQYXJhbWV0ZXJzICpwYXJh bSwgUG9ydCAqcG9ydCwgQmFja2dybwogc3RhdGljIGJvb2wgc2F2ZV9iYWNrZW5kX3Zhcmlh YmxlcyhCYWNrZW5kUGFyYW1ldGVycyAqcGFyYW0sIFBvcnQgKnBvcnQsIEJhY2tncm91bmRX b3JrZXIgKndvcmtlciwKIAkJCQkJCQkJICAgSEFORExFIGNoaWxkUHJvY2VzcywgcGlkX3Qg Y2hpbGRQaWQpOwogI2VuZGlmCi0KLXN0YXRpYyB2b2lkIFNobWVtQmFja2VuZEFycmF5QWRk KEJhY2tlbmQgKmJuKTsKLXN0YXRpYyB2b2lkIFNobWVtQmFja2VuZEFycmF5UmVtb3ZlKEJh Y2tlbmQgKmJuKTsKICNlbmRpZgkJCQkJCQkvKiBFWEVDX0JBQ0tFTkQgKi8KIAogLyogTWFj cm9zIHRvIGNoZWNrIGV4aXQgc3RhdHVzIG9mIGEgY2hpbGQgcHJvY2VzcyAqLwpAQCAtMjMz NCw1OCArMjMyNCwxMSBAQCBwcm9jZXNzQ2FuY2VsUmVxdWVzdChQb3J0ICpwb3J0LCB2b2lk ICpwa3QpCiAJQ2FuY2VsUmVxdWVzdFBhY2tldCAqY2FuYyA9IChDYW5jZWxSZXF1ZXN0UGFj a2V0ICopIHBrdDsKIAlpbnQJCQliYWNrZW5kUElEOwogCWludDMyCQljYW5jZWxBdXRoQ29k ZTsKLQlCYWNrZW5kICAgICpicDsKLQotI2lmbmRlZiBFWEVDX0JBQ0tFTkQKLQlkbGlzdF9p dGVyCWl0ZXI7Ci0jZWxzZQotCWludAkJCWk7Ci0jZW5kaWYKIAogCWJhY2tlbmRQSUQgPSAo aW50KSBwZ19udG9oMzIoY2FuYy0+YmFja2VuZFBJRCk7CiAJY2FuY2VsQXV0aENvZGUgPSAo aW50MzIpIHBnX250b2gzMihjYW5jLT5jYW5jZWxBdXRoQ29kZSk7CiAKLQkvKgotCSAqIFNl ZSBpZiB3ZSBoYXZlIGEgbWF0Y2hpbmcgYmFja2VuZC4gIEluIHRoZSBFWEVDX0JBQ0tFTkQg Y2FzZSwgd2UgY2FuIG5vCi0JICogbG9uZ2VyIGFjY2VzcyB0aGUgcG9zdG1hc3RlcidzIG93 biBiYWNrZW5kIGxpc3QsIGFuZCBtdXN0IHJlbHkgb24gdGhlCi0JICogZHVwbGljYXRlIGFy cmF5IGluIHNoYXJlZCBtZW1vcnkuCi0JICovCi0jaWZuZGVmIEVYRUNfQkFDS0VORAotCWRs aXN0X2ZvcmVhY2goaXRlciwgJkJhY2tlbmRMaXN0KQotCXsKLQkJYnAgPSBkbGlzdF9jb250 YWluZXIoQmFja2VuZCwgZWxlbSwgaXRlci5jdXIpOwotI2Vsc2UKLQlmb3IgKGkgPSBNYXhM aXZlUG9zdG1hc3RlckNoaWxkcmVuKCkgLSAxOyBpID49IDA7IGktLSkKLQl7Ci0JCWJwID0g KEJhY2tlbmQgKikgJlNobWVtQmFja2VuZEFycmF5W2ldOwotI2VuZGlmCi0JCWlmIChicC0+ cGlkID09IGJhY2tlbmRQSUQpCi0JCXsKLQkJCWlmIChicC0+Y2FuY2VsX2tleSA9PSBjYW5j ZWxBdXRoQ29kZSkKLQkJCXsKLQkJCQkvKiBGb3VuZCBhIG1hdGNoOyBzaWduYWwgdGhhdCBi YWNrZW5kIHRvIGNhbmNlbCBjdXJyZW50IG9wICovCi0JCQkJZXJlcG9ydChERUJVRzIsCi0J CQkJCQkoZXJybXNnX2ludGVybmFsKCJwcm9jZXNzaW5nIGNhbmNlbCByZXF1ZXN0OiBzZW5k aW5nIFNJR0lOVCB0byBwcm9jZXNzICVkIiwKLQkJCQkJCQkJCQkgYmFja2VuZFBJRCkpKTsK LQkJCQlzaWduYWxfY2hpbGQoYnAtPnBpZCwgU0lHSU5UKTsKLQkJCX0KLQkJCWVsc2UKLQkJ CQkvKiBSaWdodCBQSUQsIHdyb25nIGtleTogbm8gd2F5LCBKb3NlICovCi0JCQkJZXJlcG9y dChMT0csCi0JCQkJCQkoZXJybXNnKCJ3cm9uZyBrZXkgaW4gY2FuY2VsIHJlcXVlc3QgZm9y IHByb2Nlc3MgJWQiLAotCQkJCQkJCQliYWNrZW5kUElEKSkpOwotCQkJcmV0dXJuOwotCQl9 Ci0jaWZuZGVmIEVYRUNfQkFDS0VORAkJCS8qIG1ha2UgR05VIEVtYWNzIDI2LjEgc2VlIGJy YWNlIGJhbGFuY2UgKi8KLQl9Ci0jZWxzZQotCX0KLSNlbmRpZgotCi0JLyogTm8gbWF0Y2hp bmcgYmFja2VuZCAqLwotCWVyZXBvcnQoTE9HLAotCQkJKGVycm1zZygiUElEICVkIGluIGNh bmNlbCByZXF1ZXN0IGRpZCBub3QgbWF0Y2ggYW55IHByb2Nlc3MiLAotCQkJCQliYWNrZW5k UElEKSkpOworCVNlbmRDYW5jZWxSZXF1ZXN0KGJhY2tlbmRQSUQsIGNhbmNlbEF1dGhDb2Rl KTsKIH0KIAogLyoKQEAgLTMyOTYsOSArMzIzOSw2IEBAIENsZWFudXBCYWNrZ3JvdW5kV29y a2VyKGludCBwaWQsCiAKIAkJLyogR2V0IGl0IG91dCBvZiB0aGUgQmFja2VuZExpc3QgYW5k IGNsZWFyIG91dCByZW1haW5pbmcgZGF0YSAqLwogCQlkbGlzdF9kZWxldGUoJnJ3LT5yd19i YWNrZW5kLT5lbGVtKTsKLSNpZmRlZiBFWEVDX0JBQ0tFTkQKLQkJU2htZW1CYWNrZW5kQXJy YXlSZW1vdmUocnctPnJ3X2JhY2tlbmQpOwotI2VuZGlmCiAKIAkJLyoKIAkJICogSXQncyBw b3NzaWJsZSB0aGF0IHRoaXMgYmFja2dyb3VuZCB3b3JrZXIgc3RhcnRlZCBzb21lIE9USEVS CkBAIC0zMzg0LDkgKzMzMjQsNiBAQCBDbGVhbnVwQmFja2VuZChpbnQgcGlkLAogCQkJCQlI YW5kbGVDaGlsZENyYXNoKHBpZCwgZXhpdHN0YXR1cywgXygic2VydmVyIHByb2Nlc3MiKSk7 CiAJCQkJCXJldHVybjsKIAkJCQl9Ci0jaWZkZWYgRVhFQ19CQUNLRU5ECi0JCQkJU2htZW1C YWNrZW5kQXJyYXlSZW1vdmUoYnApOwotI2VuZGlmCiAJCQl9CiAJCQlpZiAoYnAtPmJnd29y a2VyX25vdGlmeSkKIAkJCXsKQEAgLTM0NTQsOSArMzM5MSw2IEBAIEhhbmRsZUNoaWxkQ3Jh c2goaW50IHBpZCwgaW50IGV4aXRzdGF0dXMsIGNvbnN0IGNoYXIgKnByb2NuYW1lKQogCQkJ ICovCiAJCQkodm9pZCkgUmVsZWFzZVBvc3RtYXN0ZXJDaGlsZFNsb3QocnctPnJ3X2NoaWxk X3Nsb3QpOwogCQkJZGxpc3RfZGVsZXRlKCZydy0+cndfYmFja2VuZC0+ZWxlbSk7Ci0jaWZk ZWYgRVhFQ19CQUNLRU5ECi0JCQlTaG1lbUJhY2tlbmRBcnJheVJlbW92ZShydy0+cndfYmFj a2VuZCk7Ci0jZW5kaWYKIAkJCXBmcmVlKHJ3LT5yd19iYWNrZW5kKTsKIAkJCXJ3LT5yd19i YWNrZW5kID0gTlVMTDsKIAkJCXJ3LT5yd19waWQgPSAwOwpAQCAtMzQ4OSw5ICszNDIzLDYg QEAgSGFuZGxlQ2hpbGRDcmFzaChpbnQgcGlkLCBpbnQgZXhpdHN0YXR1cywgY29uc3QgY2hh ciAqcHJvY25hbWUpCiAJCQlpZiAoIWJwLT5kZWFkX2VuZCkKIAkJCXsKIAkJCQkodm9pZCkg UmVsZWFzZVBvc3RtYXN0ZXJDaGlsZFNsb3QoYnAtPmNoaWxkX3Nsb3QpOwotI2lmZGVmIEVY RUNfQkFDS0VORAotCQkJCVNobWVtQmFja2VuZEFycmF5UmVtb3ZlKGJwKTsKLSNlbmRpZgog CQkJfQogCQkJZGxpc3RfZGVsZXRlKGl0ZXIuY3VyKTsKIAkJCXBmcmVlKGJwKTsKQEAgLTQx MDMsMjIgKzQwMzQsNiBAQCBCYWNrZW5kU3RhcnR1cChQb3J0ICpwb3J0KQogCQlyZXR1cm4g U1RBVFVTX0VSUk9SOwogCX0KIAotCS8qCi0JICogQ29tcHV0ZSB0aGUgY2FuY2VsIGtleSB0 aGF0IHdpbGwgYmUgYXNzaWduZWQgdG8gdGhpcyBiYWNrZW5kLiBUaGUKLQkgKiBiYWNrZW5k IHdpbGwgaGF2ZSBpdHMgb3duIGNvcHkgaW4gdGhlIGZvcmtlZC1vZmYgcHJvY2VzcycgdmFs dWUgb2YKLQkgKiBNeUNhbmNlbEtleSwgc28gdGhhdCBpdCBjYW4gdHJhbnNtaXQgdGhlIGtl eSB0byB0aGUgZnJvbnRlbmQuCi0JICovCi0JaWYgKCFSYW5kb21DYW5jZWxLZXkoJk15Q2Fu Y2VsS2V5KSkKLQl7Ci0JCXBmcmVlKGJuKTsKLQkJZXJlcG9ydChMT0csCi0JCQkJKGVycmNv ZGUoRVJSQ09ERV9JTlRFUk5BTF9FUlJPUiksCi0JCQkJIGVycm1zZygiY291bGQgbm90IGdl bmVyYXRlIHJhbmRvbSBjYW5jZWwga2V5IikpKTsKLQkJcmV0dXJuIFNUQVRVU19FUlJPUjsK LQl9Ci0KLQlibi0+Y2FuY2VsX2tleSA9IE15Q2FuY2VsS2V5OwotCiAJLyogUGFzcyBkb3du IGNhbkFjY2VwdENvbm5lY3Rpb25zIHN0YXRlICovCiAJcG9ydC0+Y2FuQWNjZXB0Q29ubmVj dGlvbnMgPSBjYW5BY2NlcHRDb25uZWN0aW9ucyhCQUNLRU5EX1RZUEVfTk9STUFMKTsKIAli bi0+ZGVhZF9lbmQgPSAocG9ydC0+Y2FuQWNjZXB0Q29ubmVjdGlvbnMgIT0gQ0FDX09LKTsK QEAgLTQxODIsMTEgKzQwOTcsNiBAQCBCYWNrZW5kU3RhcnR1cChQb3J0ICpwb3J0KQogCWJu LT5ia2VuZF90eXBlID0gQkFDS0VORF9UWVBFX05PUk1BTDsJLyogQ2FuIGNoYW5nZSBsYXRl ciB0byBXQUxTTkQgKi8KIAlkbGlzdF9wdXNoX2hlYWQoJkJhY2tlbmRMaXN0LCAmYm4tPmVs ZW0pOwogCi0jaWZkZWYgRVhFQ19CQUNLRU5ECi0JaWYgKCFibi0+ZGVhZF9lbmQpCi0JCVNo bWVtQmFja2VuZEFycmF5QWRkKGJuKTsKLSNlbmRpZgotCiAJcmV0dXJuIFNUQVRVU19PSzsK IH0KIApAQCAtNTI1MiwxNiArNTE2Miw2IEBAIFN0YXJ0dXBQYWNrZXRUaW1lb3V0SGFuZGxl cih2b2lkKQogCV9leGl0KDEpOwogfQogCi0KLS8qCi0gKiBHZW5lcmF0ZSBhIHJhbmRvbSBj YW5jZWwga2V5LgotICovCi1zdGF0aWMgYm9vbAotUmFuZG9tQ2FuY2VsS2V5KGludDMyICpj YW5jZWxfa2V5KQotewotCXJldHVybiBwZ19zdHJvbmdfcmFuZG9tKGNhbmNlbF9rZXksIHNp emVvZihpbnQzMikpOwotfQotCiAvKgogICogQ291bnQgdXAgbnVtYmVyIG9mIGNoaWxkIHBy b2Nlc3NlcyBvZiBzcGVjaWZpZWQgdHlwZXMgKGRlYWRfZW5kIGNoaWxkcmVuCiAgKiBhcmUg YWx3YXlzIGV4Y2x1ZGVkKS4KQEAgLTU0MzcsMjUgKzUzMzcsOSBAQCBTdGFydEF1dG92YWN1 dW1Xb3JrZXIodm9pZCkKIAkgKi8KIAlpZiAoY2FuQWNjZXB0Q29ubmVjdGlvbnMoQkFDS0VO RF9UWVBFX0FVVE9WQUMpID09IENBQ19PSykKIAl7Ci0JCS8qCi0JCSAqIENvbXB1dGUgdGhl IGNhbmNlbCBrZXkgdGhhdCB3aWxsIGJlIGFzc2lnbmVkIHRvIHRoaXMgc2Vzc2lvbi4gV2UK LQkJICogcHJvYmFibHkgZG9uJ3QgbmVlZCBjYW5jZWwga2V5cyBmb3IgYXV0b3ZhYyB3b3Jr ZXJzLCBidXQgd2UnZAotCQkgKiBiZXR0ZXIgaGF2ZSBzb21ldGhpbmcgcmFuZG9tIGluIHRo ZSBmaWVsZCB0byBwcmV2ZW50IHVuZnJpZW5kbHkKLQkJICogcGVvcGxlIGZyb20gc2VuZGlu ZyBjYW5jZWxzIHRvIHRoZW0uCi0JCSAqLwotCQlpZiAoIVJhbmRvbUNhbmNlbEtleSgmTXlD YW5jZWxLZXkpKQotCQl7Ci0JCQllcmVwb3J0KExPRywKLQkJCQkJKGVycmNvZGUoRVJSQ09E RV9JTlRFUk5BTF9FUlJPUiksCi0JCQkJCSBlcnJtc2coImNvdWxkIG5vdCBnZW5lcmF0ZSBy YW5kb20gY2FuY2VsIGtleSIpKSk7Ci0JCQlyZXR1cm47Ci0JCX0KLQogCQlibiA9IChCYWNr ZW5kICopIHBhbGxvY19leHRlbmRlZChzaXplb2YoQmFja2VuZCksIE1DWFRfQUxMT0NfTk9f T09NKTsKIAkJaWYgKGJuKQogCQl7Ci0JCQlibi0+Y2FuY2VsX2tleSA9IE15Q2FuY2VsS2V5 OwotCiAJCQkvKiBBdXRvdmFjIHdvcmtlcnMgYXJlIG5vdCBkZWFkX2VuZCBhbmQgbmVlZCBh IGNoaWxkIHNsb3QgKi8KIAkJCWJuLT5kZWFkX2VuZCA9IGZhbHNlOwogCQkJYm4tPmNoaWxk X3Nsb3QgPSBNeVBNQ2hpbGRTbG90ID0gQXNzaWduUG9zdG1hc3RlckNoaWxkU2xvdCgpOwpA QCAtNTQ2Niw5ICs1MzUwLDYgQEAgU3RhcnRBdXRvdmFjdXVtV29ya2VyKHZvaWQpCiAJCQl7 CiAJCQkJYm4tPmJrZW5kX3R5cGUgPSBCQUNLRU5EX1RZUEVfQVVUT1ZBQzsKIAkJCQlkbGlz dF9wdXNoX2hlYWQoJkJhY2tlbmRMaXN0LCAmYm4tPmVsZW0pOwotI2lmZGVmIEVYRUNfQkFD S0VORAotCQkJCVNobWVtQmFja2VuZEFycmF5QWRkKGJuKTsKLSNlbmRpZgogCQkJCS8qIGFs bCBPSyAqLwogCQkJCXJldHVybjsKIAkJCX0KQEAgLTU2MDAsMTEgKzU0ODEsMTAgQEAgQ3Jl YXRlT3B0c0ZpbGUoaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSwgY2hhciAqZnVsbHByb2duYW1l KQogLyoKICAqIE1heExpdmVQb3N0bWFzdGVyQ2hpbGRyZW4KICAqCi0gKiBUaGlzIHJlcG9y dHMgdGhlIG51bWJlciBvZiBlbnRyaWVzIG5lZWRlZCBpbiBwZXItY2hpbGQtcHJvY2VzcyBh cnJheXMKLSAqICh0aGUgUE1DaGlsZEZsYWdzIGFycmF5LCBhbmQgaWYgRVhFQ19CQUNLRU5E IHRoZSBTaG1lbUJhY2tlbmRBcnJheSkuCi0gKiBUaGVzZSBhcnJheXMgaW5jbHVkZSByZWd1 bGFyIGJhY2tlbmRzLCBhdXRvdmFjIHdvcmtlcnMsIHdhbHNlbmRlcnMKKyAqIFRoaXMgcmVw b3J0cyB0aGUgbnVtYmVyIG9mIGVudHJpZXMgbmVlZGVkIGluIHRoZSBwZXItY2hpbGQtcHJv Y2VzcyBhcnJheS4KKyAqIFRoZSBhcnJheSBpbmNsdWRlcyByZWd1bGFyIGJhY2tlbmRzLCBh dXRvdmFjIHdvcmtlcnMsIHdhbHNlbmRlcnMKICAqIGFuZCBiYWNrZ3JvdW5kIHdvcmtlcnMs IGJ1dCBub3Qgc3BlY2lhbCBjaGlsZHJlbiBub3IgZGVhZF9lbmQgY2hpbGRyZW4uCi0gKiBU aGlzIGFsbG93cyB0aGUgYXJyYXlzIHRvIGhhdmUgYSBmaXhlZCBtYXhpbXVtIHNpemUsIHRv IHdpdCB0aGUgc2FtZQorICogVGhpcyBhbGxvd3MgdGhlIGFycmF5IHRvIGhhdmUgYSBmaXhl ZCBtYXhpbXVtIHNpemUsIHRvIHdpdCB0aGUgc2FtZQogICogdG9vLW1hbnktY2hpbGRyZW4g bGltaXQgZW5mb3JjZWQgYnkgY2FuQWNjZXB0Q29ubmVjdGlvbnMoKS4gIFRoZSBleGFjdCB2 YWx1ZQogICogaXNuJ3QgdG9vIGNyaXRpY2FsIGFzIGxvbmcgYXMgaXQncyBtb3JlIHRoYW4g TWF4QmFja2VuZHMuCiAgKi8KQEAgLTU4MDQsOSArNTY4NCw2IEBAIGRvX3N0YXJ0X2Jnd29y a2VyKFJlZ2lzdGVyZWRCZ1dvcmtlciAqcncpCiAJCQlSZXBvcnRCYWNrZ3JvdW5kV29ya2Vy UElEKHJ3KTsKIAkJCS8qIGFkZCBuZXcgd29ya2VyIHRvIGxpc3RzIG9mIGJhY2tlbmRzICov CiAJCQlkbGlzdF9wdXNoX2hlYWQoJkJhY2tlbmRMaXN0LCAmcnctPnJ3X2JhY2tlbmQtPmVs ZW0pOwotI2lmZGVmIEVYRUNfQkFDS0VORAotCQkJU2htZW1CYWNrZW5kQXJyYXlBZGQocnct PnJ3X2JhY2tlbmQpOwotI2VuZGlmCiAJCQlyZXR1cm4gdHJ1ZTsKIAl9CiAKQEAgLTU4Nzcs MjAgKzU3NTQsNiBAQCBhc3NpZ25fYmFja2VuZGxpc3RfZW50cnkoUmVnaXN0ZXJlZEJnV29y a2VyICpydykKIAkJcmV0dXJuIGZhbHNlOwogCX0KIAotCS8qCi0JICogQ29tcHV0ZSB0aGUg Y2FuY2VsIGtleSB0aGF0IHdpbGwgYmUgYXNzaWduZWQgdG8gdGhpcyBzZXNzaW9uLiBXZQot CSAqIHByb2JhYmx5IGRvbid0IG5lZWQgY2FuY2VsIGtleXMgZm9yIGJhY2tncm91bmQgd29y a2VycywgYnV0IHdlJ2QgYmV0dGVyCi0JICogaGF2ZSBzb21ldGhpbmcgcmFuZG9tIGluIHRo ZSBmaWVsZCB0byBwcmV2ZW50IHVuZnJpZW5kbHkgcGVvcGxlIGZyb20KLQkgKiBzZW5kaW5n IGNhbmNlbHMgdG8gdGhlbS4KLQkgKi8KLQlpZiAoIVJhbmRvbUNhbmNlbEtleSgmTXlDYW5j ZWxLZXkpKQotCXsKLQkJZXJlcG9ydChMT0csCi0JCQkJKGVycmNvZGUoRVJSQ09ERV9JTlRF Uk5BTF9FUlJPUiksCi0JCQkJIGVycm1zZygiY291bGQgbm90IGdlbmVyYXRlIHJhbmRvbSBj YW5jZWwga2V5IikpKTsKLQkJcmV0dXJuIGZhbHNlOwotCX0KLQogCWJuID0gcGFsbG9jX2V4 dGVuZGVkKHNpemVvZihCYWNrZW5kKSwgTUNYVF9BTExPQ19OT19PT00pOwogCWlmIChibiA9 PSBOVUxMKQogCXsKQEAgLTU5MDAsNyArNTc2Myw2IEBAIGFzc2lnbl9iYWNrZW5kbGlzdF9l bnRyeShSZWdpc3RlcmVkQmdXb3JrZXIgKnJ3KQogCQlyZXR1cm4gZmFsc2U7CiAJfQogCi0J Ym4tPmNhbmNlbF9rZXkgPSBNeUNhbmNlbEtleTsKIAlibi0+Y2hpbGRfc2xvdCA9IE15UE1D aGlsZFNsb3QgPSBBc3NpZ25Qb3N0bWFzdGVyQ2hpbGRTbG90KCk7CiAJYm4tPmJrZW5kX3R5 cGUgPSBCQUNLRU5EX1RZUEVfQkdXT1JLRVI7CiAJYm4tPmRlYWRfZW5kID0gZmFsc2U7CkBA IC02MTI5LDcgKzU5OTEsNiBAQCBzYXZlX2JhY2tlbmRfdmFyaWFibGVzKEJhY2tlbmRQYXJh bWV0ZXJzICpwYXJhbSwgUG9ydCAqcG9ydCwgQmFja2dyb3VuZFdvcmtlciAqdwogCXBhcmFt LT5Vc2VkU2htZW1TZWdBZGRyID0gVXNlZFNobWVtU2VnQWRkcjsKIAogCXBhcmFtLT5TaG1l bUxvY2sgPSBTaG1lbUxvY2s7Ci0JcGFyYW0tPlNobWVtQmFja2VuZEFycmF5ID0gU2htZW1C YWNrZW5kQXJyYXk7CiAKICNpZm5kZWYgSEFWRV9TUElOTE9DS1MKIAlwYXJhbS0+U3Bpbmxv Y2tTZW1hQXJyYXkgPSBTcGlubG9ja1NlbWFBcnJheTsKQEAgLTYzNzQsNyArNjIzNSw2IEBA IHJlc3RvcmVfYmFja2VuZF92YXJpYWJsZXMoQmFja2VuZFBhcmFtZXRlcnMgKnBhcmFtLCBQ b3J0ICoqcG9ydCwgQmFja2dyb3VuZFdvcmtlCiAJVXNlZFNobWVtU2VnQWRkciA9IHBhcmFt LT5Vc2VkU2htZW1TZWdBZGRyOwogCiAJU2htZW1Mb2NrID0gcGFyYW0tPlNobWVtTG9jazsK LQlTaG1lbUJhY2tlbmRBcnJheSA9IHBhcmFtLT5TaG1lbUJhY2tlbmRBcnJheTsKIAogI2lm bmRlZiBIQVZFX1NQSU5MT0NLUwogCVNwaW5sb2NrU2VtYUFycmF5ID0gcGFyYW0tPlNwaW5s b2NrU2VtYUFycmF5OwpAQCAtNjQyNiw0MyArNjI4Niw2IEBAIHJlc3RvcmVfYmFja2VuZF92 YXJpYWJsZXMoQmFja2VuZFBhcmFtZXRlcnMgKnBhcmFtLCBQb3J0ICoqcG9ydCwgQmFja2dy b3VuZFdvcmtlCiAJCVJlc2VydmVFeHRlcm5hbEZEKCk7CiAjZW5kaWYKIH0KLQotCi1TaXpl Ci1TaG1lbUJhY2tlbmRBcnJheVNpemUodm9pZCkKLXsKLQlyZXR1cm4gbXVsX3NpemUoTWF4 TGl2ZVBvc3RtYXN0ZXJDaGlsZHJlbigpLCBzaXplb2YoQmFja2VuZCkpOwotfQotCi12b2lk Ci1TaG1lbUJhY2tlbmRBcnJheUFsbG9jYXRpb24odm9pZCkKLXsKLQlTaXplCQlzaXplID0g U2htZW1CYWNrZW5kQXJyYXlTaXplKCk7Ci0KLQlTaG1lbUJhY2tlbmRBcnJheSA9IChCYWNr ZW5kICopIFNobWVtQWxsb2Moc2l6ZSk7Ci0JLyogTWFyayBhbGwgc2xvdHMgYXMgZW1wdHkg Ki8KLQltZW1zZXQoU2htZW1CYWNrZW5kQXJyYXksIDAsIHNpemUpOwotfQotCi1zdGF0aWMg dm9pZAotU2htZW1CYWNrZW5kQXJyYXlBZGQoQmFja2VuZCAqYm4pCi17Ci0JLyogVGhlIGFy cmF5IHNsb3QgY29ycmVzcG9uZGluZyB0byBteSBQTUNoaWxkU2xvdCBzaG91bGQgYmUgZnJl ZSAqLwotCWludAkJCWkgPSBibi0+Y2hpbGRfc2xvdCAtIDE7Ci0KLQlBc3NlcnQoU2htZW1C YWNrZW5kQXJyYXlbaV0ucGlkID09IDApOwotCVNobWVtQmFja2VuZEFycmF5W2ldID0gKmJu OwotfQotCi1zdGF0aWMgdm9pZAotU2htZW1CYWNrZW5kQXJyYXlSZW1vdmUoQmFja2VuZCAq Ym4pCi17Ci0JaW50CQkJaSA9IGJuLT5jaGlsZF9zbG90IC0gMTsKLQotCUFzc2VydChTaG1l bUJhY2tlbmRBcnJheVtpXS5waWQgPT0gYm4tPnBpZCk7Ci0JLyogTWFyayB0aGUgc2xvdCBh cyBlbXB0eSAqLwotCVNobWVtQmFja2VuZEFycmF5W2ldLnBpZCA9IDA7Ci19CiAjZW5kaWYJ CQkJCQkJLyogRVhFQ19CQUNLRU5EICovCiAKIApkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQv c3RvcmFnZS9pcGMvaXBjaS5jIGIvc3JjL2JhY2tlbmQvc3RvcmFnZS9pcGMvaXBjaS5jCmlu ZGV4IDdlNzk0MWQ2MjU5Li5jMjI2N2I3YjA4MCAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQv c3RvcmFnZS9pcGMvaXBjaS5jCisrKyBiL3NyYy9iYWNrZW5kL3N0b3JhZ2UvaXBjL2lwY2ku YwpAQCAtMTU1LDkgKzE1NSw2IEBAIENhbGN1bGF0ZVNobWVtU2l6ZShpbnQgKm51bV9zZW1h cGhvcmVzKQogCXNpemUgPSBhZGRfc2l6ZShzaXplLCBXYWl0RXZlbnRFeHRlbnNpb25TaG1l bVNpemUoKSk7CiAJc2l6ZSA9IGFkZF9zaXplKHNpemUsIEluamVjdGlvblBvaW50U2htZW1T aXplKCkpOwogCXNpemUgPSBhZGRfc2l6ZShzaXplLCBTbG90U3luY1NobWVtU2l6ZSgpKTsK LSNpZmRlZiBFWEVDX0JBQ0tFTkQKLQlzaXplID0gYWRkX3NpemUoc2l6ZSwgU2htZW1CYWNr ZW5kQXJyYXlTaXplKCkpOwotI2VuZGlmCiAKIAkvKiBpbmNsdWRlIGFkZGl0aW9uYWwgcmVx dWVzdGVkIHNobWVtIGZyb20gcHJlbG9hZCBsaWJyYXJpZXMgKi8KIAlzaXplID0gYWRkX3Np emUoc2l6ZSwgdG90YWxfYWRkaW5fcmVxdWVzdCk7CkBAIC0yNDcsMTQgKzI0NCw2IEBAIENy ZWF0ZVNoYXJlZE1lbW9yeUFuZFNlbWFwaG9yZXModm9pZCkKIAkvKiBJbml0aWFsaXplIHN1 YnN5c3RlbXMgKi8KIAlDcmVhdGVPckF0dGFjaFNobWVtU3RydWN0cygpOwogCi0jaWZkZWYg RVhFQ19CQUNLRU5ECi0KLQkvKgotCSAqIEFsbG9jIHRoZSB3aW4zMiBzaGFyZWQgYmFja2Vu ZCBhcnJheQotCSAqLwotCVNobWVtQmFja2VuZEFycmF5QWxsb2NhdGlvbigpOwotI2VuZGlm Ci0KIAkvKiBJbml0aWFsaXplIGR5bmFtaWMgc2hhcmVkIG1lbW9yeSBmYWNpbGl0aWVzLiAq LwogCWRzbV9wb3N0bWFzdGVyX3N0YXJ0dXAoc2hpbSk7CiAKZGlmZiAtLWdpdCBhL3NyYy9i YWNrZW5kL3N0b3JhZ2UvaXBjL3Btc2lnbmFsLmMgYi9zcmMvYmFja2VuZC9zdG9yYWdlL2lw Yy9wbXNpZ25hbC5jCmluZGV4IDI3ODQ0YjQ2YTJiLi45NTE2Yjg2OWNiMiAxMDA2NDQKLS0t IGEvc3JjL2JhY2tlbmQvc3RvcmFnZS9pcGMvcG1zaWduYWwuYworKysgYi9zcmMvYmFja2Vu ZC9zdG9yYWdlL2lwYy9wbXNpZ25hbC5jCkBAIC0yMiw2ICsyMiw3IEBACiAjZW5kaWYKIAog I2luY2x1ZGUgIm1pc2NhZG1pbi5oIgorI2luY2x1ZGUgInBvcnQvYXRvbWljcy5oIgogI2lu Y2x1ZGUgInBvc3RtYXN0ZXIvcG9zdG1hc3Rlci5oIgogI2luY2x1ZGUgInJlcGxpY2F0aW9u L3dhbHNlbmRlci5oIgogI2luY2x1ZGUgInN0b3JhZ2UvcG1zaWduYWwuaCIKQEAgLTM3LDkg KzM4LDggQEAKICAqIGlmIHRoZSBzYW1lIHJlYXNvbiBpcyBzaWduYWxlZCBtb3JlIHRoYW4g b25jZSBzaW11bHRhbmVvdXNseSwgdGhlCiAgKiBwb3N0bWFzdGVyIHdpbGwgb2JzZXJ2ZSBp dCBvbmx5IG9uY2UuKQogICoKLSAqIFRoZSBmbGFncyBhcmUgYWN0dWFsbHkgZGVjbGFyZWQg YXMgInZvbGF0aWxlIHNpZ19hdG9taWNfdCIgZm9yIG1heGltdW0KLSAqIHBvcnRhYmlsaXR5 LiAgVGhpcyBzaG91bGQgZW5zdXJlIHRoYXQgbG9hZHMgYW5kIHN0b3JlcyBvZiB0aGUgZmxh ZwotICogdmFsdWVzIGFyZSBhdG9taWMsIGFsbG93aW5nIHVzIHRvIGRpc3BlbnNlIHdpdGgg YW55IGV4cGxpY2l0IGxvY2tpbmcuCisgKiBUaGUgZmxhZyBmaWVsZHMgdXNlIGF0b21pY3Ms IGFsbG93aW5nIHVzIHRvIGRpc3BlbnNlIHdpdGggYW55IGV4cGxpY2l0CisgKiBsb2NraW5n LgogICoKICAqIEluIGFkZGl0aW9uIHRvIHRoZSBwZXItcmVhc29uIGZsYWdzLCB3ZSBzdG9y ZSBhIHNldCBvZiBwZXItY2hpbGQtcHJvY2VzcwogICogZmxhZ3MgdGhhdCBhcmUgY3VycmVu dGx5IHVzZWQgb25seSBmb3IgZGV0ZWN0aW5nIHdoZXRoZXIgYSBiYWNrZW5kIGhhcwpAQCAt NjcsMjAgKzY3LDI5IEBACiAjZGVmaW5lIFBNX0NISUxEX0FDVElWRQkJMgogI2RlZmluZSBQ TV9DSElMRF9XQUxTRU5ERVIJMwogCit0eXBlZGVmIHN0cnVjdCBDaGlsZFNsb3REYXRhCit7 CisJcGdfYXRvbWljX3VpbnQzMiBzdGF0ZTsKKworCWludAkJCXBpZDsKKwlpbnQzMgkJY2Fu Y2VsX2tleTsKK30gQ2hpbGRTbG90RGF0YTsKKwogLyogInR5cGVkZWYgc3RydWN0IFBNU2ln bmFsRGF0YSBQTVNpZ25hbERhdGEiIGFwcGVhcnMgaW4gcG1zaWduYWwuaCAqLwogc3RydWN0 IFBNU2lnbmFsRGF0YQogewogCS8qIHBlci1yZWFzb24gZmxhZ3MgZm9yIHNpZ25hbGluZyB0 aGUgcG9zdG1hc3RlciAqLwotCXNpZ19hdG9taWNfdCBQTVNpZ25hbEZsYWdzW05VTV9QTVNJ R05BTFNdOworCXZvbGF0aWxlIHNpZ19hdG9taWNfdCBQTVNpZ25hbEZsYWdzW05VTV9QTVNJ R05BTFNdOwogCS8qIGdsb2JhbCBmbGFncyBmb3Igc2lnbmFscyBmcm9tIHBvc3RtYXN0ZXIg dG8gY2hpbGRyZW4gKi8KIAlRdWl0U2lnbmFsUmVhc29uIHNpZ3F1aXRfcmVhc29uOwkvKiB3 aHkgU0lHUVVJVCB3YXMgc2VudCAqLwotCS8qIHBlci1jaGlsZC1wcm9jZXNzIGZsYWdzICov Ci0JaW50CQkJbnVtX2NoaWxkX2ZsYWdzOwkvKiAjIG9mIGVudHJpZXMgaW4gUE1DaGlsZEZs YWdzW10gKi8KLQlzaWdfYXRvbWljX3QgUE1DaGlsZEZsYWdzW0ZMRVhJQkxFX0FSUkFZX01F TUJFUl07CisKKwkvKiBwZXItY2hpbGQtcHJvY2VzcyBzbG90cyAqLworCWludAkJCW51bV9j aGlsZF9zbG90czsJLyogIyBvZiBlbnRyaWVzIGluIGNoaWxkX3Nsb3RzW10gKi8KKwlDaGls ZFNsb3REYXRhIGNoaWxkX3Nsb3RzW0ZMRVhJQkxFX0FSUkFZX01FTUJFUl07CiB9OwogCiAv KiBQTVNpZ25hbFN0YXRlIHBvaW50ZXIgaXMgdmFsaWQgaW4gYm90aCBwb3N0bWFzdGVyIGFu ZCBjaGlsZCBwcm9jZXNzZXMgKi8KLU5PTl9FWEVDX1NUQVRJQyB2b2xhdGlsZSBQTVNpZ25h bERhdGEgKlBNU2lnbmFsU3RhdGUgPSBOVUxMOworTk9OX0VYRUNfU1RBVElDIFBNU2lnbmFs RGF0YSAqUE1TaWduYWxTdGF0ZSA9IE5VTEw7CiAKIC8qCiAgKiBUaGVzZSBzdGF0aWMgdmFy aWFibGVzIGFyZSB2YWxpZCBvbmx5IGluIHRoZSBwb3N0bWFzdGVyLiAgV2Uga2VlcCBhCkBA IC0xMzAsOSArMTM5LDkgQEAgUE1TaWduYWxTaG1lbVNpemUodm9pZCkKIHsKIAlTaXplCQlz aXplOwogCi0Jc2l6ZSA9IG9mZnNldG9mKFBNU2lnbmFsRGF0YSwgUE1DaGlsZEZsYWdzKTsK KwlzaXplID0gb2Zmc2V0b2YoUE1TaWduYWxEYXRhLCBjaGlsZF9zbG90cyk7CiAJc2l6ZSA9 IGFkZF9zaXplKHNpemUsIG11bF9zaXplKE1heExpdmVQb3N0bWFzdGVyQ2hpbGRyZW4oKSwK LQkJCQkJCQkJICAgc2l6ZW9mKHNpZ19hdG9taWNfdCkpKTsKKwkJCQkJCQkJICAgc2l6ZW9m KENoaWxkU2xvdERhdGEpKSk7CiAKIAlyZXR1cm4gc2l6ZTsKIH0KQEAgLTE1MSw5ICsxNjAs OSBAQCBQTVNpZ25hbFNobWVtSW5pdCh2b2lkKQogCWlmICghZm91bmQpCiAJewogCQkvKiBp bml0aWFsaXplIGFsbCBmbGFncyB0byB6ZXJvZXMgKi8KLQkJTWVtU2V0KHVudm9sYXRpemUo UE1TaWduYWxEYXRhICosIFBNU2lnbmFsU3RhdGUpLCAwLCBQTVNpZ25hbFNobWVtU2l6ZSgp KTsKKwkJTWVtU2V0KFBNU2lnbmFsU3RhdGUsIDAsIFBNU2lnbmFsU2htZW1TaXplKCkpOwog CQludW1fY2hpbGRfaW51c2UgPSBNYXhMaXZlUG9zdG1hc3RlckNoaWxkcmVuKCk7Ci0JCVBN U2lnbmFsU3RhdGUtPm51bV9jaGlsZF9mbGFncyA9IG51bV9jaGlsZF9pbnVzZTsKKwkJUE1T aWduYWxTdGF0ZS0+bnVtX2NoaWxkX3Nsb3RzID0gbnVtX2NoaWxkX2ludXNlOwogCiAJCS8q CiAJCSAqIEFsc28gYWxsb2NhdGUgcG9zdG1hc3RlcidzIHByaXZhdGUgUE1DaGlsZEluVXNl W10gYXJyYXkuICBXZQpAQCAtMjYyLDE0ICsyNzEsMTQgQEAgQXNzaWduUG9zdG1hc3RlckNo aWxkU2xvdCh2b2lkKQogCQlpZiAoIVBNQ2hpbGRJblVzZVtzbG90XSkKIAkJewogCQkJUE1D aGlsZEluVXNlW3Nsb3RdID0gdHJ1ZTsKLQkJCVBNU2lnbmFsU3RhdGUtPlBNQ2hpbGRGbGFn c1tzbG90XSA9IFBNX0NISUxEX0FTU0lHTkVEOworCQkJcGdfYXRvbWljX3dyaXRlX3UzMigm UE1TaWduYWxTdGF0ZS0+Y2hpbGRfc2xvdHNbc2xvdF0uc3RhdGUsIFBNX0NISUxEX0FTU0lH TkVEKTsKIAkJCW5leHRfY2hpbGRfaW51c2UgPSBzbG90OwogCQkJcmV0dXJuIHNsb3QgKyAx OwogCQl9CiAJfQogCiAJLyogT3V0IG9mIHNsb3RzIC4uLiBzaG91bGQgbmV2ZXIgaGFwcGVu LCBlbHNlIHBvc3RtYXN0ZXIuYyBtZXNzZWQgdXAgKi8KLQllbG9nKEZBVEFMLCAibm8gZnJl ZSBzbG90cyBpbiBQTUNoaWxkRmxhZ3MgYXJyYXkiKTsKKwllbG9nKEZBVEFMLCAibm8gZnJl ZSBzbG90cyBpbiBwb3N0bWFzdGVyIGNoaWxkIGFycmF5Iik7CiAJcmV0dXJuIDA7CQkJCQkv KiBrZWVwIGNvbXBpbGVyIHF1aWV0ICovCiB9CiAKQEAgLTI4Myw3ICsyOTIsNyBAQCBBc3Np Z25Qb3N0bWFzdGVyQ2hpbGRTbG90KHZvaWQpCiBib29sCiBSZWxlYXNlUG9zdG1hc3RlckNo aWxkU2xvdChpbnQgc2xvdCkKIHsKLQlib29sCQlyZXN1bHQ7CisJdWludDMyCQlvbGRzdGF0 ZTsKIAogCUFzc2VydChzbG90ID4gMCAmJiBzbG90IDw9IG51bV9jaGlsZF9pbnVzZSk7CiAJ c2xvdC0tOwpAQCAtMjkzLDEwICszMDIsOSBAQCBSZWxlYXNlUG9zdG1hc3RlckNoaWxkU2xv dChpbnQgc2xvdCkKIAkgKiBwb3N0bWFzdGVyLmMgaXMgc3VjaCB0aGF0IHRoaXMgbWlnaHQg Z2V0IGNhbGxlZCB0d2ljZSB3aGVuIGEgY2hpbGQKIAkgKiBjcmFzaGVzLiAgU28gd2UgZG9u J3QgdHJ5IHRvIEFzc2VydCBhbnl0aGluZyBhYm91dCB0aGUgc3RhdGUuCiAJICovCi0JcmVz dWx0ID0gKFBNU2lnbmFsU3RhdGUtPlBNQ2hpbGRGbGFnc1tzbG90XSA9PSBQTV9DSElMRF9B U1NJR05FRCk7Ci0JUE1TaWduYWxTdGF0ZS0+UE1DaGlsZEZsYWdzW3Nsb3RdID0gUE1fQ0hJ TERfVU5VU0VEOworCW9sZHN0YXRlID0gcGdfYXRvbWljX2V4Y2hhbmdlX3UzMigmUE1TaWdu YWxTdGF0ZS0+Y2hpbGRfc2xvdHNbc2xvdF0uc3RhdGUsIFBNX0NISUxEX1VOVVNFRCk7CiAJ UE1DaGlsZEluVXNlW3Nsb3RdID0gZmFsc2U7Ci0JcmV0dXJuIHJlc3VsdDsKKwlyZXR1cm4g b2xkc3RhdGUgPT0gUE1fQ0hJTERfQVNTSUdORUQ7CiB9CiAKIC8qCkBAIC0zMDksNyArMzE3 LDcgQEAgSXNQb3N0bWFzdGVyQ2hpbGRXYWxTZW5kZXIoaW50IHNsb3QpCiAJQXNzZXJ0KHNs b3QgPiAwICYmIHNsb3QgPD0gbnVtX2NoaWxkX2ludXNlKTsKIAlzbG90LS07CiAKLQlpZiAo UE1TaWduYWxTdGF0ZS0+UE1DaGlsZEZsYWdzW3Nsb3RdID09IFBNX0NISUxEX1dBTFNFTkRF UikKKwlpZiAocGdfYXRvbWljX3JlYWRfdTMyKCZQTVNpZ25hbFN0YXRlLT5jaGlsZF9zbG90 c1tzbG90XS5zdGF0ZSkgPT0gUE1fQ0hJTERfV0FMU0VOREVSKQogCQlyZXR1cm4gdHJ1ZTsK IAllbHNlCiAJCXJldHVybiBmYWxzZTsKQEAgLTMyMCwxNCArMzI4LDE3IEBAIElzUG9zdG1h c3RlckNoaWxkV2FsU2VuZGVyKGludCBzbG90KQogICogYWN0aXZlbHkgdXNpbmcgc2hhcmVk IG1lbW9yeS4gIFRoaXMgaXMgY2FsbGVkIGluIHRoZSBjaGlsZCBwcm9jZXNzLgogICovCiB2 b2lkCi1NYXJrUG9zdG1hc3RlckNoaWxkQWN0aXZlKHZvaWQpCitNYXJrUG9zdG1hc3RlckNo aWxkQWN0aXZlKGludCBwaWQsIGludDMyIGNhbmNlbEF1dGhDb2RlKQogewogCWludAkJCXNs b3QgPSBNeVBNQ2hpbGRTbG90OwogCi0JQXNzZXJ0KHNsb3QgPiAwICYmIHNsb3QgPD0gUE1T aWduYWxTdGF0ZS0+bnVtX2NoaWxkX2ZsYWdzKTsKKwlBc3NlcnQoc2xvdCA+IDAgJiYgc2xv dCA8PSBQTVNpZ25hbFN0YXRlLT5udW1fY2hpbGRfc2xvdHMpOwogCXNsb3QtLTsKLQlBc3Nl cnQoUE1TaWduYWxTdGF0ZS0+UE1DaGlsZEZsYWdzW3Nsb3RdID09IFBNX0NISUxEX0FTU0lH TkVEKTsKLQlQTVNpZ25hbFN0YXRlLT5QTUNoaWxkRmxhZ3Nbc2xvdF0gPSBQTV9DSElMRF9B Q1RJVkU7CisJQXNzZXJ0KHBnX2F0b21pY19yZWFkX3UzMigmUE1TaWduYWxTdGF0ZS0+Y2hp bGRfc2xvdHNbc2xvdF0uc3RhdGUpID09IFBNX0NISUxEX0FTU0lHTkVEKTsKKwlQTVNpZ25h bFN0YXRlLT5jaGlsZF9zbG90c1tzbG90XS5waWQgPSBwaWQ7CisJUE1TaWduYWxTdGF0ZS0+ Y2hpbGRfc2xvdHNbc2xvdF0uY2FuY2VsX2tleSA9IGNhbmNlbEF1dGhDb2RlOworCXBnX21l bW9yeV9iYXJyaWVyKCk7CisJcGdfYXRvbWljX3dyaXRlX3UzMigmUE1TaWduYWxTdGF0ZS0+ Y2hpbGRfc2xvdHNbc2xvdF0uc3RhdGUsIFBNX0NISUxEX0FDVElWRSk7CiB9CiAKIC8qCkBA IC0zNDIsMTAgKzM1MywxMCBAQCBNYXJrUG9zdG1hc3RlckNoaWxkV2FsU2VuZGVyKHZvaWQp CiAKIAlBc3NlcnQoYW1fd2Fsc2VuZGVyKTsKIAotCUFzc2VydChzbG90ID4gMCAmJiBzbG90 IDw9IFBNU2lnbmFsU3RhdGUtPm51bV9jaGlsZF9mbGFncyk7CisJQXNzZXJ0KHNsb3QgPiAw ICYmIHNsb3QgPD0gUE1TaWduYWxTdGF0ZS0+bnVtX2NoaWxkX3Nsb3RzKTsKIAlzbG90LS07 Ci0JQXNzZXJ0KFBNU2lnbmFsU3RhdGUtPlBNQ2hpbGRGbGFnc1tzbG90XSA9PSBQTV9DSElM RF9BQ1RJVkUpOwotCVBNU2lnbmFsU3RhdGUtPlBNQ2hpbGRGbGFnc1tzbG90XSA9IFBNX0NI SUxEX1dBTFNFTkRFUjsKKwlBc3NlcnQocGdfYXRvbWljX3JlYWRfdTMyKCZQTVNpZ25hbFN0 YXRlLT5jaGlsZF9zbG90c1tzbG90XS5zdGF0ZSkgPT0gUE1fQ0hJTERfQUNUSVZFKTsKKwlw Z19hdG9taWNfd3JpdGVfdTMyKCZQTVNpZ25hbFN0YXRlLT5jaGlsZF9zbG90c1tzbG90XS5z dGF0ZSwgUE1fQ0hJTERfV0FMU0VOREVSKTsKIH0KIAogLyoKQEAgLTM1NywxMSArMzY4LDE3 IEBAIE1hcmtQb3N0bWFzdGVyQ2hpbGRJbmFjdGl2ZSh2b2lkKQogewogCWludAkJCXNsb3Qg PSBNeVBNQ2hpbGRTbG90OwogCi0JQXNzZXJ0KHNsb3QgPiAwICYmIHNsb3QgPD0gUE1TaWdu YWxTdGF0ZS0+bnVtX2NoaWxkX2ZsYWdzKTsKKwlBc3NlcnQoc2xvdCA+IDAgJiYgc2xvdCA8 PSBQTVNpZ25hbFN0YXRlLT5udW1fY2hpbGRfc2xvdHMpOwogCXNsb3QtLTsKLQlBc3NlcnQo UE1TaWduYWxTdGF0ZS0+UE1DaGlsZEZsYWdzW3Nsb3RdID09IFBNX0NISUxEX0FDVElWRSB8 fAotCQkgICBQTVNpZ25hbFN0YXRlLT5QTUNoaWxkRmxhZ3Nbc2xvdF0gPT0gUE1fQ0hJTERf V0FMU0VOREVSKTsKLQlQTVNpZ25hbFN0YXRlLT5QTUNoaWxkRmxhZ3Nbc2xvdF0gPSBQTV9D SElMRF9BU1NJR05FRDsKKyNpZmRlZiBVU0VfQVNTRVJUX0NIRUNLSU5HCisJeworCQl1aW50 MzIJCW9sZHN0YXRlOworCisJCW9sZHN0YXRlID0gcGdfYXRvbWljX3JlYWRfdTMyKCZQTVNp Z25hbFN0YXRlLT5jaGlsZF9zbG90c1tzbG90XS5zdGF0ZSk7CisJCUFzc2VydChvbGRzdGF0 ZSA9PSBQTV9DSElMRF9BQ1RJVkUgfHwgb2xkc3RhdGUgPT0gUE1fQ0hJTERfV0FMU0VOREVS KTsKKwl9CisjZW5kaWYKKwlwZ19hdG9taWNfd3JpdGVfdTMyKCZQTVNpZ25hbFN0YXRlLT5j aGlsZF9zbG90c1tzbG90XS5zdGF0ZSwgUE1fQ0hJTERfQVNTSUdORUQpOwogfQogCiAKQEAg LTQ2MCwzICs0NzcsNTAgQEAgUG9zdG1hc3RlckRlYXRoU2lnbmFsSW5pdCh2b2lkKQogCXBv c3RtYXN0ZXJfcG9zc2libHlfZGVhZCA9IHRydWU7CiAjZW5kaWYJCQkJCQkJLyogVVNFX1BP U1RNQVNURVJfREVBVEhfU0lHTkFMICovCiB9CisKK3ZvaWQKK1NlbmRDYW5jZWxSZXF1ZXN0 KGludCBiYWNrZW5kUElELCBpbnQzMiBjYW5jZWxBdXRoQ29kZSkKK3sKKwkvKgorCSAqIFNl ZSBpZiB3ZSBoYXZlIGEgbWF0Y2hpbmcgYmFja2VuZC4gIEluIHRoZSBFWEVDX0JBQ0tFTkQg Y2FzZSwgd2UgY2FuIG5vCisJICogbG9uZ2VyIGFjY2VzcyB0aGUgcG9zdG1hc3RlcidzIG93 biBiYWNrZW5kIGxpc3QsIGFuZCBtdXN0IHJlbHkgb24gdGhlCisJICogZHVwbGljYXRlIGFy cmF5IGluIHNoYXJlZCBtZW1vcnkuIFhYWAorCSAqLworCWZvciAoaW50IGkgPSBNYXhMaXZl UG9zdG1hc3RlckNoaWxkcmVuKCkgLSAxOyBpID49IDA7IGktLSkKKwl7CisJCUNoaWxkU2xv dERhdGEgKnNsb3QgPSAmUE1TaWduYWxTdGF0ZS0+Y2hpbGRfc2xvdHNbaV07CisJCXVpbnQz MgkJc3RhdGUgPSBwZ19hdG9taWNfcmVhZF91MzIoJnNsb3QtPnN0YXRlKTsKKworCQlpZiAo c3RhdGUgIT0gUE1fQ0hJTERfQUNUSVZFKQorCQkJY29udGludWU7CisKKwkJcGdfcmVhZF9i YXJyaWVyKCk7CisJCWlmIChzbG90LT5waWQgPT0gYmFja2VuZFBJRCkKKwkJeworCQkJaWYg KHNsb3QtPmNhbmNlbF9rZXkgPT0gY2FuY2VsQXV0aENvZGUpCisJCQl7CisJCQkJLyogRm91 bmQgYSBtYXRjaDsgc2lnbmFsIHRoYXQgYmFja2VuZCB0byBjYW5jZWwgY3VycmVudCBvcCAq LworCQkJCWVyZXBvcnQoREVCVUcyLAorCQkJCQkJKGVycm1zZ19pbnRlcm5hbCgicHJvY2Vz c2luZyBjYW5jZWwgcmVxdWVzdDogc2VuZGluZyBTSUdJTlQgdG8gcHJvY2VzcyAlZCIsCisJ CQkJCQkJCQkJIGJhY2tlbmRQSUQpKSk7CisKKwkJCQkvKgorCQkJCSAqIEZJWE1FOiB3ZSB1 c2VkIHRvIHVzZSBzaWduYWxfY2hpbGQuIEkgYmVsaWV2ZSBraWxsKCkgaXMKKwkJCQkgKiBt YXliZSBldmVuIG1vcmUgY29ycmVjdCwgYnV0IHZlcmlmeSB0aGF0LgorCQkJCSAqLworCQkJ CWtpbGwoYmFja2VuZFBJRCwgU0lHSU5UKTsKKwkJCX0KKwkJCWVsc2UKKwkJCQkvKiBSaWdo dCBQSUQsIHdyb25nIGtleTogbm8gd2F5LCBKb3NlICovCisJCQkJZXJlcG9ydChMT0csCisJ CQkJCQkoZXJybXNnKCJ3cm9uZyBrZXkgaW4gY2FuY2VsIHJlcXVlc3QgZm9yIHByb2Nlc3Mg JWQiLAorCQkJCQkJCQliYWNrZW5kUElEKSkpOworCQkJcmV0dXJuOworCQl9CisJfQorCisJ LyogTm8gbWF0Y2hpbmcgYmFja2VuZCAqLworCWVyZXBvcnQoTE9HLAorCQkJKGVycm1zZygi UElEICVkIGluIGNhbmNlbCByZXF1ZXN0IGRpZCBub3QgbWF0Y2ggYW55IHByb2Nlc3MiLAor CQkJCQliYWNrZW5kUElEKSkpOworfQpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvc3RvcmFn ZS9sbWdyL3Byb2MuYyBiL3NyYy9iYWNrZW5kL3N0b3JhZ2UvbG1nci9wcm9jLmMKaW5kZXgg NmUzMzQ5NzFkYzkuLjU5ODRmZTdkNDRjIDEwMDY0NAotLS0gYS9zcmMvYmFja2VuZC9zdG9y YWdlL2xtZ3IvcHJvYy5jCisrKyBiL3NyYy9iYWNrZW5kL3N0b3JhZ2UvbG1nci9wcm9jLmMK QEAgLTMxMCw2ICszMTAsMjAgQEAgSW5pdFByb2Nlc3Modm9pZCkKIAlpZiAoTXlQcm9jICE9 IE5VTEwpCiAJCWVsb2coRVJST1IsICJ5b3UgYWxyZWFkeSBleGlzdCIpOwogCisJLyoKKwkg KiBHZW5lcmF0ZSBhIHJhbmRvbSBjYW5jZWwga2V5LgorCSAqCisJICogV2UgcHJvYmFibHkg ZG9uJ3QgbmVlZCBjYW5jZWwga2V5cyBmb3Igbm9uLWJhY2tlbmQgcHJvY2Vzc2VzLCBidXQg d2UnZAorCSAqIGJldHRlciBoYXZlIHNvbWV0aGluZyByYW5kb20gaW4gdGhlIGZpZWxkIHRv IHByZXZlbnQgdW5mcmllbmRseSBwZW9wbGUKKwkgKiBmcm9tIHNlbmRpbmcgY2FuY2VscyB0 byB0aGVtLgorCSAqLworCWlmICghcGdfc3Ryb25nX3JhbmRvbSgmTXlDYW5jZWxLZXksIHNp emVvZihpbnQzMikpKQorCXsKKwkJZXJlcG9ydChFUlJPUiwKKwkJCQkoZXJyY29kZShFUlJD T0RFX0lOVEVSTkFMX0VSUk9SKSwKKwkJCQkgZXJybXNnKCJjb3VsZCBub3QgZ2VuZXJhdGUg cmFuZG9tIGNhbmNlbCBrZXkiKSkpOworCX0KKwogCS8qIERlY2lkZSB3aGljaCBsaXN0IHNo b3VsZCBzdXBwbHkgb3VyIFBHUFJPQy4gKi8KIAlpZiAoSXNBbnlBdXRvVmFjdXVtUHJvY2Vz cygpKQogCQlwcm9jZ2xvYmFsbGlzdCA9ICZQcm9jR2xvYmFsLT5hdXRvdmFjRnJlZVByb2Nz OwpAQCAtMzczLDcgKzM4Nyw3IEBAIEluaXRQcm9jZXNzKHZvaWQpCiAJICovCiAJaWYgKElz VW5kZXJQb3N0bWFzdGVyICYmICFJc0F1dG9WYWN1dW1MYXVuY2hlclByb2Nlc3MoKSAmJgog CQkhSXNMb2dpY2FsU2xvdFN5bmNXb3JrZXIoKSkKLQkJTWFya1Bvc3RtYXN0ZXJDaGlsZEFj dGl2ZSgpOworCQlNYXJrUG9zdG1hc3RlckNoaWxkQWN0aXZlKE15UHJvY1BpZCwgTXlDYW5j ZWxLZXkpOwogCiAJLyoKIAkgKiBJbml0aWFsaXplIGFsbCBmaWVsZHMgb2YgTXlQcm9jLCBl eGNlcHQgZm9yIHRob3NlIHByZXZpb3VzbHkKZGlmZiAtLWdpdCBhL3NyYy9pbmNsdWRlL3Bv c3RtYXN0ZXIvcG9zdG1hc3Rlci5oIGIvc3JjL2luY2x1ZGUvcG9zdG1hc3Rlci9wb3N0bWFz dGVyLmgKaW5kZXggMDNmNzhiNWIyNWYuLjdjZmQwN2EyYmRhIDEwMDY0NAotLS0gYS9zcmMv aW5jbHVkZS9wb3N0bWFzdGVyL3Bvc3RtYXN0ZXIuaAorKysgYi9zcmMvaW5jbHVkZS9wb3N0 bWFzdGVyL3Bvc3RtYXN0ZXIuaApAQCAtNjEsOSArNjEsNiBAQCBleHRlcm4gYm9vbCBQb3N0 bWFzdGVyTWFya1BJREZvcldvcmtlck5vdGlmeShpbnQpOwogI2lmZGVmIEVYRUNfQkFDS0VO RAogZXh0ZXJuIHBpZF90IHBvc3RtYXN0ZXJfZm9ya2V4ZWMoaW50IGFyZ2MsIGNoYXIgKmFy Z3ZbXSk7CiBleHRlcm4gdm9pZCBTdWJQb3N0bWFzdGVyTWFpbihpbnQgYXJnYywgY2hhciAq YXJndltdKSBwZ19hdHRyaWJ1dGVfbm9yZXR1cm4oKTsKLQotZXh0ZXJuIFNpemUgU2htZW1C YWNrZW5kQXJyYXlTaXplKHZvaWQpOwotZXh0ZXJuIHZvaWQgU2htZW1CYWNrZW5kQXJyYXlB bGxvY2F0aW9uKHZvaWQpOwogI2VuZGlmCiAKIC8qCmRpZmYgLS1naXQgYS9zcmMvaW5jbHVk ZS9zdG9yYWdlL3Btc2lnbmFsLmggYi9zcmMvaW5jbHVkZS9zdG9yYWdlL3Btc2lnbmFsLmgK aW5kZXggMDI5YjcyMDEwOTMuLjhkZmY0N2U4NmU0IDEwMDY0NAotLS0gYS9zcmMvaW5jbHVk ZS9zdG9yYWdlL3Btc2lnbmFsLmgKKysrIGIvc3JjL2luY2x1ZGUvc3RvcmFnZS9wbXNpZ25h bC5oCkBAIC02OSwxMSArNjksMTIgQEAgZXh0ZXJuIFF1aXRTaWduYWxSZWFzb24gR2V0UXVp dFNpZ25hbFJlYXNvbih2b2lkKTsKIGV4dGVybiBpbnQJQXNzaWduUG9zdG1hc3RlckNoaWxk U2xvdCh2b2lkKTsKIGV4dGVybiBib29sIFJlbGVhc2VQb3N0bWFzdGVyQ2hpbGRTbG90KGlu dCBzbG90KTsKIGV4dGVybiBib29sIElzUG9zdG1hc3RlckNoaWxkV2FsU2VuZGVyKGludCBz bG90KTsKLWV4dGVybiB2b2lkIE1hcmtQb3N0bWFzdGVyQ2hpbGRBY3RpdmUodm9pZCk7Citl eHRlcm4gdm9pZCBNYXJrUG9zdG1hc3RlckNoaWxkQWN0aXZlKGludCBwaWQsIGludDMyIGNh bmNlbEF1dGhDb2RlKTsKIGV4dGVybiB2b2lkIE1hcmtQb3N0bWFzdGVyQ2hpbGRJbmFjdGl2 ZSh2b2lkKTsKIGV4dGVybiB2b2lkIE1hcmtQb3N0bWFzdGVyQ2hpbGRXYWxTZW5kZXIodm9p ZCk7CiBleHRlcm4gYm9vbCBQb3N0bWFzdGVySXNBbGl2ZUludGVybmFsKHZvaWQpOwogZXh0 ZXJuIHZvaWQgUG9zdG1hc3RlckRlYXRoU2lnbmFsSW5pdCh2b2lkKTsKK2V4dGVybiB2b2lk IFNlbmRDYW5jZWxSZXF1ZXN0KGludCBiYWNrZW5kUElELCBpbnQzMiBjYW5jZWxBdXRoQ29k ZSk7CiAKIAogLyoKZGlmZiAtLWdpdCBhL3NyYy90b29scy9wZ2luZGVudC90eXBlZGVmcy5s aXN0IGIvc3JjL3Rvb2xzL3BnaW5kZW50L3R5cGVkZWZzLmxpc3QKaW5kZXggZmM4YjE1ZDBj ZjIuLmFjMDA4NWEyMjZmIDEwMDY0NAotLS0gYS9zcmMvdG9vbHMvcGdpbmRlbnQvdHlwZWRl ZnMubGlzdAorKysgYi9zcmMvdG9vbHMvcGdpbmRlbnQvdHlwZWRlZnMubGlzdApAQCAtMzc1 LDYgKzM3NSw3IEBAIENhdGFsb2dJZAogQ2F0YWxvZ0lkTWFwRW50cnkKIENhdGFsb2dJbmRl eFN0YXRlCiBDaGFuZ2VWYXJOb2Rlc19jb250ZXh0CitDaGlsZFNsb3REYXRhCiBSZXBsYWNl VmFybm9Db250ZXh0CiBDaGVja1BvaW50CiBDaGVja1BvaW50U3RtdAotLSAKMi4zOS4yCgo= --------------kS0yn1i60V10fYafsNw0t0Qb Content-Type: text/x-patch; charset=UTF-8; name="0002-Make-cancel-request-keys-longer-as-an-optional-proto.patch" Content-Disposition: attachment; filename*0="0002-Make-cancel-request-keys-longer-as-an-optional-proto.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAzMjUxM2RkMGM1YjQ4ZTRkNmFjNTZmOGE1MzA4NTQ4MGMzMGE5NGJmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBIZWlra2kgTGlubmFrYW5nYXMgPGhlaWtraS5saW5u YWthbmdhc0Bpa2kuZmk+CkRhdGU6IFRodSwgMjkgRmViIDIwMjQgMjM6MjI6MDggKzAyMDAK U3ViamVjdDogW1BBVENIIDIvMl0gTWFrZSBjYW5jZWwgcmVxdWVzdCBrZXlzIGxvbmdlciwg YXMgYW4gb3B0aW9uYWwgcHJvdG9jb2wKIGZlYXR1cmUKCkN1cnJlbnRseSwgY2FuY2VsIHJl cXVlc3Qga2V5IGlzIDMyLWJpdCB0b2tlbiwgd2hpY2ggaXNuJ3QgdmVyeSBtdWNoCmVudHJv cHkuIElmIHlvdSB3YW50IHRvIGNhbmNlbCBhbm90aGVyIHNlc3Npb24ncyBxdWVyeSwgeW91 IGNhbgpicnV0ZS1mb3JjZSBpdC4gSW4gbW9zdCBlbnZpcm9ubWVudHMsIGFuIHVuYXV0aG9y aXplZCBjYW5jZWxsYXRpb24gb2YKYSBxdWVyeSBpc24ndCB2ZXJ5IHNlcmlvdXMsIGJ1dCBp dCBuZXZlcnRoZWxlc3Mgd291bGQgYmUgbmljZSB0byBoYXZlCm1vcmUgcHJvdGVjdGlvbiBm cm9tIGl0LgoKVG8gbWFrZSBpdCBoYXJkZXIgdG8gZ3Vlc3MgdGhlIGtleSwgbWFrZSBpdCBs YXJnZXIuIEJ1dCBiZWNhdXNlIHRoZQpsZW5ndGggaXMgY29kZWQgaW4gdGhlIEZFLUJFIHBy b3RvY29sLCBtYWtlIGl0IGFuIG9wdGlvbmFsIHByb3RvY29sCmZlYXR1cmUuIElmIHRoZSBj bGllbnQgcmVxdWVzdHMgdGhlICJfcHFfLmV4dGVuZGVkX3F1ZXJ5X2NhbmNlbCIKcHJvdG9j b2wgZmVhdHVyZSwgdGhlIHNlcnZlciB3aWxsIGdlbmVyYXRlIGEgbG9uZ2VyIDI1Ni1iaXQK Y2FuY2VsbGF0aW9uIGtleS4gSG93ZXZlciwgdGhlIG5ldyBsb25nZXIga2V5IGxlbmd0aCBp cyBub3QgaGFyZGNvZGVkCmluIHRoZSBwcm90b2NvbCBhbnltb3JlLCB0aGUgY2xpZW50IGlz IGV4cGVjdGVkIHRvIGRlYWwgd2l0aCB2YXJpYWJsZQpsZW5ndGgga2V5cywgdXAgdG8gc29t ZSByZWFzb25hYmxlIHVwcGVyIGxpbWl0IChUT0RPOiBkb2N1bWVudCB0aGUKbWF4aW11bSku ICBUaGlzIGZsZXhpYmlsaXR5IGFsbG93cyBlLmcuIGEgY29ubmVjdGlvbiBwb29sZXIgdG8g YWRkCm1vcmUgaW5mb3JtYXRpb24gdG8gdGhlIGNhbmNlbCBrZXksIHdoaWNoIG1pZ2h0IGJl IHVzZWZ1bCBmb3IgZmluZGluZwp0aGUgY29ubmVjdGlvbi4gSWYgdGhlIGNsaWVudCBkb2Vz bid0IHJlcXVlc3QgdGhlIG9wdGlvbmFsIHByb3RvY29sCmZlYXR1cmUsIHRoZSBzZXJ2ZXIg Z2VuZXJhdGVzIGEgMzItYml0IGtleSBsaWtlIGJlZm9yZS4KLS0tCiBzcmMvYmFja2VuZC9h Y2Nlc3MvdHJhbnNhbS9wYXJhbGxlbC5jIHwgIDYgKy0tLQogc3JjL2JhY2tlbmQvcG9zdG1h c3Rlci9wb3N0bWFzdGVyLmMgICB8IDUyICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQog c3JjL2JhY2tlbmQvc3RvcmFnZS9pcGMvcG1zaWduYWwuYyAgICB8IDI5ICsrKysrKysrKysr LS0tLQogc3JjL2JhY2tlbmQvc3RvcmFnZS9sbWdyL3Byb2MuYyAgICAgICB8ICA5ICsrKy0t CiBzcmMvYmFja2VuZC90Y29wL3Bvc3RncmVzLmMgICAgICAgICAgIHwgIDIgKy0KIHNyYy9i YWNrZW5kL3V0aWxzL2luaXQvZ2xvYmFscy5jICAgICAgfCAgMSAtCiBzcmMvaW5jbHVkZS9s aWJwcS9saWJwcS1iZS5oICAgICAgICAgIHwgIDUgKysrCiBzcmMvaW5jbHVkZS9saWJwcS9w cWNvbW0uaCAgICAgICAgICAgIHwgIDUgKy0tCiBzcmMvaW5jbHVkZS9taXNjYWRtaW4uaCAg ICAgICAgICAgICAgIHwgIDMgKy0KIHNyYy9pbmNsdWRlL3N0b3JhZ2UvcG1zaWduYWwuaCAg ICAgICAgfCAgNiArKy0tCiBzcmMvaW50ZXJmYWNlcy9saWJwcS9mZS1jYW5jZWwuYyAgICAg IHwgMzQgKysrKysrKysrLS0tLS0tLS0tCiBzcmMvaW50ZXJmYWNlcy9saWJwcS9mZS1jb25u ZWN0LmMgICAgIHwgMjYgKysrKysrKysrKy0tLS0KIHNyYy9pbnRlcmZhY2VzL2xpYnBxL2Zl LXByb3RvY29sMy5jICAgfCAzMiArKysrKysrKysrKysrKy0tLQogc3JjL2ludGVyZmFjZXMv bGlicHEvbGlicHEtaW50LmggICAgICB8IDEwICsrKystLQogMTQgZmlsZXMgY2hhbmdlZCwg MTQ4IGluc2VydGlvbnMoKyksIDcyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9i YWNrZW5kL2FjY2Vzcy90cmFuc2FtL3BhcmFsbGVsLmMgYi9zcmMvYmFja2VuZC9hY2Nlc3Mv dHJhbnNhbS9wYXJhbGxlbC5jCmluZGV4IDg0OWEwM2U0YjY1Li42NTJiOTYyMjVhNCAxMDA2 NDQKLS0tIGEvc3JjL2JhY2tlbmQvYWNjZXNzL3RyYW5zYW0vcGFyYWxsZWwuYworKysgYi9z cmMvYmFja2VuZC9hY2Nlc3MvdHJhbnNhbS9wYXJhbGxlbC5jCkBAIC0xMTM1LDcgKzExMzUs NiBAQCBIYW5kbGVQYXJhbGxlbE1lc3NhZ2UoUGFyYWxsZWxDb250ZXh0ICpwY3h0LCBpbnQg aSwgU3RyaW5nSW5mbyBtc2cpCiAJCQl7CiAJCQkJaW50MzIJCXBpZCA9IHBxX2dldG1zZ2lu dChtc2csIDQpOwogCi0JCQkJKHZvaWQpIHBxX2dldG1zZ2ludChtc2csIDQpOwkvKiBkaXNj YXJkIGNhbmNlbCBrZXkgKi8KIAkJCQkodm9pZCkgcHFfZ2V0bXNnZW5kKG1zZyk7CiAJCQkJ cGN4dC0+d29ya2VyW2ldLnBpZCA9IHBpZDsKIAkJCQlicmVhazsKQEAgLTEzNzIsMTMgKzEz NzEsMTAgQEAgUGFyYWxsZWxXb3JrZXJNYWluKERhdHVtIG1haW5fYXJnKQogCS8qCiAJICog U2VuZCBhIEJhY2tlbmRLZXlEYXRhIG1lc3NhZ2UgdG8gdGhlIHByb2Nlc3MgdGhhdCBpbml0 aWF0ZWQgcGFyYWxsZWxpc20KIAkgKiBzbyB0aGF0IGl0IGhhcyBhY2Nlc3MgdG8gb3VyIFBJ RCBiZWZvcmUgaXQgcmVjZWl2ZXMgYW55IG90aGVyIG1lc3NhZ2VzCi0JICogZnJvbSB1cy4g IE91ciBjYW5jZWwga2V5IGlzIHNlbnQsIHRvbywgc2luY2UgdGhhdCdzIHRoZSB3YXkgdGhl Ci0JICogcHJvdG9jb2wgbWVzc2FnZSBpcyBkZWZpbmVkLCBidXQgaXQgd29uJ3QgYWN0dWFs bHkgYmUgdXNlZCBmb3IgYW55dGhpbmcKLQkgKiBpbiB0aGlzIGNhc2UuCisJICogZnJvbSB1 cy4KIAkgKi8KIAlwcV9iZWdpbm1lc3NhZ2UoJm1zZ2J1ZiwgUHFNc2dfQmFja2VuZEtleURh dGEpOwogCXBxX3NlbmRpbnQzMigmbXNnYnVmLCAoaW50MzIpIE15UHJvY1BpZCk7Ci0JcHFf c2VuZGludDMyKCZtc2didWYsIChpbnQzMikgTXlDYW5jZWxLZXkpOwogCXBxX2VuZG1lc3Nh Z2UoJm1zZ2J1Zik7CiAKIAkvKgpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvcG9zdG1hc3Rl ci9wb3N0bWFzdGVyLmMgYi9zcmMvYmFja2VuZC9wb3N0bWFzdGVyL3Bvc3RtYXN0ZXIuYwpp bmRleCA0MDhmOGZiOWI2ZC4uNDdjMjllOGMxMGUgMTAwNjQ0Ci0tLSBhL3NyYy9iYWNrZW5k L3Bvc3RtYXN0ZXIvcG9zdG1hc3Rlci5jCisrKyBiL3NyYy9iYWNrZW5kL3Bvc3RtYXN0ZXIv cG9zdG1hc3Rlci5jCkBAIC00MjIsNyArNDIyLDcgQEAgc3RhdGljIGludAlTZXJ2ZXJMb29w KHZvaWQpOwogc3RhdGljIGludAlCYWNrZW5kU3RhcnR1cChQb3J0ICpwb3J0KTsKIHN0YXRp YyBpbnQJUHJvY2Vzc1N0YXJ0dXBQYWNrZXQoUG9ydCAqcG9ydCwgYm9vbCBzc2xfZG9uZSwg Ym9vbCBnc3NfZG9uZSk7CiBzdGF0aWMgdm9pZCBTZW5kTmVnb3RpYXRlUHJvdG9jb2xWZXJz aW9uKExpc3QgKnVucmVjb2duaXplZF9wcm90b2NvbF9vcHRpb25zKTsKLXN0YXRpYyB2b2lk IHByb2Nlc3NDYW5jZWxSZXF1ZXN0KFBvcnQgKnBvcnQsIHZvaWQgKnBrdCk7CitzdGF0aWMg dm9pZCBwcm9jZXNzQ2FuY2VsUmVxdWVzdChQb3J0ICpwb3J0LCB2b2lkICpwa3QsIGludCBw a3RsZW4pOwogc3RhdGljIHZvaWQgcmVwb3J0X2ZvcmtfZmFpbHVyZV90b19jbGllbnQoUG9y dCAqcG9ydCwgaW50IGVycm51bSk7CiBzdGF0aWMgQ0FDX3N0YXRlIGNhbkFjY2VwdENvbm5l Y3Rpb25zKGludCBiYWNrZW5kX3R5cGUpOwogc3RhdGljIHZvaWQgc2lnbmFsX2NoaWxkKHBp ZF90IHBpZCwgaW50IHNpZ25hbCk7CkBAIC01MDEsNyArNTAxLDcgQEAgdHlwZWRlZiBzdHJ1 Y3QKIAlCYWNrZ3JvdW5kV29ya2VyIGJnd29ya2VyOwogCiAJY2hhcgkJRGF0YURpcltNQVhQ R1BBVEhdOwotCWludDMyCQlNeUNhbmNlbEtleTsKKwljaGFyCQlNeUNhbmNlbEtleVtDQU5D RUxfS0VZX0xFTkdUSF07CiAJaW50CQkJTXlQTUNoaWxkU2xvdDsKICNpZm5kZWYgV0lOMzIK IAl1bnNpZ25lZCBsb25nIFVzZWRTaG1lbVNlZ0lEOwpAQCAtMjAwOCwxNiArMjAwOCw5IEBA IFByb2Nlc3NTdGFydHVwUGFja2V0KFBvcnQgKnBvcnQsIGJvb2wgc3NsX2RvbmUsIGJvb2wg Z3NzX2RvbmUpCiAJICovCiAJcG9ydC0+cHJvdG8gPSBwcm90byA9IHBnX250b2gzMigqKChQ cm90b2NvbFZlcnNpb24gKikgYnVmKSk7CiAKLQlpZiAocHJvdG8gPT0gQ0FOQ0VMX1JFUVVF U1RfQ09ERSkKKwlpZiAocHJvdG8gPT0gRVhURU5ERURfQ0FOQ0VMX1JFUVVFU1RfQ09ERSB8 fCBwcm90byA9PSBDQU5DRUxfUkVRVUVTVF9DT0RFKQogCXsKLQkJaWYgKGxlbiAhPSBzaXpl b2YoQ2FuY2VsUmVxdWVzdFBhY2tldCkpCi0JCXsKLQkJCWVyZXBvcnQoQ09NTUVSUk9SLAot CQkJCQkoZXJyY29kZShFUlJDT0RFX1BST1RPQ09MX1ZJT0xBVElPTiksCi0JCQkJCSBlcnJt c2coImludmFsaWQgbGVuZ3RoIG9mIHN0YXJ0dXAgcGFja2V0IikpKTsKLQkJCXJldHVybiBT VEFUVVNfRVJST1I7Ci0JCX0KLQkJcHJvY2Vzc0NhbmNlbFJlcXVlc3QocG9ydCwgYnVmKTsK KwkJcHJvY2Vzc0NhbmNlbFJlcXVlc3QocG9ydCwgYnVmLCBsZW4pOwogCQkvKiBOb3QgcmVh bGx5IGFuIGVycm9yLCBidXQgd2UgZG9uJ3Qgd2FudCB0byBwcm9jZWVkIGZ1cnRoZXIgKi8K IAkJcmV0dXJuIFNUQVRVU19FUlJPUjsKIAl9CkBAIC0yMjAyLDExICsyMTk1LDE2IEBAIHJl dHJ5MToKIAkJCXsKIAkJCQkvKgogCQkJCSAqIEFueSBvcHRpb24gYmVnaW5uaW5nIHdpdGgg X3BxXy4gaXMgcmVzZXJ2ZWQgZm9yIHVzZSBhcyBhCi0JCQkJICogcHJvdG9jb2wtbGV2ZWwg b3B0aW9uLCBidXQgYXQgcHJlc2VudCBubyBzdWNoIG9wdGlvbnMgYXJlCi0JCQkJICogZGVm aW5lZC4KKwkJCQkgKiBwcm90b2NvbC1sZXZlbCBvcHRpb24uIEF0IHByZXNlbnQsIHRoZXJl IGlzIG9ubHkgdGhpcyBvbmUuCiAJCQkJICovCi0JCQkJdW5yZWNvZ25pemVkX3Byb3RvY29s X29wdGlvbnMgPQotCQkJCQlsYXBwZW5kKHVucmVjb2duaXplZF9wcm90b2NvbF9vcHRpb25z LCBwc3RyZHVwKG5hbWVwdHIpKTsKKwkJCQlpZiAoc3RyY21wKG5hbWVwdHIgKyA1LCAiZXh0 ZW5kZWRfcXVlcnlfY2FuY2VsIikgPT0gMCkKKwkJCQl7CisJCQkJCS8qIHRoZSB2YWx1ZSBp cyBpZ25vcmVkICovCisJCQkJCXBvcnQtPmV4dGVuZGVkX3F1ZXJ5X2NhbmNlbCA9IHRydWU7 CisJCQkJfQorCQkJCWVsc2UKKwkJCQkJdW5yZWNvZ25pemVkX3Byb3RvY29sX29wdGlvbnMg PQorCQkJCQkJbGFwcGVuZCh1bnJlY29nbml6ZWRfcHJvdG9jb2xfb3B0aW9ucywgcHN0cmR1 cChuYW1lcHRyKSk7CiAJCQl9CiAJCQllbHNlCiAJCQl7CkBAIC0yMzE5LDE2ICsyMzE3LDI3 IEBAIFNlbmROZWdvdGlhdGVQcm90b2NvbFZlcnNpb24oTGlzdCAqdW5yZWNvZ25pemVkX3By b3RvY29sX29wdGlvbnMpCiAgKiBOb3RoaW5nIGlzIHNlbnQgYmFjayB0byB0aGUgY2xpZW50 LgogICovCiBzdGF0aWMgdm9pZAotcHJvY2Vzc0NhbmNlbFJlcXVlc3QoUG9ydCAqcG9ydCwg dm9pZCAqcGt0KQorcHJvY2Vzc0NhbmNlbFJlcXVlc3QoUG9ydCAqcG9ydCwgdm9pZCAqcGt0 LCBpbnQgcGt0bGVuKQogewogCUNhbmNlbFJlcXVlc3RQYWNrZXQgKmNhbmMgPSAoQ2FuY2Vs UmVxdWVzdFBhY2tldCAqKSBwa3Q7Ci0JaW50CQkJYmFja2VuZFBJRDsKLQlpbnQzMgkJY2Fu Y2VsQXV0aENvZGU7CisJaW50CQkJbGVuOwogCi0JYmFja2VuZFBJRCA9IChpbnQpIHBnX250 b2gzMihjYW5jLT5iYWNrZW5kUElEKTsKLQljYW5jZWxBdXRoQ29kZSA9IChpbnQzMikgcGdf bnRvaDMyKGNhbmMtPmNhbmNlbEF1dGhDb2RlKTsKKwlpZiAocGt0bGVuIDwgb2Zmc2V0b2Yo Q2FuY2VsUmVxdWVzdFBhY2tldCwgY2FuY2VsQXV0aENvZGUpKQorCXsKKwkJZXJlcG9ydChD T01NRVJST1IsCisJCQkJKGVycmNvZGUoRVJSQ09ERV9QUk9UT0NPTF9WSU9MQVRJT04pLAor CQkJCSBlcnJtc2coImludmFsaWQgbGVuZ3RoIG9mIGV4dGVuZGVkIHF1ZXIgY2FuY2VsIHBh Y2tldCIpKSk7CisJCXJldHVybjsKKwl9CisJY2FuYyA9IChDYW5jZWxSZXF1ZXN0UGFja2V0 ICopIHBrdDsKKwlsZW4gPSBwa3RsZW4gLSBvZmZzZXRvZihDYW5jZWxSZXF1ZXN0UGFja2V0 LCBjYW5jZWxBdXRoQ29kZSk7CisKKwlpZiAobGVuICE9IDQgJiYgY2FuYy0+Y2FuY2VsUmVx dWVzdENvZGUgPT0gQ0FOQ0VMX1JFUVVFU1RfQ09ERSkKKwkJZXJlcG9ydChDT01NRVJST1Is CisJCQkJKGVycmNvZGUoRVJSQ09ERV9QUk9UT0NPTF9WSU9MQVRJT04pLAorCQkJCSBlcnJt c2coImludmFsaWQgbGVuZ3RoIG9mIGNhbmNlbCByZXF1ZXN0IHBhY2tldCIpKSk7CiAKLQlT ZW5kQ2FuY2VsUmVxdWVzdChiYWNrZW5kUElELCBjYW5jZWxBdXRoQ29kZSk7CisJU2VuZENh bmNlbFJlcXVlc3QocGdfbnRvaDMyKGNhbmMtPmJhY2tlbmRQSUQpLCBjYW5jLT5jYW5jZWxB dXRoQ29kZSwgbGVuKTsKIH0KIAogLyoKQEAgLTU5ODEsNyArNTk5MCw2IEBAIHNhdmVfYmFj a2VuZF92YXJpYWJsZXMoQmFja2VuZFBhcmFtZXRlcnMgKnBhcmFtLCBQb3J0ICpwb3J0LCBC YWNrZ3JvdW5kV29ya2VyICp3CiAKIAlzdHJsY3B5KHBhcmFtLT5EYXRhRGlyLCBEYXRhRGly LCBNQVhQR1BBVEgpOwogCi0JcGFyYW0tPk15Q2FuY2VsS2V5ID0gTXlDYW5jZWxLZXk7CiAJ cGFyYW0tPk15UE1DaGlsZFNsb3QgPSBNeVBNQ2hpbGRTbG90OwogCiAjaWZkZWYgV0lOMzIK ZGlmZiAtLWdpdCBhL3NyYy9iYWNrZW5kL3N0b3JhZ2UvaXBjL3Btc2lnbmFsLmMgYi9zcmMv YmFja2VuZC9zdG9yYWdlL2lwYy9wbXNpZ25hbC5jCmluZGV4IDk1MTZiODY5Y2IyLi43OTc1 MWI1MTNhMCAxMDA2NDQKLS0tIGEvc3JjL2JhY2tlbmQvc3RvcmFnZS9pcGMvcG1zaWduYWwu YworKysgYi9zcmMvYmFja2VuZC9zdG9yYWdlL2lwYy9wbXNpZ25hbC5jCkBAIC03Miw3ICs3 Miw4IEBAIHR5cGVkZWYgc3RydWN0IENoaWxkU2xvdERhdGEKIAlwZ19hdG9taWNfdWludDMy IHN0YXRlOwogCiAJaW50CQkJcGlkOwotCWludDMyCQljYW5jZWxfa2V5OworCWludAkJCWNh bmNlbF9rZXlfbGVuOworCWNoYXIJCWNhbmNlbF9rZXlbTUFYX0NBTkNFTF9LRVlfTEVOR1RI XTsKIH0gQ2hpbGRTbG90RGF0YTsKIAogLyogInR5cGVkZWYgc3RydWN0IFBNU2lnbmFsRGF0 YSBQTVNpZ25hbERhdGEiIGFwcGVhcnMgaW4gcG1zaWduYWwuaCAqLwpAQCAtMzI4LDE2ICsz MjksMTggQEAgSXNQb3N0bWFzdGVyQ2hpbGRXYWxTZW5kZXIoaW50IHNsb3QpCiAgKiBhY3Rp dmVseSB1c2luZyBzaGFyZWQgbWVtb3J5LiAgVGhpcyBpcyBjYWxsZWQgaW4gdGhlIGNoaWxk IHByb2Nlc3MuCiAgKi8KIHZvaWQKLU1hcmtQb3N0bWFzdGVyQ2hpbGRBY3RpdmUoaW50IHBp ZCwgaW50MzIgY2FuY2VsQXV0aENvZGUpCitNYXJrUG9zdG1hc3RlckNoaWxkQWN0aXZlKGlu dCBwaWQsIGNoYXIgKmNhbmNlbEtleSwgaW50IGxlbikKIHsKIAlpbnQJCQlzbG90ID0gTXlQ TUNoaWxkU2xvdDsKIAorCUFzc2VydChsZW4gPD0gTUFYX0NBTkNFTF9LRVlfTEVOR1RIKTsK IAlBc3NlcnQoc2xvdCA+IDAgJiYgc2xvdCA8PSBQTVNpZ25hbFN0YXRlLT5udW1fY2hpbGRf c2xvdHMpOwogCXNsb3QtLTsKIAlBc3NlcnQocGdfYXRvbWljX3JlYWRfdTMyKCZQTVNpZ25h bFN0YXRlLT5jaGlsZF9zbG90c1tzbG90XS5zdGF0ZSkgPT0gUE1fQ0hJTERfQVNTSUdORUQp OwogCVBNU2lnbmFsU3RhdGUtPmNoaWxkX3Nsb3RzW3Nsb3RdLnBpZCA9IHBpZDsKLQlQTVNp Z25hbFN0YXRlLT5jaGlsZF9zbG90c1tzbG90XS5jYW5jZWxfa2V5ID0gY2FuY2VsQXV0aENv ZGU7Ci0JcGdfbWVtb3J5X2JhcnJpZXIoKTsKKwltZW1jcHkoUE1TaWduYWxTdGF0ZS0+Y2hp bGRfc2xvdHNbc2xvdF0uY2FuY2VsX2tleSwgY2FuY2VsS2V5LCBsZW4pOworCVBNU2lnbmFs U3RhdGUtPmNoaWxkX3Nsb3RzW3Nsb3RdLmNhbmNlbF9rZXlfbGVuID0gbGVuOworCXBnX3dy aXRlX2JhcnJpZXIoKTsKIAlwZ19hdG9taWNfd3JpdGVfdTMyKCZQTVNpZ25hbFN0YXRlLT5j aGlsZF9zbG90c1tzbG90XS5zdGF0ZSwgUE1fQ0hJTERfQUNUSVZFKTsKIH0KIApAQCAtNDc4 LDggKzQ4MSwxOCBAQCBQb3N0bWFzdGVyRGVhdGhTaWduYWxJbml0KHZvaWQpCiAjZW5kaWYJ CQkJCQkJLyogVVNFX1BPU1RNQVNURVJfREVBVEhfU0lHTkFMICovCiB9CiAKK3N0YXRpYyBp bnQKK3BnX2NvbnN0X3RpbWVfbWVtY21wKGNvbnN0IHZvaWQgKmEsIGNvbnN0IHZvaWQgKmIs IHNpemVfdCBsZW4pCit7CisJLyoKKwkgKiBGSVhNRTogbmVlZCBhIGNvbnN0YW50IHRpbWUg aW1wbGVtZW50YXRpb24uIEltcGxlbWVudCBvbmUgc29tZXdoZXJlIGluCisJICogc3JjL3Bv cnQuCisJICovCisJcmV0dXJuIG1lbWNtcChhLCBiLCBsZW4pOworfQorCiB2b2lkCi1TZW5k Q2FuY2VsUmVxdWVzdChpbnQgYmFja2VuZFBJRCwgaW50MzIgY2FuY2VsQXV0aENvZGUpCitT ZW5kQ2FuY2VsUmVxdWVzdChpbnQgYmFja2VuZFBJRCwgY2hhciAqY2FuY2VsS2V5LCBpbnQg bGVuKQogewogCS8qCiAJICogU2VlIGlmIHdlIGhhdmUgYSBtYXRjaGluZyBiYWNrZW5kLiAg SW4gdGhlIEVYRUNfQkFDS0VORCBjYXNlLCB3ZSBjYW4gbm8KQEAgLTQ5Nyw3ICs1MTAsMTEg QEAgU2VuZENhbmNlbFJlcXVlc3QoaW50IGJhY2tlbmRQSUQsIGludDMyIGNhbmNlbEF1dGhD b2RlKQogCQlwZ19yZWFkX2JhcnJpZXIoKTsKIAkJaWYgKHNsb3QtPnBpZCA9PSBiYWNrZW5k UElEKQogCQl7Ci0JCQlpZiAoc2xvdC0+Y2FuY2VsX2tleSA9PSBjYW5jZWxBdXRoQ29kZSkK KwkJCS8qCisJCQkgKiBVc2UgcGdfY29uc3RfdGltZV9tZW1jbXAoKSB0byBwcmV2ZW50IGFu IGF0dGFja2VyIGZyb20gdXNpbmcKKwkJCSAqIHRpbWluZyB0byByZXZlYWwgdGhlIGNhbmNl bCBrZXkuCisJCQkgKi8KKwkJCWlmIChsZW4gPT0gc2xvdC0+Y2FuY2VsX2tleV9sZW4gJiYg cGdfY29uc3RfdGltZV9tZW1jbXAoc2xvdC0+Y2FuY2VsX2tleSwgY2FuY2VsS2V5LCBsZW4p ID09IDApCiAJCQl7CiAJCQkJLyogRm91bmQgYSBtYXRjaDsgc2lnbmFsIHRoYXQgYmFja2Vu ZCB0byBjYW5jZWwgY3VycmVudCBvcCAqLwogCQkJCWVyZXBvcnQoREVCVUcyLApkaWZmIC0t Z2l0IGEvc3JjL2JhY2tlbmQvc3RvcmFnZS9sbWdyL3Byb2MuYyBiL3NyYy9iYWNrZW5kL3N0 b3JhZ2UvbG1nci9wcm9jLmMKaW5kZXggNTk4NGZlN2Q0NGMuLjdlNGNjZTRjOTFmIDEwMDY0 NAotLS0gYS9zcmMvYmFja2VuZC9zdG9yYWdlL2xtZ3IvcHJvYy5jCisrKyBiL3NyYy9iYWNr ZW5kL3N0b3JhZ2UvbG1nci9wcm9jLmMKQEAgLTM2LDYgKzM2LDcgQEAKICNpbmNsdWRlICJh Y2Nlc3MvdHJhbnNhbS5oIgogI2luY2x1ZGUgImFjY2Vzcy90d29waGFzZS5oIgogI2luY2x1 ZGUgImFjY2Vzcy94bG9ndXRpbHMuaCIKKyNpbmNsdWRlICJsaWJwcS9saWJwcS1iZS5oIgog I2luY2x1ZGUgIm1pc2NhZG1pbi5oIgogI2luY2x1ZGUgInBnc3RhdC5oIgogI2luY2x1ZGUg InBvc3RtYXN0ZXIvYXV0b3ZhY3V1bS5oIgpAQCAtNjgsNiArNjksOSBAQCBib29sCQlsb2df bG9ja193YWl0cyA9IGZhbHNlOwogUEdQUk9DCSAgICpNeVByb2MgPSBOVUxMOwogaW50CQkJ TXlQcm9jTnVtYmVyID0gSU5WQUxJRF9QR1BST0NOTzsKIAorY2hhcgkJTXlDYW5jZWxLZXlb TUFYX0NBTkNFTF9LRVlfTEVOR1RIXTsKK2ludAkJCU15Q2FuY2VsS2V5TGVuZ3RoOworCiAv KgogICogVGhpcyBzcGlubG9jayBwcm90ZWN0cyB0aGUgZnJlZWxpc3Qgb2YgcmVjeWNsZWQg UEdQUk9DIHN0cnVjdHVyZXMuCiAgKiBXZSBjYW5ub3QgdXNlIGFuIExXTG9jayBiZWNhdXNl IHRoZSBMV0xvY2sgbWFuYWdlciBkZXBlbmRzIG9uIGFscmVhZHkKQEAgLTMxNyw3ICszMjEs OCBAQCBJbml0UHJvY2Vzcyh2b2lkKQogCSAqIGJldHRlciBoYXZlIHNvbWV0aGluZyByYW5k b20gaW4gdGhlIGZpZWxkIHRvIHByZXZlbnQgdW5mcmllbmRseSBwZW9wbGUKIAkgKiBmcm9t IHNlbmRpbmcgY2FuY2VscyB0byB0aGVtLgogCSAqLwotCWlmICghcGdfc3Ryb25nX3JhbmRv bSgmTXlDYW5jZWxLZXksIHNpemVvZihpbnQzMikpKQorCU15Q2FuY2VsS2V5TGVuZ3RoID0g KE15UHJvY1BvcnQgIT0gTlVMTCAmJiBNeVByb2NQb3J0LT5leHRlbmRlZF9xdWVyeV9jYW5j ZWwpID8gTUFYX0NBTkNFTF9LRVlfTEVOR1RIIDogNDsKKwlpZiAoIXBnX3N0cm9uZ19yYW5k b20oJk15Q2FuY2VsS2V5LCBNeUNhbmNlbEtleUxlbmd0aCkpCiAJewogCQllcmVwb3J0KEVS Uk9SLAogCQkJCShlcnJjb2RlKEVSUkNPREVfSU5URVJOQUxfRVJST1IpLApAQCAtMzg3LDcg KzM5Miw3IEBAIEluaXRQcm9jZXNzKHZvaWQpCiAJICovCiAJaWYgKElzVW5kZXJQb3N0bWFz dGVyICYmICFJc0F1dG9WYWN1dW1MYXVuY2hlclByb2Nlc3MoKSAmJgogCQkhSXNMb2dpY2Fs U2xvdFN5bmNXb3JrZXIoKSkKLQkJTWFya1Bvc3RtYXN0ZXJDaGlsZEFjdGl2ZShNeVByb2NQ aWQsIE15Q2FuY2VsS2V5KTsKKwkJTWFya1Bvc3RtYXN0ZXJDaGlsZEFjdGl2ZShNeVByb2NQ aWQsIE15Q2FuY2VsS2V5LCBNeUNhbmNlbEtleUxlbmd0aCk7CiAKIAkvKgogCSAqIEluaXRp YWxpemUgYWxsIGZpZWxkcyBvZiBNeVByb2MsIGV4Y2VwdCBmb3IgdGhvc2UgcHJldmlvdXNs eQpkaWZmIC0tZ2l0IGEvc3JjL2JhY2tlbmQvdGNvcC9wb3N0Z3Jlcy5jIGIvc3JjL2JhY2tl bmQvdGNvcC9wb3N0Z3Jlcy5jCmluZGV4IDU5YWI4MTJkMmU4Li43MTY0YWEzMTk3OCAxMDA2 NDQKLS0tIGEvc3JjL2JhY2tlbmQvdGNvcC9wb3N0Z3Jlcy5jCisrKyBiL3NyYy9iYWNrZW5k L3Rjb3AvcG9zdGdyZXMuYwpAQCAtNDI3NCw3ICs0Mjc0LDcgQEAgUG9zdGdyZXNNYWluKGNv bnN0IGNoYXIgKmRibmFtZSwgY29uc3QgY2hhciAqdXNlcm5hbWUpCiAKIAkJcHFfYmVnaW5t ZXNzYWdlKCZidWYsIFBxTXNnX0JhY2tlbmRLZXlEYXRhKTsKIAkJcHFfc2VuZGludDMyKCZi dWYsIChpbnQzMikgTXlQcm9jUGlkKTsKLQkJcHFfc2VuZGludDMyKCZidWYsIChpbnQzMikg TXlDYW5jZWxLZXkpOworCQlwcV9zZW5kYnl0ZXMoJmJ1ZiwgTXlDYW5jZWxLZXksIE15Q2Fu Y2VsS2V5TGVuZ3RoKTsKIAkJcHFfZW5kbWVzc2FnZSgmYnVmKTsKIAkJLyogTmVlZCBub3Qg Zmx1c2ggc2luY2UgUmVhZHlGb3JRdWVyeSB3aWxsIGRvIGl0LiAqLwogCX0KZGlmZiAtLWdp dCBhL3NyYy9iYWNrZW5kL3V0aWxzL2luaXQvZ2xvYmFscy5jIGIvc3JjL2JhY2tlbmQvdXRp bHMvaW5pdC9nbG9iYWxzLmMKaW5kZXggNWVhZWU4OGQ5NjkuLjdlZmNkYWU5NjU3IDEwMDY0 NAotLS0gYS9zcmMvYmFja2VuZC91dGlscy9pbml0L2dsb2JhbHMuYworKysgYi9zcmMvYmFj a2VuZC91dGlscy9pbml0L2dsb2JhbHMuYwpAQCAtNDYsNyArNDYsNiBAQCBpbnQJCQlNeVBy b2NQaWQ7CiBwZ190aW1lX3QJTXlTdGFydFRpbWU7CiBUaW1lc3RhbXBUeiBNeVN0YXJ0VGlt ZXN0YW1wOwogc3RydWN0IFBvcnQgKk15UHJvY1BvcnQ7Ci1pbnQzMgkJTXlDYW5jZWxLZXk7 CiBpbnQJCQlNeVBNQ2hpbGRTbG90OwogCiAvKgpkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUv bGlicHEvbGlicHEtYmUuaCBiL3NyYy9pbmNsdWRlL2xpYnBxL2xpYnBxLWJlLmgKaW5kZXgg NDdkNjZkNTUyNDEuLjNhZWJmOTJhNzU0IDEwMDY0NAotLS0gYS9zcmMvaW5jbHVkZS9saWJw cS9saWJwcS1iZS5oCisrKyBiL3NyYy9pbmNsdWRlL2xpYnBxL2xpYnBxLWJlLmgKQEAgLTE3 NSw2ICsxNzUsMTEgQEAgdHlwZWRlZiBzdHJ1Y3QgUG9ydAogCSAqLwogCWNoYXIJICAgKmFw cGxpY2F0aW9uX25hbWU7CiAKKwkvKgorCSAqIFByb3RvY29sIG9wdGlvbnMgc3VwcG9ydGVk IGJ5IHRoZSBjbGllbnQKKwkgKi8KKwlib29sCQlleHRlbmRlZF9xdWVyeV9jYW5jZWw7CisK IAkvKgogCSAqIEluZm9ybWF0aW9uIHRoYXQgbmVlZHMgdG8gYmUgaGVsZCBkdXJpbmcgdGhl IGF1dGhlbnRpY2F0aW9uIGN5Y2xlLgogCSAqLwpkaWZmIC0tZ2l0IGEvc3JjL2luY2x1ZGUv bGlicHEvcHFjb21tLmggYi9zcmMvaW5jbHVkZS9saWJwcS9wcWNvbW0uaAppbmRleCA5YWU0 NjljODZjNC4uOWI1NTc5YTUzODYgMTAwNjQ0Ci0tLSBhL3NyYy9pbmNsdWRlL2xpYnBxL3Bx Y29tbS5oCisrKyBiL3NyYy9pbmNsdWRlL2xpYnBxL3BxY29tbS5oCkBAIC0xMjksNiArMTI5 LDcgQEAgdHlwZWRlZiB1aW50MzIgQXV0aFJlcXVlc3Q7CiAgKiBUaGUgY2FuY2VsIHJlcXVl c3QgY29kZSBtdXN0IG5vdCBtYXRjaCBhbnkgcHJvdG9jb2wgdmVyc2lvbiBudW1iZXIKICAq IHdlJ3JlIGV2ZXIgbGlrZWx5IHRvIHVzZS4gIFRoaXMgcmFuZG9tIGNob2ljZSBzaG91bGQg ZG8uCiAgKi8KKyNkZWZpbmUgRVhURU5ERURfQ0FOQ0VMX1JFUVVFU1RfQ09ERSBQR19QUk9U T0NPTCgxMjM0LDU2NzcpCiAjZGVmaW5lIENBTkNFTF9SRVFVRVNUX0NPREUgUEdfUFJPVE9D T0woMTIzNCw1Njc4KQogCiB0eXBlZGVmIHN0cnVjdCBDYW5jZWxSZXF1ZXN0UGFja2V0CkBA IC0xMzYsMTAgKzEzNywxMCBAQCB0eXBlZGVmIHN0cnVjdCBDYW5jZWxSZXF1ZXN0UGFja2V0 CiAJLyogTm90ZSB0aGF0IGVhY2ggZmllbGQgaXMgc3RvcmVkIGluIG5ldHdvcmsgYnl0ZSBv cmRlciEgKi8KIAlNc2dUeXBlCQljYW5jZWxSZXF1ZXN0Q29kZTsJLyogY29kZSB0byBpZGVu dGlmeSBhIGNhbmNlbCByZXF1ZXN0ICovCiAJdWludDMyCQliYWNrZW5kUElEOwkJLyogUElE IG9mIGNsaWVudCdzIGJhY2tlbmQgKi8KLQl1aW50MzIJCWNhbmNlbEF1dGhDb2RlOyAvKiBz ZWNyZXQga2V5IHRvIGF1dGhvcml6ZSBjYW5jZWwgKi8KKwljaGFyCQljYW5jZWxBdXRoQ29k ZVtGTEVYSUJMRV9BUlJBWV9NRU1CRVJdOwkvKiBzZWNyZXQga2V5IHRvCisJCQkJCQkJCQkJ CQkJCSAqIGF1dGhvcml6ZSBjYW5jZWwgKi8KIH0gQ2FuY2VsUmVxdWVzdFBhY2tldDsKIAot CiAvKgogICogQSBjbGllbnQgY2FuIGFsc28gc3RhcnQgYnkgc2VuZGluZyBhIFNTTCBvciBH U1NBUEkgbmVnb3RpYXRpb24gcmVxdWVzdCB0bwogICogZ2V0IGEgc2VjdXJlIGNoYW5uZWwu CmRpZmYgLS1naXQgYS9zcmMvaW5jbHVkZS9taXNjYWRtaW4uaCBiL3NyYy9pbmNsdWRlL21p c2NhZG1pbi5oCmluZGV4IDc1NmQxNDRjMzIzLi5iNzBiNDEyZWE5MCAxMDA2NDQKLS0tIGEv c3JjL2luY2x1ZGUvbWlzY2FkbWluLmgKKysrIGIvc3JjL2luY2x1ZGUvbWlzY2FkbWluLmgK QEAgLTE5Miw3ICsxOTIsOCBAQCBleHRlcm4gUEdETExJTVBPUlQgcGdfdGltZV90IE15U3Rh cnRUaW1lOwogZXh0ZXJuIFBHRExMSU1QT1JUIFRpbWVzdGFtcFR6IE15U3RhcnRUaW1lc3Rh bXA7CiBleHRlcm4gUEdETExJTVBPUlQgc3RydWN0IFBvcnQgKk15UHJvY1BvcnQ7CiBleHRl cm4gUEdETExJTVBPUlQgc3RydWN0IExhdGNoICpNeUxhdGNoOwotZXh0ZXJuIFBHRExMSU1Q T1JUIGludDMyIE15Q2FuY2VsS2V5OworZXh0ZXJuIFBHRExMSU1QT1JUIGNoYXIgTXlDYW5j ZWxLZXlbXTsKK2V4dGVybiBQR0RMTElNUE9SVCBpbnQgTXlDYW5jZWxLZXlMZW5ndGg7CiBl eHRlcm4gUEdETExJTVBPUlQgaW50IE15UE1DaGlsZFNsb3Q7CiAKIGV4dGVybiBQR0RMTElN UE9SVCBjaGFyIE91dHB1dEZpbGVOYW1lW107CmRpZmYgLS1naXQgYS9zcmMvaW5jbHVkZS9z dG9yYWdlL3Btc2lnbmFsLmggYi9zcmMvaW5jbHVkZS9zdG9yYWdlL3Btc2lnbmFsLmgKaW5k ZXggOGRmZjQ3ZTg2ZTQuLjk0NDIwZWNiMGI1IDEwMDY0NAotLS0gYS9zcmMvaW5jbHVkZS9z dG9yYWdlL3Btc2lnbmFsLmgKKysrIGIvc3JjL2luY2x1ZGUvc3RvcmFnZS9wbXNpZ25hbC5o CkBAIC01Nyw2ICs1Nyw4IEBAIHR5cGVkZWYgZW51bQogLyogUE1TaWduYWxEYXRhIGlzIGFu IG9wYXF1ZSBzdHJ1Y3QsIGRldGFpbHMga25vd24gb25seSB3aXRoaW4gcG1zaWduYWwuYyAq LwogdHlwZWRlZiBzdHJ1Y3QgUE1TaWduYWxEYXRhIFBNU2lnbmFsRGF0YTsKIAorI2RlZmlu ZSBNQVhfQ0FOQ0VMX0tFWV9MRU5HVEgJMzIKKwogLyoKICAqIHByb3RvdHlwZXMgZm9yIGZ1 bmN0aW9ucyBpbiBwbXNpZ25hbC5jCiAgKi8KQEAgLTY5LDEyICs3MSwxMiBAQCBleHRlcm4g UXVpdFNpZ25hbFJlYXNvbiBHZXRRdWl0U2lnbmFsUmVhc29uKHZvaWQpOwogZXh0ZXJuIGlu dAlBc3NpZ25Qb3N0bWFzdGVyQ2hpbGRTbG90KHZvaWQpOwogZXh0ZXJuIGJvb2wgUmVsZWFz ZVBvc3RtYXN0ZXJDaGlsZFNsb3QoaW50IHNsb3QpOwogZXh0ZXJuIGJvb2wgSXNQb3N0bWFz dGVyQ2hpbGRXYWxTZW5kZXIoaW50IHNsb3QpOwotZXh0ZXJuIHZvaWQgTWFya1Bvc3RtYXN0 ZXJDaGlsZEFjdGl2ZShpbnQgcGlkLCBpbnQzMiBjYW5jZWxBdXRoQ29kZSk7CitleHRlcm4g dm9pZCBNYXJrUG9zdG1hc3RlckNoaWxkQWN0aXZlKGludCBwaWQsIGNoYXIgKmNhbmNlbEtl eSwgaW50IGxlbik7CiBleHRlcm4gdm9pZCBNYXJrUG9zdG1hc3RlckNoaWxkSW5hY3RpdmUo dm9pZCk7CiBleHRlcm4gdm9pZCBNYXJrUG9zdG1hc3RlckNoaWxkV2FsU2VuZGVyKHZvaWQp OwogZXh0ZXJuIGJvb2wgUG9zdG1hc3RlcklzQWxpdmVJbnRlcm5hbCh2b2lkKTsKIGV4dGVy biB2b2lkIFBvc3RtYXN0ZXJEZWF0aFNpZ25hbEluaXQodm9pZCk7Ci1leHRlcm4gdm9pZCBT ZW5kQ2FuY2VsUmVxdWVzdChpbnQgYmFja2VuZFBJRCwgaW50MzIgY2FuY2VsQXV0aENvZGUp OworZXh0ZXJuIHZvaWQgU2VuZENhbmNlbFJlcXVlc3QoaW50IGJhY2tlbmRQSUQsIGNoYXIg KmNhbmNlbEtleSwgaW50IGxlbik7CiAKIAogLyoKZGlmZiAtLWdpdCBhL3NyYy9pbnRlcmZh Y2VzL2xpYnBxL2ZlLWNhbmNlbC5jIGIvc3JjL2ludGVyZmFjZXMvbGlicHEvZmUtY2FuY2Vs LmMKaW5kZXggNTFmOGQ4YTc4YzQuLjZjOWJmZWFhMzNmIDEwMDY0NAotLS0gYS9zcmMvaW50 ZXJmYWNlcy9saWJwcS9mZS1jYW5jZWwuYworKysgYi9zcmMvaW50ZXJmYWNlcy9saWJwcS9m ZS1jYW5jZWwuYwpAQCAtMzQsNiArMzQsOCBAQCBQR2NhbmNlbCAqCiBQUWdldENhbmNlbChQ R2Nvbm4gKmNvbm4pCiB7CiAJUEdjYW5jZWwgICAqY2FuY2VsOworCWludAkJCWNhbmNlbF9y ZXFfbGVuOworCUNhbmNlbFJlcXVlc3RQYWNrZXQgKnJlcTsKIAogCWlmICghY29ubikKIAkJ cmV0dXJuIE5VTEw7CkBAIC00MSwxMyArNDMsMTMgQEAgUFFnZXRDYW5jZWwoUEdjb25uICpj b25uKQogCWlmIChjb25uLT5zb2NrID09IFBHSU5WQUxJRF9TT0NLRVQpCiAJCXJldHVybiBO VUxMOwogCi0JY2FuY2VsID0gbWFsbG9jKHNpemVvZihQR2NhbmNlbCkpOworCWNhbmNlbF9y ZXFfbGVuID0gb2Zmc2V0b2YoQ2FuY2VsUmVxdWVzdFBhY2tldCwgY2FuY2VsQXV0aENvZGUp ICsgY29ubi0+YmVfY2FuY2VsX2tleV9sZW47CisJY2FuY2VsID0gbWFsbG9jKG9mZnNldG9m KFBHY2FuY2VsLCBjYW5jZWxfcmVxKSArIGNhbmNlbF9yZXFfbGVuKTsKIAlpZiAoY2FuY2Vs ID09IE5VTEwpCiAJCXJldHVybiBOVUxMOwogCiAJbWVtY3B5KCZjYW5jZWwtPnJhZGRyLCAm Y29ubi0+cmFkZHIsIHNpemVvZihTb2NrQWRkcikpOwotCWNhbmNlbC0+YmVfcGlkID0gY29u bi0+YmVfcGlkOwotCWNhbmNlbC0+YmVfa2V5ID0gY29ubi0+YmVfa2V5OworCiAJLyogV2Ug dXNlIC0xIHRvIGluZGljYXRlIGFuIHVuc2V0IGNvbm5lY3Rpb24gb3B0aW9uICovCiAJY2Fu Y2VsLT5wZ3RjcF91c2VyX3RpbWVvdXQgPSAtMTsKIAljYW5jZWwtPmtlZXBhbGl2ZXMgPSAt MTsKQEAgLTkwLDYgKzkyLDEzIEBAIFBRZ2V0Q2FuY2VsKFBHY29ubiAqY29ubikKIAkJCWdv dG8gZmFpbDsKIAl9CiAKKwlyZXEgPSAoQ2FuY2VsUmVxdWVzdFBhY2tldCAqKSAmY2FuY2Vs LT5jYW5jZWxfcmVxOworCXJlcS0+Y2FuY2VsUmVxdWVzdENvZGUgPSAoTXNnVHlwZSkgcGdf aHRvbjMyKGNvbm4tPmJlX2NhbmNlbF9rZXlfbGVuID09IDQgPyBDQU5DRUxfUkVRVUVTVF9D T0RFIDogRVhURU5ERURfQ0FOQ0VMX1JFUVVFU1RfQ09ERSk7CisJcmVxLT5iYWNrZW5kUElE ID0gcGdfaHRvbjMyKGNvbm4tPmJlX3BpZCk7CisJbWVtY3B5KHJlcS0+Y2FuY2VsQXV0aENv ZGUsIGNvbm4tPmJlX2NhbmNlbF9rZXksIGNvbm4tPmJlX2NhbmNlbF9rZXlfbGVuKTsKKwkv KiBpbmNsdWRlIHRoZSBsZW5ndGggZmllbGQgaXRzZWxmIGluIHRoZSBsZW5ndGggKi8KKwlj YW5jZWwtPmNhbmNlbF9wa3RfbGVuID0gcGdfaHRvbjMyKGNhbmNlbF9yZXFfbGVuICsgNCk7 CisKIAlyZXR1cm4gY2FuY2VsOwogCiBmYWlsOgpAQCAtMTUwLDExICsxNTksOCBAQCBQUWNh bmNlbChQR2NhbmNlbCAqY2FuY2VsLCBjaGFyICplcnJidWYsIGludCBlcnJidWZzaXplKQog CWludAkJCXNhdmVfZXJybm8gPSBTT0NLX0VSUk5POwogCXBnc29ja2V0CXRtcHNvY2sgPSBQ R0lOVkFMSURfU09DS0VUOwogCWludAkJCW1heGxlbjsKLQlzdHJ1Y3QKLQl7Ci0JCXVpbnQz MgkJcGFja2V0bGVuOwotCQlDYW5jZWxSZXF1ZXN0UGFja2V0IGNwOwotCX0JCQljcnA7CisJ Y2hhcgkJcmVjdmJ1ZjsKKwlpbnQJCQljYW5jZWxfcGt0X2xlbjsKIAogCWlmICghY2FuY2Vs KQogCXsKQEAgLTI1NiwxNSArMjYyLDExIEBAIHJldHJ5MzoKIAkJZ290byBjYW5jZWxfZXJy UmV0dXJuOwogCX0KIAotCS8qIENyZWF0ZSBhbmQgc2VuZCB0aGUgY2FuY2VsIHJlcXVlc3Qg cGFja2V0LiAqLwotCi0JY3JwLnBhY2tldGxlbiA9IHBnX2h0b24zMigodWludDMyKSBzaXpl b2YoY3JwKSk7Ci0JY3JwLmNwLmNhbmNlbFJlcXVlc3RDb2RlID0gKE1zZ1R5cGUpIHBnX2h0 b24zMihDQU5DRUxfUkVRVUVTVF9DT0RFKTsKLQljcnAuY3AuYmFja2VuZFBJRCA9IHBnX2h0 b24zMihjYW5jZWwtPmJlX3BpZCk7Ci0JY3JwLmNwLmNhbmNlbEF1dGhDb2RlID0gcGdfaHRv bjMyKGNhbmNlbC0+YmVfa2V5KTsKKwkvKiBTZW5kIHRoZSBjYW5jZWwgcmVxdWVzdCBwYWNr ZXQuICovCisJY2FuY2VsX3BrdF9sZW4gPSBwZ19udG9oMzIoY2FuY2VsLT5jYW5jZWxfcGt0 X2xlbik7CiAKIHJldHJ5NDoKLQlpZiAoc2VuZCh0bXBzb2NrLCAoY2hhciAqKSAmY3JwLCBz aXplb2YoY3JwKSwgMCkgIT0gKGludCkgc2l6ZW9mKGNycCkpCisJaWYgKHNlbmQodG1wc29j aywgJmNhbmNlbC0+Y2FuY2VsX3BrdF9sZW4sIGNhbmNlbF9wa3RfbGVuLCAwKSAhPSBjYW5j ZWxfcGt0X2xlbikKIAl7CiAJCWlmIChTT0NLX0VSUk5PID09IEVJTlRSKQogCQkJLyogSW50 ZXJydXB0ZWQgc3lzdGVtIGNhbGwgLSB3ZSdsbCBqdXN0IHRyeSBhZ2FpbiAqLwpAQCAtMjgx LDcgKzI4Myw3IEBAIHJldHJ5NDoKIAkgKiByZWFkIHRvIG9idGFpbiBhbnkgZGF0YSwgd2Ug YXJlIGp1c3Qgd2FpdGluZyBmb3IgRU9GIHRvIGJlIHNpZ25hbGVkLgogCSAqLwogcmV0cnk1 OgotCWlmIChyZWN2KHRtcHNvY2ssIChjaGFyICopICZjcnAsIDEsIDApIDwgMCkKKwlpZiAo cmVjdih0bXBzb2NrLCAmcmVjdmJ1ZiwgMSwgMCkgPCAwKQogCXsKIAkJaWYgKFNPQ0tfRVJS Tk8gPT0gRUlOVFIpCiAJCQkvKiBJbnRlcnJ1cHRlZCBzeXN0ZW0gY2FsbCAtIHdlJ2xsIGp1 c3QgdHJ5IGFnYWluICovCmRpZmYgLS1naXQgYS9zcmMvaW50ZXJmYWNlcy9saWJwcS9mZS1j b25uZWN0LmMgYi9zcmMvaW50ZXJmYWNlcy9saWJwcS9mZS1jb25uZWN0LmMKaW5kZXggZDRl MTBhMGM0ZjMuLjUxNDhiMjRiYTM0IDEwMDY0NAotLS0gYS9zcmMvaW50ZXJmYWNlcy9saWJw cS9mZS1jb25uZWN0LmMKKysrIGIvc3JjL2ludGVyZmFjZXMvbGlicHEvZmUtY29ubmVjdC5j CkBAIC02MTcsNyArNjE3LDEyIEBAIHBxRHJvcFNlcnZlckRhdGEoUEdjb25uICpjb25uKQog CWZyZWUoY29ubi0+d3JpdGVfZXJyX21zZyk7CiAJY29ubi0+d3JpdGVfZXJyX21zZyA9IE5V TEw7CiAJY29ubi0+YmVfcGlkID0gMDsKLQljb25uLT5iZV9rZXkgPSAwOworCWlmIChjb25u LT5iZV9jYW5jZWxfa2V5ICE9IE5VTEwpCisJeworCQlmcmVlKGNvbm4tPmJlX2NhbmNlbF9r ZXkpOworCQljb25uLT5iZV9jYW5jZWxfa2V5ID0gTlVMTDsKKwl9CisJY29ubi0+YmVfY2Fu Y2VsX2tleV9sZW4gPSAwOwogfQogCiAKQEAgLTM3MjQsMTQgKzM3MjksMjEgQEAga2VlcF9n b2luZzoJCQkJCQkvKiBXZSB3aWxsIGNvbWUgYmFjayB0byBoZXJlIHVudGlsIHRoZXJlIGlz CiAJCQkJfQogCQkJCWVsc2UgaWYgKGJlcmVzcCA9PSBQcU1zZ19OZWdvdGlhdGVQcm90b2Nv bFZlcnNpb24pCiAJCQkJewotCQkJCQlpZiAocHFHZXROZWdvdGlhdGVQcm90b2NvbFZlcnNp b24zKGNvbm4pKQorCQkJCQlzd2l0Y2ggKHBxR2V0TmVnb3RpYXRlUHJvdG9jb2xWZXJzaW9u Myhjb25uKSkKIAkJCQkJewotCQkJCQkJbGlicHFfYXBwZW5kX2Nvbm5fZXJyb3IoY29ubiwg InJlY2VpdmVkIGludmFsaWQgcHJvdG9jb2wgbmVnb3RpYXRpb24gbWVzc2FnZSIpOwotCQkJ CQkJZ290byBlcnJvcl9yZXR1cm47CisJCQkJCQljYXNlIDA6CisJCQkJCQkJLyogT0ssIHdl IHJlYWQgdGhlIG1lc3NhZ2U7IG1hcmsgZGF0YSBjb25zdW1lZCAqLworCQkJCQkJCWNvbm4t PmluU3RhcnQgPSBjb25uLT5pbkN1cnNvcjsKKwkJCQkJCQkvKiBTdGF5IGluIHRoZSBDT05O RUNUSU9OX0FXQUlUSU5HX1JFU1BPTlNFIHN0YXRlICovCisJCQkJCQkJZ290byBrZWVwX2dv aW5nOworCQkJCQkJY2FzZSAxOgorCQkJCQkJCS8qIE9LLCB3ZSByZWFkIHRoZSBtZXNzYWdl OyBtYXJrIGRhdGEgY29uc3VtZWQgKi8KKwkJCQkJCQljb25uLT5pblN0YXJ0ID0gY29ubi0+ aW5DdXJzb3I7CisJCQkJCQkJZ290byBlcnJvcl9yZXR1cm47CisJCQkJCQljYXNlIEVPRjoK KwkJCQkJCQkvKiBXZSdsbCBjb21lIGJhY2sgd2hlbiB0aGVyZSBpcyBtb3JlIGRhdGEgKi8K KwkJCQkJCQlyZXR1cm4gUEdSRVNfUE9MTElOR19SRUFESU5HOwogCQkJCQl9Ci0JCQkJCS8q IE9LLCB3ZSByZWFkIHRoZSBtZXNzYWdlOyBtYXJrIGRhdGEgY29uc3VtZWQgKi8KLQkJCQkJ Y29ubi0+aW5TdGFydCA9IGNvbm4tPmluQ3Vyc29yOwotCQkJCQlnb3RvIGVycm9yX3JldHVy bjsKIAkJCQl9CiAKIAkJCQkvKiBJdCBpcyBhbiBhdXRoZW50aWNhdGlvbiByZXF1ZXN0LiAq LwpkaWZmIC0tZ2l0IGEvc3JjL2ludGVyZmFjZXMvbGlicHEvZmUtcHJvdG9jb2wzLmMgYi9z cmMvaW50ZXJmYWNlcy9saWJwcS9mZS1wcm90b2NvbDMuYwppbmRleCA3MDFkNThlMTA4Ny4u YzA3OTI5N2Y3MzYgMTAwNjQ0Ci0tLSBhL3NyYy9pbnRlcmZhY2VzL2xpYnBxL2ZlLXByb3Rv Y29sMy5jCisrKyBiL3NyYy9pbnRlcmZhY2VzL2xpYnBxL2ZlLXByb3RvY29sMy5jCkBAIC0z MTAsOCArMzEwLDIyIEBAIHBxUGFyc2VJbnB1dDMoUEdjb25uICpjb25uKQogCQkJCQkgKi8K IAkJCQkJaWYgKHBxR2V0SW50KCYoY29ubi0+YmVfcGlkKSwgNCwgY29ubikpCiAJCQkJCQly ZXR1cm47Ci0JCQkJCWlmIChwcUdldEludCgmKGNvbm4tPmJlX2tleSksIDQsIGNvbm4pKQot CQkJCQkJcmV0dXJuOworCisJCQkJCXsKKwkJCQkJCWludAkJCWNhbmNlbF9rZXlfbGVuID0g NSArIG1zZ0xlbmd0aCAtIChjb25uLT5pbkN1cnNvciAtIGNvbm4tPmluU3RhcnQpOworCisJ CQkJCQljb25uLT5iZV9jYW5jZWxfa2V5ID0gbWFsbG9jKGNhbmNlbF9rZXlfbGVuKTsKKwkJ CQkJCWlmIChjb25uLT5iZV9jYW5jZWxfa2V5ID09IE5VTEwpCisJCQkJCQl7CisJCQkJCQkJ bGlicHFfYXBwZW5kX2Nvbm5fZXJyb3IoY29ubiwgIm91dCBvZiBtZW1vcnkiKTsKKwkJCQkJ CQkvKiBkaXNjYXJkIHRoZSBtZXNzYWdlICovCisJCQkJCQkJY29ubi0+aW5DdXJzb3IgPSBj b25uLT5pblN0YXJ0ICsgNSArIG1zZ0xlbmd0aDsKKwkJCQkJCQlicmVhazsKKwkJCQkJCX0K KwkJCQkJCWlmIChwcUdldG5jaGFyKGNvbm4tPmJlX2NhbmNlbF9rZXksIGNhbmNlbF9rZXlf bGVuLCBjb25uKSkKKwkJCQkJCQlyZXR1cm47CisJCQkJCQljb25uLT5iZV9jYW5jZWxfa2V5 X2xlbiA9IGNhbmNlbF9rZXlfbGVuOworCQkJCQl9CiAJCQkJCWJyZWFrOwogCQkJCWNhc2Ug UHFNc2dfUm93RGVzY3JpcHRpb246CiAJCQkJCWlmIChjb25uLT5lcnJvcl9yZXN1bHQgfHwK QEAgLTE0MDQsNyArMTQxOCw4IEBAIHJlcG9ydEVycm9yUG9zaXRpb24oUFFFeHBCdWZmZXIg bXNnLCBjb25zdCBjaGFyICpxdWVyeSwgaW50IGxvYywgaW50IGVuY29kaW5nKQogLyoKICAq IEF0dGVtcHQgdG8gcmVhZCBhIE5lZ290aWF0ZVByb3RvY29sVmVyc2lvbiBtZXNzYWdlLgog ICogRW50cnk6ICd2JyBtZXNzYWdlIHR5cGUgYW5kIGxlbmd0aCBoYXZlIGFscmVhZHkgYmVl biBjb25zdW1lZC4KLSAqIEV4aXQ6IHJldHVybnMgMCBpZiBzdWNjZXNzZnVsbHkgY29uc3Vt ZWQgbWVzc2FnZS4KKyAqIEV4aXQ6IHJldHVybnMgMCBpZiBzdWNjZXNzZnVsbHkgY29uc3Vt ZWQgbWVzc2FnZSBhbmQgdGhlIG5lZ290aWF0aW9uIHN1Y2NlZWRlZC4KKyAqCQkgcmV0dXJu cyAxIGlmIHN1Y2Nlc3NmdWxseSBjb25zdW1lZCBtZXNzYWdlIGFuZCB0aGUgbmVnb3RpYXRp b24gZmFpbGVkLgogICoJCSByZXR1cm5zIEVPRiBpZiBub3QgZW5vdWdoIGRhdGEuCiAgKi8K IGludApAQCAtMTQxMyw2ICsxNDI4LDcgQEAgcHFHZXROZWdvdGlhdGVQcm90b2NvbFZlcnNp b24zKFBHY29ubiAqY29ubikKIAlpbnQJCQl0bXA7CiAJUHJvdG9jb2xWZXJzaW9uIHRoZWly X3ZlcnNpb247CiAJaW50CQkJbnVtOworCWludAkJCW51bV9yZXF1aXJlZF9taXNzaW5nID0g MDsKIAlQUUV4cEJ1ZmZlckRhdGEgYnVmOwogCiAJaWYgKHBxR2V0SW50KCZ0bXAsIDQsIGNv bm4pICE9IDApCkBAIC0xNDMwLDE2ICsxNDQ2LDIzIEBAIHBxR2V0TmVnb3RpYXRlUHJvdG9j b2xWZXJzaW9uMyhQR2Nvbm4gKmNvbm4pCiAJCQl0ZXJtUFFFeHBCdWZmZXIoJmJ1Zik7CiAJ CQlyZXR1cm4gRU9GOwogCQl9CisJCWlmIChzdHJjbXAoY29ubi0+d29ya0J1ZmZlci5kYXRh LCAiX3BxXy5leHRlbmRlZF9xdWVyeV9jYW5jZWwiKSA9PSAwKQorCQl7CisJCQkvKiB0aGF0 J3Mgb2sgKi8KKwkJCWNvbnRpbnVlOworCQl9CisKIAkJaWYgKGJ1Zi5sZW4gPiAwKQogCQkJ YXBwZW5kUFFFeHBCdWZmZXJDaGFyKCZidWYsICcgJyk7CiAJCWFwcGVuZFBRRXhwQnVmZmVy U3RyKCZidWYsIGNvbm4tPndvcmtCdWZmZXIuZGF0YSk7CisJCW51bV9yZXF1aXJlZF9taXNz aW5nKys7CiAJfQogCiAJaWYgKHRoZWlyX3ZlcnNpb24gPCBjb25uLT5wdmVyc2lvbikKIAkJ bGlicHFfYXBwZW5kX2Nvbm5fZXJyb3IoY29ubiwgInByb3RvY29sIHZlcnNpb24gbm90IHN1 cHBvcnRlZCBieSBzZXJ2ZXI6IGNsaWVudCB1c2VzICV1LiV1LCBzZXJ2ZXIgc3VwcG9ydHMg dXAgdG8gJXUuJXUiLAogCQkJCQkJCQlQR19QUk9UT0NPTF9NQUpPUihjb25uLT5wdmVyc2lv biksIFBHX1BST1RPQ09MX01JTk9SKGNvbm4tPnB2ZXJzaW9uKSwKIAkJCQkJCQkJUEdfUFJP VE9DT0xfTUFKT1IodGhlaXJfdmVyc2lvbiksIFBHX1BST1RPQ09MX01JTk9SKHRoZWlyX3Zl cnNpb24pKTsKLQlpZiAobnVtID4gMCkKKwlpZiAobnVtX3JlcXVpcmVkX21pc3NpbmcgPiAw KQogCXsKIAkJYXBwZW5kUFFFeHBCdWZmZXIoJmNvbm4tPmVycm9yTWVzc2FnZSwKIAkJCQkJ CSAgbGlicHFfbmdldHRleHQoInByb3RvY29sIGV4dGVuc2lvbiBub3Qgc3VwcG9ydGVkIGJ5 IHNlcnZlcjogJXMiLApAQCAtMjMxMiw2ICsyMzM1LDcgQEAgYnVpbGRfc3RhcnR1cF9wYWNr ZXQoY29uc3QgUEdjb25uICpjb25uLCBjaGFyICpwYWNrZXQsCiAJCQkJQUREX1NUQVJUVVBf T1BUSU9OKG5leHRfZW8tPnBnTmFtZSwgdmFsKTsKIAkJfQogCX0KKwlBRERfU1RBUlRVUF9P UFRJT04oIl9wcV8uZXh0ZW5kZWRfcXVlcnlfY2FuY2VsIiwgIiIpOwogCiAJLyogQWRkIHRy YWlsaW5nIHRlcm1pbmF0b3IgKi8KIAlpZiAocGFja2V0KQpkaWZmIC0tZ2l0IGEvc3JjL2lu dGVyZmFjZXMvbGlicHEvbGlicHEtaW50LmggYi9zcmMvaW50ZXJmYWNlcy9saWJwcS9saWJw cS1pbnQuaAppbmRleCA4MmMxOGY4NzBkMi4uNjE4N2YyODJmYjAgMTAwNjQ0Ci0tLSBhL3Ny Yy9pbnRlcmZhY2VzL2xpYnBxL2xpYnBxLWludC5oCisrKyBiL3NyYy9pbnRlcmZhY2VzL2xp YnBxL2xpYnBxLWludC5oCkBAIC00OTEsOCArNDkxLDkgQEAgc3RydWN0IHBnX2Nvbm4KIAli b29sCQlzZW5kX2FwcG5hbWU7CS8qIG9rYXkgdG8gc2VuZCBhcHBsaWNhdGlvbl9uYW1lPyAq LwogCiAJLyogTWlzY2VsbGFuZW91cyBzdHVmZiAqLwotCWludAkJCWJlX3BpZDsJCQkvKiBQ SUQgb2YgYmFja2VuZCAtLS0gbmVlZGVkIGZvciBjYW5jZWxzICovCi0JaW50CQkJYmVfa2V5 OwkJCS8qIGtleSBvZiBiYWNrZW5kIC0tLSBuZWVkZWQgZm9yIGNhbmNlbHMgKi8KKwlpbnQJ CQliZV9waWQ7CQkJLyogUElEIG9mIGJhY2tlbmQgLS0tIG5lZWRlZCBmb3IgWFggY2FuY2Vs cyAqLworCWNoYXIJICAgKmJlX2NhbmNlbF9rZXk7CisJaW50CQkJYmVfY2FuY2VsX2tleV9s ZW47CiAJcGdQYXJhbWV0ZXJTdGF0dXMgKnBzdGF0dXM7IC8qIFBhcmFtZXRlclN0YXR1cyBk YXRhICovCiAJaW50CQkJY2xpZW50X2VuY29kaW5nOwkvKiBlbmNvZGluZyBpZCAqLwogCWJv b2wJCXN0ZF9zdHJpbmdzOwkvKiBzdGFuZGFyZF9jb25mb3JtaW5nX3N0cmluZ3MgKi8KQEAg LTYyOSw3ICs2MzAsNiBAQCBzdHJ1Y3QgcGdfY2FuY2VsCiB7CiAJU29ja0FkZHIJcmFkZHI7 CQkJLyogUmVtb3RlIGFkZHJlc3MgKi8KIAlpbnQJCQliZV9waWQ7CQkJLyogUElEIG9mIGJh Y2tlbmQgLS0tIG5lZWRlZCBmb3IgY2FuY2VscyAqLwotCWludAkJCWJlX2tleTsJCQkvKiBr ZXkgb2YgYmFja2VuZCAtLS0gbmVlZGVkIGZvciBjYW5jZWxzICovCiAJaW50CQkJcGd0Y3Bf dXNlcl90aW1lb3V0OyAvKiB0Y3AgdXNlciB0aW1lb3V0ICovCiAJaW50CQkJa2VlcGFsaXZl czsJCS8qIHVzZSBUQ1Aga2VlcGFsaXZlcz8gKi8KIAlpbnQJCQlrZWVwYWxpdmVzX2lkbGU7 CS8qIHRpbWUgYmV0d2VlbiBUQ1Aga2VlcGFsaXZlcyAqLwpAQCAtNjM3LDYgKzYzNywxMCBA QCBzdHJ1Y3QgcGdfY2FuY2VsCiAJCQkJCQkJCQkJICogcmV0cmFuc21pdHMgKi8KIAlpbnQJ CQlrZWVwYWxpdmVzX2NvdW50OwkvKiBtYXhpbXVtIG51bWJlciBvZiBUQ1Aga2VlcGFsaXZl CiAJCQkJCQkJCQkgKiByZXRyYW5zbWl0cyAqLworCisJLyogUHJlLWNvbnN0cnVjdGVkIGNh bmNlbCByZXF1ZXN0IHBhY2tldCBzdGFydHMgaGVyZSAqLworCWludDMyCQljYW5jZWxfcGt0 X2xlbjsgLyogaW4gbmV0d29yay1ieXRlLW9yZGVyICovCisJY2hhcgkJY2FuY2VsX3JlcVtG TEVYSUJMRV9BUlJBWV9NRU1CRVJdOwkvKiBDYW5jZWxSZXF1ZXN0UGFja2V0ICovCiB9Owog CiAKLS0gCjIuMzkuMgoK --------------kS0yn1i60V10fYafsNw0t0Qb--