233002 2008-07-26 15:48 0000 dev-util/subversion-1.5.1 released 2008-08-01 09:56:10 0000 1 1 1 Unclassified Gentoo Linux Ebuilds unspecified All All RESOLVED FIXED http://subversion.tigris.org/servlets/NewsItemView?newsItemID=2143 P2 enhancement --- 229045 1 arfrever@gentoo.org hollow@gentoo.org hauschild.markus@googlemail.com arfrever@gentoo.org 2008-07-26 15:48:42 0000 dev-util/subversion-1.5.1 was released on 2008-07-26. arfrever@gentoo.org 2008-07-26 15:49:45 0000 Created an attachment (id=161420) Patch to subversion-1.5.1.ebuild arfrever@gentoo.org 2008-07-26 15:54:18 0000 Created an attachment (id=161422) subversion-1.5.1-ra_serf-improvements.patch This patch fixes all ra_serf tests except for merge_tests.py tests: http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=141330 It also fixes issue #3137. hollow@gentoo.org 2008-07-31 15:41:30 0000 in cvs, thanks 161420 2008-07-26 15:49 0000 Patch to subversion-1.5.1.ebuild subversion-1.5.1.ebuild.patch text/plain LS0tIGRldi11dGlsL3N1YnZlcnNpb24vc3VidmVyc2lvbi0xLjUuMC5lYnVpbGQKKysrIGRldi11 dGlsL3N1YnZlcnNpb24vc3VidmVyc2lvbi0xLjUuMS5lYnVpbGQKQEAgLTEwLDcgKzEwLDcgQEAK IERFU0NSSVBUSU9OPSJBZHZhbmNlZCB2ZXJzaW9uIGNvbnRyb2wgc3lzdGVtIgogSE9NRVBBR0U9 Imh0dHA6Ly9zdWJ2ZXJzaW9uLnRpZ3Jpcy5vcmcvIgogU1JDX1VSST0iaHR0cDovL3N1YnZlcnNp b24udGlncmlzLm9yZy9kb3dubG9hZHMvJHtQL18vLX0udGFyLmJ6MgotCW1pcnJvcjovL2dlbnRv by8ke1B9LW1lcmdlLWltcHJvdmVtZW50cy5wYXRjaC5iejIiCisJbWlycm9yOi8vZ2VudG9vLyR7 UH0tcmFfc2VyZi1pbXByb3ZlbWVudHMucGF0Y2guYnoyIgogCiBMSUNFTlNFPSJTdWJ2ZXJzaW9u IgogU0xPVD0iMCIKQEAgLTcxLDkgKzcxLDggQEAKIAl1bnBhY2sgJHtBfQogCWNkICIke1N9Igog Ci0JZXBhdGNoICIke0ZJTEVTRElSfSIvMS41LjAvaHR0cC1saWJyYXJ5LnBhdGNoCiAJZXBhdGNo ICIke0ZJTEVTRElSfSIvMS41LjAvZGlzYWJsZS11bm5lZWRlZC1saW5raW5nLnBhdGNoCi0JZXBh dGNoICIke1dPUktESVJ9Ii8ke1B9LW1lcmdlLWltcHJvdmVtZW50cy5wYXRjaAorCWVwYXRjaCAi JHtXT1JLRElSfSIvJHtQfS1yYV9zZXJmLWltcHJvdmVtZW50cy5wYXRjaAogCiAJc2VkIC1pIFwK IAkJLWUgInMvXChCVUlMRF9SVUxFUz0uKlwpIGJkYi10ZXN0XCguKlwpL1wxXDIvZyIgXAo= 161422 2008-07-26 15:54 0000 subversion-1.5.1-ra_serf-improvements.patch subversion-1.5.1-ra_serf-improvements.patch text/plain cmFfc2VyZiBpbXByb3ZlbWVudHMgYW5kIGZpeGluZyBpc3N1ZSAjMzEzNwoKaHR0cHM6Ly9zdm4u Y29sbGFiLm5ldC92aWV3dmMvc3ZuP3ZpZXc9cmV2JnJldmlzaW9uPTMxMjMyCmh0dHBzOi8vc3Zu LmNvbGxhYi5uZXQvdmlld3ZjL3N2bj92aWV3PXJldiZyZXZpc2lvbj0zMTIzNApodHRwczovL3N2 bi5jb2xsYWIubmV0L3ZpZXd2Yy9zdm4/dmlldz1yZXYmcmV2aXNpb249MzEzMTMKaHR0cHM6Ly9z dm4uY29sbGFiLm5ldC92aWV3dmMvc3ZuP3ZpZXc9cmV2JnJldmlzaW9uPTMxNTUwCmh0dHBzOi8v c3ZuLmNvbGxhYi5uZXQvdmlld3ZjL3N2bj92aWV3PXJldiZyZXZpc2lvbj0zMTYzMAoKLS0tIHN1 YnZlcnNpb24vaW5jbHVkZS9zdm5fZXJyb3JfY29kZXMuaAorKysgc3VidmVyc2lvbi9pbmNsdWRl L3N2bl9lcnJvcl9jb2Rlcy5oCkBAIC03NzQsNiArNzc0LDkgQEAKICAgICAgICAgICAgICBTVk5f RVJSX1JBX0RBVl9DQVRFR09SWV9TVEFSVCArIDYsCiAgICAgICAgICAgICAgIkludmFsaWQgY29u ZmlndXJhdGlvbiB2YWx1ZSIpCiAKKyAgLyoqIEBkZXByZWNhdGVkIFRvIGltcHJvdmUgY29uc2lz dGVuY3kgYmV0d2VlbiByYSBsYXllcnMsIHRoaXMgZXJyb3IgY29kZQorICAgICAgaXMgcmVwbGFj ZWQgaW4gcmFfe25lb258c2VyZn0gYnkgU1ZOX0VSUl9GU19OT1RfRk9VTkQuCisgICAgICBTbGF0 ZWQgZm9yIHJlbW92YWwgaW4gdGhlIG5leHQgbWFqb3IgcmVsZWFzZS4gKi8KICAgU1ZOX0VSUkRF RihTVk5fRVJSX1JBX0RBVl9QQVRIX05PVF9GT1VORCwKICAgICAgICAgICAgICBTVk5fRVJSX1JB X0RBVl9DQVRFR09SWV9TVEFSVCArIDcsCiAgICAgICAgICAgICAgIkhUVFAgUGF0aCBOb3QgRm91 bmQiKQotLS0gc3VidmVyc2lvbi9saWJzdm5fY2xpZW50L21lcmdlLmMKKysrIHN1YnZlcnNpb24v bGlic3ZuX2NsaWVudC9tZXJnZS5jCkBAIC00NTAsNyArNDUwLDYgQEAKICAgICAgICAgICAgICAg ICAgIGlmIChlcnIpCiAgICAgICAgICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAgICAg ICBpZiAoZXJyLT5hcHJfZXJyID09IFNWTl9FUlJfQ0xJRU5UX1VOUkVMQVRFRF9SRVNPVVJDRVMK LSAgICAgICAgICAgICAgICAgICAgICAgICAgfHwgZXJyLT5hcHJfZXJyID09IFNWTl9FUlJfUkFf REFWX1BBVEhfTk9UX0ZPVU5ECiAgICAgICAgICAgICAgICAgICAgICAgICAgIHx8IGVyci0+YXBy X2VyciA9PSBTVk5fRVJSX0ZTX05PVF9GT1VORCkKICAgICAgICAgICAgICAgICAgICAgICAgIHsK ICAgICAgICAgICAgICAgICAgICAgICAgICAgLyogUEFUSEBUQVJHRVRfRU5UUlktPlJFVklTSU9O IGRpZG4ndCBleGlzdCBhdApAQCAtMjE0Miw3ICsyMTQxLDYgQEAKICAgICAgIGlmIChlcnIpCiAg ICAgICAgIHsKICAgICAgICAgICBpZiAoZXJyLT5hcHJfZXJyID09IFNWTl9FUlJfRlNfTk9UX0ZP VU5ECi0gICAgICAgICAgICAgIHx8IGVyci0+YXByX2VyciA9PSBTVk5fRVJSX1JBX0RBVl9QQVRI X05PVF9GT1VORAogICAgICAgICAgICAgICB8fCBlcnItPmFwcl9lcnIgPT0gU1ZOX0VSUl9DTElF TlRfVU5SRUxBVEVEX1JFU09VUkNFUykKICAgICAgICAgICAgIHN2bl9lcnJvcl9jbGVhcihlcnIp OwogICAgICAgICAgIGVsc2UKQEAgLTM0MTMsNyArMzQxMSw2IEBACiAgICAgICAgICAgICAgICAg ICAgICAjIyMgICAgICAgY29uc2lzdGVudCBpbiB0aGUgZXJyb3IgaXQgcmV0dXJucyg/KQogICAg ICAgICAgICAgICAgICAgICAgKi8KICAgICAgICAgICAgICAgICAgIGlmIChlcnItPmFwcl9lcnIg PT0gU1ZOX0VSUl9GU19OT1RfRk9VTkQKLSAgICAgICAgICAgICAgICAgICAgICB8fCBlcnItPmFw cl9lcnIgPT0gU1ZOX0VSUl9SQV9EQVZfUEFUSF9OT1RfRk9VTkQKICAgICAgICAgICAgICAgICAg ICAgICB8fCBlcnItPmFwcl9lcnIgPT0gU1ZOX0VSUl9DTElFTlRfVU5SRUxBVEVEX1JFU09VUkNF UykKICAgICAgICAgICAgICAgICAgICAgc3ZuX2Vycm9yX2NsZWFyKGVycik7CiAgICAgICAgICAg ICAgICAgICBlbHNlCi0tLSBzdWJ2ZXJzaW9uL2xpYnN2bl9yYV9uZW9uL2NvbW1pdC5jCisrKyBz dWJ2ZXJzaW9uL2xpYnN2bl9yYV9uZW9uL2NvbW1pdC5jCkBAIC0xMDQ1LDcgKzEwNDUsNyBAQAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfKCJGaWxlICclcycgYWxyZWFkeSBl eGlzdHMiKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmlsZS0+cnNyYy0+ dXJsKTsKICAgICAgICAgfQotICAgICAgZWxzZSBpZiAoZXJyLT5hcHJfZXJyID09IFNWTl9FUlJf UkFfREFWX1BBVEhfTk9UX0ZPVU5EKQorICAgICAgZWxzZSBpZiAoZXJyLT5hcHJfZXJyID09IFNW Tl9FUlJfRlNfTk9UX0ZPVU5EKQogICAgICAgICB7CiAgICAgICAgICAgc3ZuX2Vycm9yX2NsZWFy KGVycik7CiAgICAgICAgIH0KLS0tIHN1YnZlcnNpb24vbGlic3ZuX3JhX25lb24vZ2V0X2xvY2tz LmMKKysrIHN1YnZlcnNpb24vbGlic3ZuX3JhX25lb24vZ2V0X2xvY2tzLmMKQEAgLTM3MCw3ICsz NzAsNyBAQAogCiAgIHN2bl9wb29sX2Rlc3Ryb3koYmF0b24uc2NyYXRjaHBvb2wpOwogCi0gIGlm IChlcnIgJiYgZXJyLT5hcHJfZXJyID09IFNWTl9FUlJfUkFfREFWX1BBVEhfTk9UX0ZPVU5EKQor ICBpZiAoZXJyICYmIGVyci0+YXByX2VyciA9PSBTVk5fRVJSX0ZTX05PVF9GT1VORCkKICAgICB7 CiAgICAgICBzdm5fZXJyb3JfY2xlYXIoZXJyKTsKICAgICAgICpsb2NrcyA9IGJhdG9uLmxvY2tf aGFzaDsKLS0tIHN1YnZlcnNpb24vbGlic3ZuX3JhX25lb24vcHJvcHMuYworKysgc3VidmVyc2lv bi9saWJzdm5fcmFfbmVvbi9wcm9wcy5jCkBAIC02MjMsNyArNjIzLDcgQEAKICAgaWYgKHZhbHVl ID09IE5VTEwpCiAgICAgewogICAgICAgLyogIyMjIG5lZWQgYW4gU1ZOX0VSUiBoZXJlICovCi0g ICAgICByZXR1cm4gc3ZuX2Vycm9yX2NyZWF0ZWYoU1ZOX0VSUl9SQV9EQVZfUFJPUFNfTk9UX0ZP VU5ELCBOVUxMLAorICAgICAgcmV0dXJuIHN2bl9lcnJvcl9jcmVhdGVmKFNWTl9FUlJfRlNfTk9U X0ZPVU5ELCBOVUxMLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF8oIiclcycgd2Fz IG5vdCBwcmVzZW50IG9uIHRoZSByZXNvdXJjZSIpLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG5hbWUpOwogICAgIH0KQEAgLTcxMCw3ICs3MTAsNyBAQAogICAgICAgaWYgKCEgZXJy KQogICAgICAgICBicmVhazsgICAvKiBmb3VuZCBhbiBleGlzdGluZyBwYXJlbnQhICovCiAKLSAg ICAgIGlmIChlcnItPmFwcl9lcnIgIT0gU1ZOX0VSUl9SQV9EQVZfUEFUSF9OT1RfRk9VTkQpCisg ICAgICBpZiAoZXJyLT5hcHJfZXJyICE9IFNWTl9FUlJfRlNfTk9UX0ZPVU5EKQogICAgICAgICBy ZXR1cm4gZXJyOyAgLyogZm91bmQgYSBfcmVhbF8gZXJyb3IgKi8KIAogICAgICAgLyogZWxzZS4u LiBsb3Agb2ZmIHRoZSBiYXNlbmFtZSBhbmQgdHJ5IGFnYWluLiAqLwpAQCAtMTIxMSw3ICsxMjEx LDcgQEAKICAgICAgIGVsc2UKICAgICAgICAgKmtpbmQgPSBzdm5fbm9kZV9maWxlOwogICAgIH0K LSAgZWxzZSBpZiAoZXJyLT5hcHJfZXJyID09IFNWTl9FUlJfUkFfREFWX1BBVEhfTk9UX0ZPVU5E KQorICBlbHNlIGlmIChlcnItPmFwcl9lcnIgPT0gU1ZOX0VSUl9GU19OT1RfRk9VTkQpCiAgICAg ewogCiAgICAgICBzdm5fZXJyb3JfY2xlYXIoZXJyKTsKQEAgLTEyNTYsNyArMTI1Niw3IEBACiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdXJsLCByZXZpc2lvbiwg cG9vbCk7CiAgICAgICBpZiAoZXJyKQogICAgICAgICB7Ci0gICAgICAgICAgaWYgKGVyci0+YXBy X2VyciA9PSBTVk5fRVJSX1JBX0RBVl9QQVRIX05PVF9GT1VORCkKKyAgICAgICAgICBpZiAoZXJy LT5hcHJfZXJyID09IFNWTl9FUlJfRlNfTk9UX0ZPVU5EKQogICAgICAgICAgICAgewogICAgICAg ICAgICAgICAvKiBlYXN5IG91dDogKi8KICAgICAgICAgICAgICAgc3ZuX2Vycm9yX2NsZWFyKGVy cik7CkBAIC0xMjc3LDcgKzEyNzcsNyBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IE5VTEwsIE5VTEwgLyogYWxsIHByb3BzICovLCBwb29sKTsKICAgaWYgKGVycikKICAgICB7Ci0g ICAgICBpZiAoZXJyLT5hcHJfZXJyID09IFNWTl9FUlJfUkFfREFWX1BBVEhfTk9UX0ZPVU5EKQor ICAgICAgaWYgKGVyci0+YXByX2VyciA9PSBTVk5fRVJSX0ZTX05PVF9GT1VORCkKICAgICAgICAg ewogICAgICAgICAgIC8qIGVhc3kgb3V0OiAqLwogICAgICAgICAgIHN2bl9lcnJvcl9jbGVhcihl cnIpOwotLS0gc3VidmVyc2lvbi9saWJzdm5fcmFfbmVvbi9zZXNzaW9uLmMKKysrIHN1YnZlcnNp b24vbGlic3ZuX3JhX25lb24vc2Vzc2lvbi5jCkBAIC04NzgsOCArODc4LDcgQEAKICAgICAgICAg ICAgICAgICAgIHN2bl9lcnJvcl9jbGVhcihlcnIpOwogICAgICAgICAgICAgICAgICAgY2FwX3Jl c3VsdCA9IGNhcGFiaWxpdHlfbm87CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICBl bHNlIGlmIChlcnItPmFwcl9lcnIgPT0gU1ZOX0VSUl9GU19OT1RfRk9VTkQKLSAgICAgICAgICAg ICAgICAgICAgICAgfHwgZXJyLT5hcHJfZXJyID09IFNWTl9FUlJfUkFfREFWX1BBVEhfTk9UX0ZP VU5EKQorICAgICAgICAgICAgICBlbHNlIGlmIChlcnItPmFwcl9lcnIgPT0gU1ZOX0VSUl9GU19O T1RfRk9VTkQpCiAgICAgICAgICAgICAgICAgewogICAgICAgICAgICAgICAgICAgLyogTWVyZ2Vp bmZvIHJlcXVlc3RzIHVzZSByZWxhdGl2ZSBwYXRocywgYW5kCiAgICAgICAgICAgICAgICAgICAg ICBhbnl3YXkgd2UncmUgaW4gcjAsIHNvIHRoaXMgaXMgYSBsaWtlbHkgZXJyb3IsCi0tLSBzdWJ2 ZXJzaW9uL2xpYnN2bl9yYV9uZW9uL3V0aWwuYworKysgc3VidmVyc2lvbi9saWJzdm5fcmFfbmVv bi91dGlsLmMKQEAgLTU0MCw3ICs1NDAsNyBAQAogICAgICAgc3dpdGNoIChyZXEtPmNvZGUpCiAg ICAgICAgIHsKICAgICAgICAgY2FzZSA0MDQ6Ci0gICAgICAgICAgcmV0dXJuIHN2bl9lcnJvcl9j cmVhdGUoU1ZOX0VSUl9SQV9EQVZfUEFUSF9OT1RfRk9VTkQsIE5VTEwsCisgICAgICAgICAgcmV0 dXJuIHN2bl9lcnJvcl9jcmVhdGUoU1ZOX0VSUl9GU19OT1RfRk9VTkQsIE5VTEwsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYXByX3BzcHJpbnRmKHBvb2wsIF8oIiclcycgcGF0 aCBub3QgZm91bmQiKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcmVxLT51cmwpKTsKIAotLS0gc3VidmVyc2lvbi9saWJzdm5fcmFfc2VyZi9ibGFtZS5j CisrKyBzdWJ2ZXJzaW9uL2xpYnN2bl9yYV9zZXJmL2JsYW1lLmMKQEAgLTM5MSw4ICszOTEsNiBA QAogICBzdm5fcmFfc2VyZl9faGFuZGxlcl90ICpoYW5kbGVyOwogICBzdm5fcmFfc2VyZl9feG1s X3BhcnNlcl90ICpwYXJzZXJfY3R4OwogICBzZXJmX2J1Y2tldF90ICpidWNrZXRzLCAqdG1wOwot ICBhcHJfaGFzaF90ICpwcm9wczsKLSAgY29uc3QgY2hhciAqbG9wcGVkX3BhdGgsICpyZW1haW5p bmdfcGF0aDsKICAgY29uc3QgY2hhciAqdmNjX3VybCwgKnJlbGF0aXZlX3VybCwgKmJhc2VsaW5l X3VybCwgKmJhc2Vjb2xsX3VybCwgKnJlcV91cmw7CiAgIGludCBzdGF0dXNfY29kZTsKICAgc3Zu X2Vycm9yX3QgKmVycjsKQEAgLTQ0Nyw0MSArNDQ1LDE3IEBACiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHNlc3Npb24tPmJrdF9hbGxvYyk7CiAgIHNlcmZfYnVja2V0X2Fn Z3JlZ2F0ZV9hcHBlbmQoYnVja2V0cywgdG1wKTsKIAotICBwcm9wcyA9IGFwcl9oYXNoX21ha2Uo cG9vbCk7Ci0KICAgLyogR2V0IHRoZSBWQ0MgZnJvbSBmaWxlIHVybCwgb3IgaWYgdGhlIGZpbGUg ZG9lc24ndCBleGlzdCBpbiBIRUFELCBmcm9tCiAgICAgIGl0cyBjbG9zZXN0IGV4aXN0aW5nIHBh cmVudC4gICovCi0gIFNWTl9FUlIoc3ZuX3JhX3NlcmZfX3NlYXJjaF9mb3JfYmFzZV9wcm9wcyhw cm9wcywgJnJlbWFpbmluZ19wYXRoLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgJmxvcHBlZF9wYXRoLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgc2Vzc2lvbiwgc2Vzc2lvbi0+Y29ubnNbMF0sCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZXNzaW9uLT5yZXBvc191cmwucGF0aCwg cG9vbCkpOwotICB2Y2NfdXJsID0gc3ZuX3JhX3NlcmZfX2dldF9wcm9wKHByb3BzLCByZW1haW5p bmdfcGF0aCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiREFWOiIsICJ2ZXJz aW9uLWNvbnRyb2xsZWQtY29uZmlndXJhdGlvbiIpOwotCi0gIGlmICghdmNjX3VybCkKLSAgICB7 Ci0gICAgICByZXR1cm4gc3ZuX2Vycm9yX2NyZWF0ZShTVk5fRVJSX1JBX0RBVl9PUFRJT05TX1JF UV9GQUlMRUQsIE5VTEwsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfKCJUaGUgT1BU SU9OUyByZXNwb25zZSBkaWQgbm90IGluY2x1ZGUgdGhlICIKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgInJlcXVlc3RlZCB2ZXJzaW9uLWNvbnRyb2xsZWQtY29uZmlndXJhdGlvbiAi Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ2YWx1ZSIpKTsKLSAgICB9Ci0KLSAg LyogU2VuZCB0aGUgcmVxdWVzdCB0byB0aGUgYmFzZWxpbmUgVVJMICovCi0gIHJlbGF0aXZlX3Vy bCA9IHN2bl9yYV9zZXJmX19nZXRfcHJvcChwcm9wcywgcmVtYWluaW5nX3BhdGgsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTVk5fREFWX1BST1BfTlNfREFWLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImJhc2VsaW5lLXJlbGF0aXZlLXBh dGgiKTsKLSAgaWYgKCFyZWxhdGl2ZV91cmwpCi0gICAgewotICAgICAgcmV0dXJuIHN2bl9lcnJv cl9jcmVhdGUoU1ZOX0VSUl9SQV9EQVZfT1BUSU9OU19SRVFfRkFJTEVELCBOVUxMLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXygiVGhlIE9QVElPTlMgcmVzcG9uc2UgZGlkIG5vdCBp bmNsdWRlIHRoZSAiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJyZXF1ZXN0ZWQg YmFzZWxpbmUtcmVsYXRpdmUtcGF0aCB2YWx1ZSIpKTsKLSAgICB9Ci0gIHJlbGF0aXZlX3VybCA9 IHN2bl9wYXRoX2pvaW4ocmVsYXRpdmVfdXJsLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHN2bl9wYXRoX3VyaV9kZWNvZGUobG9wcGVkX3BhdGgsIHBvb2wpLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHBvb2wpOworICBTVk5fRVJSKHN2bl9yYV9zZXJmX19kaXNjb3Zl cl9yb290KCZ2Y2NfdXJsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZy ZWxhdGl2ZV91cmwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Vzc2lv biwgc2Vzc2lvbi0+Y29ubnNbMF0sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgc2Vzc2lvbi0+cmVwb3NfdXJsLnBhdGgsIHBvb2wpKTsKIAogICBpZiAoZW5kID09IFNWTl9J TlZBTElEX1JFVk5VTSkKICAgICB7CisgICAgICBhcHJfaGFzaF90ICpwcm9wcyA9IGFwcl9oYXNo X21ha2UocG9vbCk7CisKICAgICAgLyogVXNlIHRoZSAiY2hlY2tlZC1pbiIgcHJvcGVydHkgdG8g ZGV0ZXJtaW5lIHRoZSBiYXNlbGluZSB1cmwgb2YgdGhlIEhFQUQKICAgICAgICAgcmV2aXNpb24u ICovCiAgICAgIFNWTl9FUlIoc3ZuX3JhX3NlcmZfX3JldHJpZXZlX3Byb3BzKHByb3BzLCBzZXNz aW9uLCBzZXNzaW9uLT5jb25uc1swXSwKQEAgLTUwNiw2ICs0ODAsOCBAQAogICAgIH0KICAgZWxz ZQogICAgIHsKKyAgICAgIGFwcl9oYXNoX3QgKnByb3BzID0gYXByX2hhc2hfbWFrZShwb29sKTsK KwogICAgICAgLyogV2UncmUgYXNraW5nIGZvciBhIHNwZWNpZmljIHJldmlzaW9uLiBObyBuZWVk IHRvIHVzZSAiY2hlY2tlZC1pbiIKICAgICAgICAgIGhlcmUsIHJlcXVlc3QgdGhlIGJhc2VsaW5l LWNvbGxlY3Rpb24gcHJvcGVydHkgd2l0aCB0aGUgc3BlY2lmaWVkCiAgICAgICAgICByZXZpc2lv biBpbiB0aGUgJ0xhYmVsJyBoZWFkZXIgKGFkZGVkIGluIHN2bl9yYV9zZXJmX19yZXRyaWV2ZV9w cm9wcykuCkBAIC01NTksMTEgKzUzNSw3IEBACiAgICAgICBTVk5fRVJSKHBhcnNlcl9jdHgtPmVy cm9yKTsKICAgICB9CiAKLSAgaWYgKHN0YXR1c19jb2RlID09IDQwNCkKLSAgICB7Ci0gICAgICBy ZXR1cm4gc3ZuX2Vycm9yX2NyZWF0ZWYoU1ZOX0VSUl9SQV9EQVZfUEFUSF9OT1RfRk9VTkQsIE5V TEwsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiclcycgcGF0aCBub3QgZm91bmQi LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhhbmRsZXItPnBhdGgpOwotICAgIH0K KyAgU1ZOX0VSUihzdm5fcmFfc2VyZl9fZXJyb3Jfb25fc3RhdHVzKHN0YXR1c19jb2RlLCBoYW5k bGVyLT5wYXRoKSk7CisKICAgcmV0dXJuIGVycjsKIH0KLS0tIHN1YnZlcnNpb24vbGlic3ZuX3Jh X3NlcmYvY29tbWl0LmMKKysrIHN1YnZlcnNpb24vbGlic3ZuX3JhX3NlcmYvY29tbWl0LmMKQEAg LTQxMywxNiArNDEzLDEwIEBACiAKICAgaWYgKGNoZWNrb3V0X2N0eC0+cHJvZ3Jlc3Muc3RhdHVz ICE9IDIwMSkKICAgICB7Ci0gICAgICBpZiAoY2hlY2tvdXRfY3R4LT5wcm9ncmVzcy5zdGF0dXMg PT0gNDA0KQotICAgICAgICB7Ci0gICAgICAgICAgcmV0dXJuIHN2bl9lcnJvcl9jcmVhdGVmKFNW Tl9FUlJfUkFfREFWX1BBVEhfTk9UX0ZPVU5ELAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHJldHVybl9yZXNwb25zZV9lcnIoaGFuZGxlciwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZjaGVja291dF9jdHgtPnByb2dyZXNz KSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfKCJQYXRoICclcycgbm90IHBy ZXNlbnQiKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaXItPm5hbWUpOwot ICAgICAgICB9CisgICAgICBTVk5fRVJSKHN2bl9yYV9zZXJmX19lcnJvcl9vbl9zdGF0dXMoY2hl Y2tvdXRfY3R4LT5wcm9ncmVzcy5zdGF0dXMsIAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGRpci0+bmFtZSkpOwogCi0gICAgICByZXR1cm4gc3ZuX2Vycm9yX2Ny ZWF0ZWYoU1ZOX0VSUl9SQV9EQVZfUEFUSF9OT1RfRk9VTkQsCisgICAgICByZXR1cm4gc3ZuX2Vy cm9yX2NyZWF0ZWYoU1ZOX0VSUl9GU19DT05GTElDVCwKICAgICAgICAgICAgICAgICAgICAgcmV0 dXJuX3Jlc3BvbnNlX2VycihoYW5kbGVyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICZjaGVja291dF9jdHgtPnByb2dyZXNzKSwKICAgICAgICAgICAgICAgICAgICAg XygiRGlyZWN0b3J5ICclcycgaXMgb3V0IG9mIGRhdGU7IHRyeSB1cGRhdGluZyIpLApAQCAtNDk1 LDEyICs0ODksMTQgQEAKIAogICAgICAgU1ZOX0VSUihzdm5fcmFfc2VyZl9fd2FpdF9mb3JfcHJv cHMocHJvcGZpbmRfY3R4LCBzZXNzaW9uLCBwb29sKSk7CiAKKyAgICAgIC8qIFdlIHdvdWxkbid0 IGdldCBoZXJlIGlmIHRoZSB1cmwgd2Fzbid0IGZvdW5kICg0MDQpLCBzbyB0aGUgY2hlY2tlZC1p bgorICAgICAgICAgcHJvcGVydHkgc2hvdWxkIGhhdmUgYmVlbiBzZXQuICovCiAgICAgICByb290 X2NoZWNrb3V0ID0KICAgICAgICAgICBzdm5fcmFfc2VyZl9fZ2V0X3Zlcl9wcm9wKHByb3BzLCBz ZXNzaW9uLT5yZXBvc191cmwucGF0aCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGJhc2VfcmV2aXNpb24sICJEQVY6IiwgImNoZWNrZWQtaW4iKTsKIAogICAgICAgaWYgKCFy b290X2NoZWNrb3V0KQotICAgICAgICByZXR1cm4gc3ZuX2Vycm9yX2NyZWF0ZWYoU1ZOX0VSUl9S QV9EQVZfUEFUSF9OT1RfRk9VTkQsIE5VTEwsCisgICAgICAgIHJldHVybiBzdm5fZXJyb3JfY3Jl YXRlZihTVk5fRVJSX1JBX0RBVl9SRVFVRVNUX0ZBSUxFRCwgTlVMTCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIF8oIlBhdGggJyVzJyBub3QgcHJlc2VudCIpLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc2Vzc2lvbi0+cmVwb3NfdXJsLnBhdGgpOwogICAgIH0K QEAgLTU5NCwxNiArNTkwLDEwIEBACiAKICAgaWYgKGZpbGUtPmNoZWNrb3V0LT5wcm9ncmVzcy5z dGF0dXMgIT0gMjAxKQogICAgIHsKLSAgICAgIGlmIChmaWxlLT5jaGVja291dC0+cHJvZ3Jlc3Mu c3RhdHVzID09IDQwNCkKLSAgICAgICAgewotICAgICAgICAgIHJldHVybiBzdm5fZXJyb3JfY3Jl YXRlZihTVk5fRVJSX1JBX0RBVl9QQVRIX05PVF9GT1VORCwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHJldHVybl9yZXNwb25zZV9lcnIoaGFuZGxlciwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmZpbGUtPmNoZWNrb3V0LT5wcm9ncmVz cyksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfKCJQYXRoICclcycgbm90IHByZXNl bnQiKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZpbGUtPm5hbWUpOwotICAgICAg ICB9CisgICAgICBTVk5fRVJSKHN2bl9yYV9zZXJmX19lcnJvcl9vbl9zdGF0dXMoZmlsZS0+Y2hl Y2tvdXQtPnByb2dyZXNzLnN0YXR1cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBmaWxlLT5uYW1lKSk7CiAKLSAgICAgIHJldHVybiBzdm5fZXJyb3JfY3JlYXRl ZihTVk5fRVJSX1JBX0RBVl9QQVRIX05PVF9GT1VORCwKKyAgICAgIHJldHVybiBzdm5fZXJyb3Jf Y3JlYXRlZihTVk5fRVJSX0ZTX0NPTkZMSUNULAogICAgICAgICAgICAgICAgICAgICByZXR1cm5f cmVzcG9uc2VfZXJyKGhhbmRsZXIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgJmZpbGUtPmNoZWNrb3V0LT5wcm9ncmVzcyksCiAgICAgICAgICAgICAgICAgICAgIF8o IkZpbGUgJyVzJyBpcyBvdXQgb2YgZGF0ZTsgdHJ5IHVwZGF0aW5nIiksCi0tLSBzdWJ2ZXJzaW9u L2xpYnN2bl9yYV9zZXJmL2dldGxvY2F0aW9ucy5jCisrKyBzdWJ2ZXJzaW9uL2xpYnN2bl9yYV9z ZXJmL2dldGxvY2F0aW9ucy5jCkBAIC0yNzQsMTIgKzI3NCw3IEBACiAgICAgICBTVk5fRVJSKHBh cnNlcl9jdHgtPmVycm9yKTsKICAgICB9CiAKLSAgaWYgKGxvY19jdHgtPnN0YXR1c19jb2RlID09 IDQwNCkKLSAgICB7Ci0gICAgICByZXR1cm4gc3ZuX2Vycm9yX2NyZWF0ZShTVk5fRVJSX1JBX0RB Vl9QQVRIX05PVF9GT1VORCwgTlVMTCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFw cl9wc3ByaW50Zihwb29sLCBfKCInJXMnIHBhdGggbm90IGZvdW5kIiksCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVxX3VybCkpOwotICAgIH0KKyAgU1ZOX0VS Uihzdm5fcmFfc2VyZl9fZXJyb3Jfb25fc3RhdHVzKGxvY19jdHgtPnN0YXR1c19jb2RlLCByZXFf dXJsKSk7CiAKICAgcmV0dXJuIGVycjsKIH0KLS0tIHN1YnZlcnNpb24vbGlic3ZuX3JhX3NlcmYv Z2V0bG9jYXRpb25zZWdtZW50cy5jCisrKyBzdWJ2ZXJzaW9uL2xpYnN2bl9yYV9zZXJmL2dldGxv Y2F0aW9uc2VnbWVudHMuYwpAQCAtMjI1LDE2ICsyMjUsMTMgQEAKICAgICB9CiAKICAgaWYgKGds c19jdHgtPmluc2lkZV9yZXBvcnQpCisKICAgICBlcnIgPSBzdm5fZXJyb3JfY3JlYXRlZihTVk5f RVJSX1JBX0RBVl9SRVFVRVNUX0ZBSUxFRCwgTlVMTCwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBfKCJMb2NhdGlvbiBzZWdtZW50IHJlcG9ydCBmYWlsZWQgb24gJyVzJ0AnJWxkJyIpLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGF0aCwgcGVnX3JldmlzaW9uKTsKIAotICBp ZiAoZ2xzX2N0eC0+c3RhdHVzX2NvZGUgPT0gNDA0KQotICAgIHsKLSAgICAgIHJldHVybiBzdm5f ZXJyb3JfY3JlYXRlKFNWTl9FUlJfUkFfREFWX1BBVEhfTk9UX0ZPVU5ELCBOVUxMLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgYXByX3BzcHJpbnRmKHBvb2wsIF8oIiclcycgcGF0aCBu b3QgZm91bmQiKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBy ZXFfdXJsKSk7Ci0gICAgfQorICBTVk5fRVJSKHN2bl9yYV9zZXJmX19lcnJvcl9vbl9zdGF0dXMo Z2xzX2N0eC0+c3RhdHVzX2NvZGUsIGhhbmRsZXItPnBhdGgpKTsKKwogCiAgIHN2bl9wb29sX2Rl c3Ryb3koZ2xzX2N0eC0+c3VicG9vbCk7CiAKLS0tIHN1YnZlcnNpb24vbGlic3ZuX3JhX3NlcmYv bWVyZ2VpbmZvLmMKKysrIHN1YnZlcnNpb24vbGlic3ZuX3JhX3NlcmYvbWVyZ2VpbmZvLmMKQEAg LTIzMiw3ICsyMzIsNyBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgc3ZuX2Jvb2xlYW5f dCBpbmNsdWRlX2Rlc2NlbmRhbnRzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgYXByX3Bv b2xfdCAqcG9vbCkKIHsKLSAgc3ZuX2Vycm9yX3QgKmVycjsKKyAgc3ZuX2Vycm9yX3QgKmVyciwg KmVycjI7CiAgIGludCBzdGF0dXNfY29kZTsKIAogICBtZXJnZWluZm9fY29udGV4dF90ICptZXJn ZWluZm9fY3R4OwpAQCAtMjg1LDEyICsyODUsMTMgQEAKIAogICBlcnIgPSBzdm5fcmFfc2VyZl9f Y29udGV4dF9ydW5fd2FpdCgmbWVyZ2VpbmZvX2N0eC0+ZG9uZSwgc2Vzc2lvbiwgcG9vbCk7CiAK LSAgaWYgKHN0YXR1c19jb2RlID09IDQwNCkKKyAgZXJyMiA9IHN2bl9yYV9zZXJmX19lcnJvcl9v bl9zdGF0dXMoc3RhdHVzX2NvZGUsIGhhbmRsZXItPnBhdGgpOworCisgIGlmIChlcnIyKQogICAg IHsKICAgICAgIHN2bl9lcnJvcl9jbGVhcihlcnIpOwotICAgICAgcmV0dXJuIHN2bl9lcnJvcl9j cmVhdGVmKFNWTl9FUlJfUkFfREFWX1BBVEhfTk9UX0ZPVU5ELCBOVUxMLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIF8oIiclcycgcGF0aCBub3QgZm91bmQiKSwgaGFuZGxlci0+cGF0 aCk7Ci0gICAgIH0KKyAgICAgIFNWTl9FUlIoZXJyMik7CisgICAgfQogCiAgIGlmIChwYXJzZXJf Y3R4LT5lcnJvcikKICAgICB7CkBAIC0zMDAsMTIgKzMwMSw2IEBACiAgIGVsc2UKICAgICBTVk5f RVJSKGVycik7CiAKLSAgaWYgKHN0YXR1c19jb2RlID09IDQwNCkKLSAgICB7Ci0gICAgICByZXR1 cm4gc3ZuX2Vycm9yX2NyZWF0ZWYoU1ZOX0VSUl9SQV9EQVZfUEFUSF9OT1RfRk9VTkQsIE5VTEws Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXygiJyVzJyBwYXRoIG5vdCBmb3VuZCIp LCBoYW5kbGVyLT5wYXRoKTsKLSAgICB9Ci0KICAgaWYgKG1lcmdlaW5mb19jdHgtPmRvbmUpCiAg ICAgKmNhdGFsb2cgPSBtZXJnZWluZm9fY3R4LT5yZXN1bHRfY2F0YWxvZzsKIAotLS0gc3VidmVy c2lvbi9saWJzdm5fcmFfc2VyZi9wcm9wZXJ0eS5jCisrKyBzdWJ2ZXJzaW9uL2xpYnN2bl9yYV9z ZXJmL3Byb3BlcnR5LmMKQEAgLTYxMiw2ICs2MTIsOSBAQAogICAgICAgc3ZuX2Vycm9yX2NsZWFy KGVycik7CiAgICAgICBTVk5fRVJSKHByb3BfY3R4LT5wYXJzZXJfY3R4LT5lcnJvcik7CiAgICAg fQorCisgIFNWTl9FUlIoc3ZuX3JhX3NlcmZfX2Vycm9yX29uX3N0YXR1cyhwcm9wX2N0eC0+c3Rh dHVzX2NvZGUsIHByb3BfY3R4LT5wYXRoKSk7CisKICAgcmV0dXJuIGVycjsKIH0KIApAQCAtNjQw LDUzICs2NDMsNiBAQAogICByZXR1cm4gU1ZOX05PX0VSUk9SOwogfQogCi1zdm5fZXJyb3JfdCAq Ci1zdm5fcmFfc2VyZl9fc2VhcmNoX2Zvcl9iYXNlX3Byb3BzKGFwcl9oYXNoX3QgKnByb3BzLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICoqcmVtYWluaW5n X3BhdGgsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKipt aXNzaW5nX3BhdGgsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN2bl9yYV9z ZXJmX19zZXNzaW9uX3QgKnNlc3Npb24sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHN2bl9yYV9zZXJmX19jb25uZWN0aW9uX3QgKmNvbm4sCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKnVybCwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYXByX3Bvb2xfdCAqcG9vbCkKLXsKLSAgY29uc3QgY2hhciAqcGF0aCA9IHVy bCwgKnByZXNlbnRfcGF0aCA9ICIiOwotICBjb25zdCBjaGFyICp2Y2NfdXJsOwotCi0gIGRvCi0g ICAgewotICAgICAgU1ZOX0VSUihzdm5fcmFfc2VyZl9fcmV0cmlldmVfcHJvcHMocHJvcHMsIHNl c3Npb24sIGNvbm4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBw YXRoLCBTVk5fSU5WQUxJRF9SRVZOVU0sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAiMCIsIGJhc2VfcHJvcHMsIHBvb2wpKTsKLSAgICAgIHZjY191cmwgPQotICAg ICAgICAgIHN2bl9yYV9zZXJmX19nZXRfdmVyX3Byb3AocHJvcHMsIHBhdGgsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBTVk5fSU5WQUxJRF9SRVZOVU0sCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiREFWOiIsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAidmVyc2lvbi1jb250cm9sbGVkLWNvbmZpZ3VyYXRpb24iKTsKLSAgICAg IGlmICh2Y2NfdXJsKQotICAgICAgICBicmVhazsKLQotICAgICAgLyogVGhpcyBoYXBwZW5zIHdo ZW4gdGhlIGZpbGUgaXMgbWlzc2luZyBpbiBIRUFELiAqLwotCi0gICAgICAvKiBPa2F5LCBzdHJp cCBvZmYuICovCi0gICAgICBwcmVzZW50X3BhdGggPSBzdm5fcGF0aF9qb2luKHN2bl9wYXRoX2Jh c2VuYW1lKHBhdGgsIHBvb2wpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBw cmVzZW50X3BhdGgsIHBvb2wpOwotICAgICAgcGF0aCA9IHN2bl9wYXRoX2Rpcm5hbWUocGF0aCwg cG9vbCk7Ci0gICAgfQotICB3aGlsZSAoIXN2bl9wYXRoX2lzX2VtcHR5KHBhdGgpKTsKLQotICAv KiBFcnJvciBvdXQgaWYgZW50aXJlIFVSTCB3YXMgYm9ndXMgKG5vdCBhIHNpbmdsZSBwYXJ0IG9m IGl0IGV4aXN0cwotICAgICBpbiB0aGUgcmVwb3NpdG9yeSEpICAqLwotICBpZiAoc3ZuX3BhdGhf aXNfZW1wdHkocGF0aCkpCi0gICAgcmV0dXJuIHN2bl9lcnJvcl9jcmVhdGVmKFNWTl9FUlJfUkFf SUxMRUdBTF9VUkwsIE5VTEwsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIF8oIk5vIHBh cnQgb2YgcGF0aCAnJXMnIHdhcyBmb3VuZCBpbiAiCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgInJlcG9zaXRvcnkgSEVBRCIpLCB1cmwpOwotCi0gICptaXNzaW5nX3BhdGggPSBwcmVz ZW50X3BhdGg7Ci0gICpyZW1haW5pbmdfcGF0aCA9IHBhdGg7Ci0KLSAgcmV0dXJuIFNWTl9OT19F UlJPUjsKLX0KLQogdm9pZAogc3ZuX3JhX3NlcmZfX3dhbGtfYWxsX3Byb3BzKGFwcl9oYXNoX3Qg KnByb3BzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKm5hbWUsCi0t LSBzdWJ2ZXJzaW9uL2xpYnN2bl9yYV9zZXJmL3JhX3NlcmYuaAorKysgc3VidmVyc2lvbi9saWJz dm5fcmFfc2VyZi9yYV9zZXJmLmgKQEAgLTE5NSw2ICsxOTUsOSBAQAogICAvKiBTU0wgc2VydmVy IGNlcnRpZmljYXRlcyAqLwogICBzdm5fYm9vbGVhbl90IHRydXN0X2RlZmF1bHRfY2E7CiAgIGNv bnN0IGNoYXIgKnNzbF9hdXRob3JpdGllczsKKworICAvKiBSZXBvc2l0b3J5IFVVSUQgKi8KKyAg Y29uc3QgY2hhciAqdXVpZDsKIH07CiAKIC8qCkBAIC03OTgsMjcgKzgwMSw2IEBACiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgc3ZuX3JhX3NlcmZfX3Nlc3Npb25fdCAqc2VzcywKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBhcHJfcG9vbF90ICpwb29sKTsKIAotLyogU2hhcmVkIGhl bHBlciBmdW5jOiBnaXZlbiBhIHB1YmxpYyBVUkwgd2hpY2ggbWF5IG5vdCBleGlzdCBpbiBIRUFE LAotICAgdXNlIFNFU1NJT04gdG8gc2VhcmNoIHVwIHBhcmVudCBkaXJlY3RvcmllcyB1bnRpbCB3 ZSBjYW4gcmV0cmlldmUgYQotICAgKlBST1BTIChhbGxvY2F0ZWQgaW4gUE9PTCkgY29udGFpbmlu ZyBhIHN0YW5kYXJkIHNldCBvZiBiYXNlIHByb3BzOgotICAge1ZDQywgcmVzb3VyY2V0eXBlLCBi YXNlbGluZS1yZWxhdGl2ZS1wYXRofS4KLQotICAgQWxzbyByZXR1cm46Ci0gICAqTUlTU0lOR19Q QVRIIChhbGxvY2F0ZWQgaW4gUE9PTCksIHdoaWNoIGlzIHRoZSB0cmFpbGluZyBwb3J0aW9uIG9m Ci0gICAgIHRoZSBVUkwgdGhhdCBkaWQgbm90IGV4aXN0LiAgSWYgYW4gZXJyb3Igb2NjdXJzLCAq TUlTU0lOR19QQVRIIGlzbid0Ci0gICAgIGNoYW5nZWQuCi0gICAqUkVNQUlOSU5HX1BBVEggKGFs bG9jYXRlZCBpbiBQT09MKSwgd2hpY2ggaXMgdGhlIHBhcmVudCBwYXRoIG9uIHdoaWNoCi0gICAg IHdlIGZvdW5kIHRoZSBQUk9QUy4KLSAgICovCi1zdm5fZXJyb3JfdCAqCi1zdm5fcmFfc2VyZl9f c2VhcmNoX2Zvcl9iYXNlX3Byb3BzKGFwcl9oYXNoX3QgKnByb3BzLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICoqcmVtYWluaW5nX3BhdGgsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKiptaXNzaW5nX3BhdGgsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN2bl9yYV9zZXJmX19zZXNzaW9uX3Qg KnNlc3Npb24sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN2bl9yYV9zZXJm X19jb25uZWN0aW9uX3QgKmNvbm4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IGNoYXIgKnVybCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXBy X3Bvb2xfdCAqcG9vbCk7Ci0KIC8qCiAgKiBUaGlzIGlzIGEgYmxvY2tpbmcgdmVyc2lvbiBvZiBk ZWxpdmVyX3Byb3BzLgogICovCkBAIC05ODcsMTMgKzk2OSwxNCBAQAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICpwYXRoLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBhcHJfcG9vbF90ICpwb29sKTsKIAotLyogVHJ5IHRvIGRpc2NvdmVyIG91ciBj dXJyZW50IHJvb3QgQGEgdmNjX3VybCBhbmQgdGhlIHJlc3VsdGFudCBAYSByZWxfcGF0aAotICog YmFzZWQgb24gQGEgb3JpZ19wYXRoIGZvciB0aGUgQGEgc2Vzc2lvbiBvbiBAYSBjb25uLgorLyog VHJ5IHRvIGRpc2NvdmVyIG91ciBjdXJyZW50IHJvb3QgQGEgVkNDX1VSTCBhbmQgdGhlIHJlc3Vs dGFudCBAYSBSRUxfUEFUSAorICogYmFzZWQgb24gQGEgT1JJR19QQVRIIGZvciB0aGUgQGEgU0VT U0lPTiBvbiBAYSBDT05OLgorICogUkVMX1BBVEggd2lsbCBiZSBVUkkgZGVjb2RlZC4KICAqCi0g KiBAYSByZWxfcGF0aCBtYXkgYmUgTlVMTCBpZiB0aGUgY2FsbGVyIGlzIG5vdCBpbnRlcmVzdGVk IGluIHRoZSByZWxhdGl2ZQorICogQGEgUkVMX1BBVEggbWF5IGJlIE5VTEwgaWYgdGhlIGNhbGxl ciBpcyBub3QgaW50ZXJlc3RlZCBpbiB0aGUgcmVsYXRpdmUKICAqIHBhdGguCiAgKgotICogQWxs IHRlbXBvcmFyeSBhbGxvY2F0aW9ucyB3aWxsIGJlIG1hZGUgaW4gQGEgcG9vbC4KKyAqIEFsbCB0 ZW1wb3JhcnkgYWxsb2NhdGlvbnMgd2lsbCBiZSBtYWRlIGluIEBhIFBPT0wuCiAgKi8KIHN2bl9l cnJvcl90ICoKIHN2bl9yYV9zZXJmX19kaXNjb3Zlcl9yb290KGNvbnN0IGNoYXIgKip2Y2NfdXJs LApAQCAtMTAwNSw2ICs5ODgsOCBAQAogCiAvKiBTZXQgKkJDX1VSTCB0byB0aGUgYmFzZWxpbmUg Y29sbGVjdGlvbiB1cmwsIGFuZCBzZXQgKkJDX1JFTEFUSVZFIHRvCiAgKiB0aGUgcGF0aCByZWxh dGl2ZSB0byB0aGF0IHVybCBmb3IgVVJMIGluIFJFVklTSU9OIHVzaW5nIFNFU1NJT04uCisgKiBC Q19SRUxBVElWRSB3aWxsIGJlIFVSSSBkZWNvZGVkLgorICoKICAqIFJFVklTSU9OIG1heSBiZSBT Vk5fSU5WQUxJRF9SRVZOVU0gKHRvIG1lYW4gInRoZSBjdXJyZW50IEhFQUQKICAqIHJldmlzaW9u IikuICBJZiBVUkwgaXMgTlVMTCwgdXNlIFNFU1NJT04ncyBzZXNzaW9uIHVybC4KICAqIFVzZSBQ T09MIGZvciBhbGwgYWxsb2NhdGlvbnMuCkBAIC0xMjA3LDcgKzExOTIsNiBAQAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IGNoYXIgKmNhcGFiaWxpdHksCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYXByX3Bvb2xfdCAqcG9vbCk7CiAKLQogLyoqKiBBdXRoZW50aWNhdGlv biBoYW5kbGVyIGRlY2xhcmF0aW9ucyAqKiovCiAKIC8qKgpAQCAtMTI5Myw0ICsxMjc3LDE1IEBA CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcl9zaXplX3QgZGF0YV9sZW4sCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcl9wb29sX3QgKnBvb2wpOwogCisKKy8q KiogR2VuZXJhbCB1dGlsaXR5IGZ1bmN0aW9ucyAqKiovCisKKy8qKgorICogQ29udmVydCBhbiBI VFRQIHN0YXR1cyBjb2RlIHJlc3VsdGluZyBmcm9tIGEgV2ViREFWIHJlcXVlc3QgdG8gdGhlIHJl bGV2YW50CisgKiBlcnJvciBjb2RlLiAKKyAqLworc3ZuX2Vycm9yX3QgKgorc3ZuX3JhX3NlcmZf X2Vycm9yX29uX3N0YXR1cyhpbnQgc3RhdHVzX2NvZGUsIGNvbnN0IGNoYXIgKnBhdGgpOworCisK ICNlbmRpZiAvKiBTVk5fTElCU1ZOX1JBX1NFUkZfUkFfU0VSRl9IICovCi0tLSBzdWJ2ZXJzaW9u L2xpYnN2bl9yYV9zZXJmL3NlcmYuYworKysgc3VidmVyc2lvbi9saWJzdm5fcmFfc2VyZi9zZXJm LmMKQEAgLTI1Nyw4ICsyNTcsNyBAQAogICAgICAgICAgICAgICAgICAgc3ZuX2Vycm9yX2NsZWFy KGVycik7CiAgICAgICAgICAgICAgICAgICBjYXBfcmVzdWx0ID0gY2FwYWJpbGl0eV9ubzsKICAg ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgIGVsc2UgaWYgKGVyci0+YXByX2VyciA9PSBT Vk5fRVJSX0ZTX05PVF9GT1VORAotICAgICAgICAgICAgICAgICAgICAgICB8fCBlcnItPmFwcl9l cnIgPT0gU1ZOX0VSUl9SQV9EQVZfUEFUSF9OT1RfRk9VTkQpCisgICAgICAgICAgICAgIGVsc2Ug aWYgKGVyci0+YXByX2VyciA9PSBTVk5fRVJSX0ZTX05PVF9GT1VORCkKICAgICAgICAgICAgICAg ICB7CiAgICAgICAgICAgICAgICAgICAvKiBNZXJnZWluZm8gcmVxdWVzdHMgdXNlIHJlbGF0aXZl IHBhdGhzLCBhbmQKICAgICAgICAgICAgICAgICAgICAgIGFueXdheSB3ZSdyZSBpbiByMCwgc28g dGhpcyBpcyBhIGxpa2VseSBlcnJvciwKQEAgLTgzOSwxNiArODM4LDIxIEBACiAgIGNvbnN0IGNo YXIgKnBhdGgsICpyZXNfdHlwZTsKICAgc3ZuX3Jldm51bV90IGZldGNoZWRfcmV2OwogCi0gIFNW Tl9FUlIoZmV0Y2hfcGF0aF9wcm9wcygmcHJvcF9jdHgsICZwcm9wcywgJnBhdGgsICZmZXRjaGVk X3JldiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlc3Npb24sIHJlbF9wYXRoLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgcmV2aXNpb24sIGNoZWNrX3BhdGhfcHJvcHMsIHBvb2wp KTsKKyAgc3ZuX2Vycm9yX3QgKmVyciA9IGZldGNoX3BhdGhfcHJvcHMoJnByb3BfY3R4LCAmcHJv cHMsICZwYXRoLCAmZmV0Y2hlZF9yZXYsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHNlc3Npb24sIHJlbF9wYXRoLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICByZXZpc2lvbiwgY2hlY2tfcGF0aF9wcm9wcywgcG9vbCk7CiAKLSAgaWYgKHByb3Bf Y3R4ICYmIChzdm5fcmFfc2VyZl9fcHJvcGZpbmRfc3RhdHVzX2NvZGUocHJvcF9jdHgpID09IDQw NCkpCisgIGlmIChlcnIgJiYgZXJyLT5hcHJfZXJyID09IFNWTl9FUlJfRlNfTk9UX0ZPVU5EKQog ICAgIHsKKyAgICAgIHN2bl9lcnJvcl9jbGVhcihlcnIpOwogICAgICAgKmtpbmQgPSBzdm5fbm9k ZV9ub25lOwogICAgIH0KICAgZWxzZQogICAgIHsKKyAgICAgIC8qIEFueSBvdGhlciBlcnJvciwg cmFpc2UgdG8gY2FsbGVyLiAqLworICAgICAgaWYgKGVycikKKyAgICAgICAgcmV0dXJuIGVycjsK KwogICAgICAgcmVzX3R5cGUgPSBzdm5fcmFfc2VyZl9fZ2V0X3Zlcl9wcm9wKHByb3BzLCBwYXRo LCBmZXRjaGVkX3JldiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiREFWOiIsICJyZXNvdXJjZXR5cGUiKTsKICAgICAgIGlmICghcmVzX3R5cGUpCkBAIC05NzYs OSArOTgwLDIxIEBACiAgIGNvbnN0IGNoYXIgKnBhdGg7CiAgIHN2bl9yZXZudW1fdCBmZXRjaGVk X3JldjsKICAgc3ZuX2RpcmVudF90ICplbnRyeTsKKyAgc3ZuX2Vycm9yX3QgKmVycjsKIAotICBT Vk5fRVJSKGZldGNoX3BhdGhfcHJvcHMoJnByb3BfY3R4LCAmcHJvcHMsICZwYXRoLCAmZmV0Y2hl ZF9yZXYsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICBzZXNzaW9uLCByZWxfcGF0aCwgcmV2 aXNpb24sIGFsbF9wcm9wcywgcG9vbCkpOworICBlcnIgPSBmZXRjaF9wYXRoX3Byb3BzKCZwcm9w X2N0eCwgJnByb3BzLCAmcGF0aCwgJmZldGNoZWRfcmV2LAorICAgICAgICAgICAgICAgICAgICAg ICAgIHNlc3Npb24sIHJlbF9wYXRoLCByZXZpc2lvbiwgYWxsX3Byb3BzLCBwb29sKTsKKyAgaWYg KGVycikKKyAgICB7CisgICAgICBpZiAoZXJyLT5hcHJfZXJyID09IFNWTl9FUlJfRlNfTk9UX0ZP VU5EKQorICAgICAgICB7CisgICAgICAgICAgc3ZuX2Vycm9yX2NsZWFyKGVycik7CisgICAgICAg ICAgKmRpcmVudCA9IE5VTEw7CisgICAgICAgICAgcmV0dXJuIFNWTl9OT19FUlJPUjsKKyAgICAg ICAgfQorICAgICAgZWxzZQorICAgICAgICByZXR1cm4gZXJyOworICAgIH0KIAogICBlbnRyeSA9 IGFwcl9wY2FsbG9jKHBvb2wsIHNpemVvZigqZW50cnkpKTsKIApAQCAtMTAwNiw3ICsxMDIyLDcg QEAKIAogICBwYXRoID0gc2Vzc2lvbi0+cmVwb3NfdXJsLnBhdGg7CiAKLSAgLyogSWYgd2UgaGF2 ZSBhIHJlbGF0aXZlIHBhdGgsIGFwcGVuZCBpdC4gKi8KKyAgLyogSWYgd2UgaGF2ZSBhIHJlbGF0 aXZlIHBhdGgsIFVSSSBlbmNvZGUgYW5kIGFwcGVuZCBpdC4gKi8KICAgaWYgKHJlbF9wYXRoKQog ICAgIHsKICAgICAgIHBhdGggPSBzdm5fcGF0aF91cmxfYWRkX2NvbXBvbmVudChwYXRoLCByZWxf cGF0aCwgcG9vbCk7CkBAIC0xMTE3LDYgKzExMzMsMTUgQEAKICAgcmV0dXJuIFNWTl9OT19FUlJP UjsKIH0KIAorLyogVE9ETzogdG8gZmV0Y2ggdGhlIHV1aWQgZnJvbSB0aGUgcmVwb3NpdG9yeSwg d2UgbmVlZDoKKyAgIDEuIGEgcGF0aCB0aGF0IGV4aXN0cyBpbiBIRUFECisgICAyLiBhIHBhdGgg dGhhdCdzIHJlYWRhYmxlCisKKyAgIGdldF91dWlkIGhhbmRsZXMgdGhlIGNhc2Ugd2hlcmUgYSBw YXRoIGRvZXNuJ3QgZXhpc3QgaW4gSEVBRCBhbmQgYWxzbyB0aGUKKyAgIGNhc2Ugd2hlcmUgdGhl IHJvb3Qgb2YgdGhlIHJlcG9zaXRvcnkgaXMgbm90IHJlYWRhYmxlLgorICAgSG93ZXZlciwgaXQg ZG9lcyBub3QgaGFuZGxlIHRoZSBjYXNlIHdoZXJlIHdlJ3JlIGZldGNoaW5nIHBhdGggbm90IGV4 aXN0aW5nCisgICBpbiBIRUFEIG9mIGEgcmVwb3NpdG9yeSB3aXRoIHVucmVhZGFibGUgcm9vdCBk aXJlY3RvcnkuCisgKi8KIHN0YXRpYyBzdm5fZXJyb3JfdCAqCiBzdm5fcmFfc2VyZl9fZ2V0X3V1 aWQoc3ZuX3JhX3Nlc3Npb25fdCAqcmFfc2Vzc2lvbiwKICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBjaGFyICoqdXVpZCwKQEAgLTExMjcsMTkgKzExNTIsMjUgQEAKIAogICBwcm9wcyA9IGFw cl9oYXNoX21ha2UocG9vbCk7CiAKLSAgU1ZOX0VSUihzdm5fcmFfc2VyZl9fcmV0cmlldmVfcHJv cHMocHJvcHMsIHNlc3Npb24sIHNlc3Npb24tPmNvbm5zWzBdLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBzZXNzaW9uLT5yZXBvc191cmxfc3RyLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBTVk5fSU5WQUxJRF9SRVZOVU0sICIwIiwgdXVpZF9w cm9wcywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcG9vbCkpOwotICAq dXVpZCA9IHN2bl9yYV9zZXJmX19nZXRfcHJvcChwcm9wcywgc2Vzc2lvbi0+cmVwb3NfdXJsX3N0 ciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU1ZOX0RBVl9QUk9QX05TX0RBViwg InJlcG9zaXRvcnktdXVpZCIpOwotCi0gIGlmICghKnV1aWQpCi0gICAgewotICAgICAgcmV0dXJu IHN2bl9lcnJvcl9jcmVhdGUoQVBSX0VHRU5FUkFMLCBOVUxMLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgXygiVGhlIFVVSUQgcHJvcGVydHkgd2FzIG5vdCBmb3VuZCBvbiB0aGUgIgot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAicmVzb3VyY2Ugb3IgYW55IG9mIGl0cyBw YXJlbnRzIikpOworICBpZiAoIXNlc3Npb24tPnV1aWQpCisgICAgeworICAgICAgY29uc3QgY2hh ciAqdmNjX3VybCwgKnJlbGF0aXZlX3VybDsKKworICAgICAgLyogV2UncmUgbm90IGludGVyZXN0 ZWQgaW4gdmNjX3VybCBhbmQgcmVsYXRpdmVfdXJsLCBidXQgdGhpcyBjYWxsIGFsc28KKyAgICAg ICAgIHN0b3JlcyB0aGUgcmVwb3NpdG9yeSdzIHV1aWQgaW4gdGhlIHNlc3Npb24uICovCisgICAg ICBTVk5fRVJSKHN2bl9yYV9zZXJmX19kaXNjb3Zlcl9yb290KCZ2Y2NfdXJsLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmcmVsYXRpdmVfdXJsLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZXNzaW9uLCBzZXNzaW9uLT5jb25uc1sw XSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Vzc2lvbi0+cmVw b3NfdXJsLnBhdGgsIHBvb2wpKTsKKyAgICAgIGlmICghc2Vzc2lvbi0+dXVpZCkKKyAgICAgICAg eworICAgICAgICAgIHJldHVybiBzdm5fZXJyb3JfY3JlYXRlKEFQUl9FR0VORVJBTCwgTlVMTCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfKCJUaGUgVVVJRCBwcm9wZXJ0eSB3 YXMgbm90IGZvdW5kIG9uIHRoZSAiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAicmVzb3VyY2Ugb3IgYW55IG9mIGl0cyBwYXJlbnRzIikpOworICAgICAgICB9CiAgICAgfQor ICAKKyAgKnV1aWQgPSBzZXNzaW9uLT51dWlkOwogCiAgIHJldHVybiBTVk5fTk9fRVJST1I7CiB9 Ci0tLSBzdWJ2ZXJzaW9uL2xpYnN2bl9yYV9zZXJmL3VwZGF0ZS5jCisrKyBzdWJ2ZXJzaW9uL2xp YnN2bl9yYV9zZXJmL3VwZGF0ZS5jCkBAIC05NzEsMTIgKzk3MSwxMSBAQAogICBzZXJmX2J1Y2tl dF9yZXNwb25zZV9zdGF0dXMocmVzcG9uc2UsICZzbCk7CiAKICAgLyogV29vLWhvby4gIE5vdGhp bmcgaGVyZSB0byBzZWUuICAqLwotICBpZiAoc2wuY29kZSA9PSA0MDQpCisgIGZldGNoX2N0eC0+ ZXJyID0gc3ZuX3JhX3NlcmZfX2Vycm9yX29uX3N0YXR1cyhzbC5jb2RlLCBmZXRjaF9jdHgtPmlu Zm8tPm5hbWUpOworICBpZiAoZmV0Y2hfY3R4LT5lcnIpCiAgICAgewogICAgICAgZmV0Y2hfY3R4 LT5kb25lID0gVFJVRTsKLSAgICAgIGZldGNoX2N0eC0+ZXJyID0gc3ZuX2Vycm9yX2NyZWF0ZWYo U1ZOX0VSUl9SQV9EQVZfUEFUSF9OT1RfRk9VTkQsIE5VTEwsCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICInJXMnIHBhdGggbm90IGZvdW5kIiwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmV0Y2hfY3R4LT5pbmZvLT5uYW1lKTsKKwog ICAgICAgcmV0dXJuIHN2bl9yYV9zZXJmX19oYW5kbGVfZGlzY2FyZF9ib2R5KHJlcXVlc3QsIHJl c3BvbnNlLCBOVUxMLCBwb29sKTsKICAgICB9CiAKLS0tIHN1YnZlcnNpb24vbGlic3ZuX3JhX3Nl cmYvdXRpbC5jCisrKyBzdWJ2ZXJzaW9uL2xpYnN2bl9yYV9zZXJmL3V0aWwuYwpAQCAtMTM0NCw3 ICsxMzQ0LDcgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcl9wb29sX3QgKnBvb2wp CiB7CiAgIGFwcl9oYXNoX3QgKnByb3BzOwotICBjb25zdCBjaGFyICpwYXRoLCAqcmVsYXRpdmVf cGF0aCwgKnByZXNlbnRfcGF0aCA9ICIiOworICBjb25zdCBjaGFyICpwYXRoLCAqcmVsYXRpdmVf cGF0aCwgKnByZXNlbnRfcGF0aCA9ICIiLCAqdXVpZDsKIAogICAvKiBJZiB3ZSdyZSBvbmx5IGlu dGVyZXN0ZWQgaW4gb3VyIFZDQywganVzdCByZXR1cm4gaXQuICovCiAgIGlmIChzZXNzaW9uLT52 Y2NfdXJsICYmICFyZWxfcGF0aCkKQEAgLTEzNTYsMzMgKzEzNTYsNDkgQEAKICAgcHJvcHMgPSBh cHJfaGFzaF9tYWtlKHBvb2wpOwogICBwYXRoID0gb3JpZ19wYXRoOwogICAqdmNjX3VybCA9IE5V TEw7CisgIHV1aWQgPSBOVUxMOwogCiAgIGRvCiAgICAgewotICAgICAgU1ZOX0VSUihzdm5fcmFf c2VyZl9fcmV0cmlldmVfcHJvcHMocHJvcHMsIHNlc3Npb24sIGNvbm4sCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYXRoLCBTVk5fSU5WQUxJRF9SRVZOVU0sCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiMCIsIGJhc2VfcHJvcHMs IHBvb2wpKTsKLSAgICAgICp2Y2NfdXJsID0KLSAgICAgICAgICBzdm5fcmFfc2VyZl9fZ2V0X3Zl cl9wcm9wKHByb3BzLCBwYXRoLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg U1ZOX0lOVkFMSURfUkVWTlVNLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IkRBVjoiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInZlcnNpb24tY29u dHJvbGxlZC1jb25maWd1cmF0aW9uIik7Ci0KLSAgICAgIGlmICgqdmNjX3VybCkKKyAgICAgIHN2 bl9lcnJvcl90ICplcnIgPSBzdm5fcmFfc2VyZl9fcmV0cmlldmVfcHJvcHMocHJvcHMsIHNlc3Np b24sIGNvbm4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHBhdGgsIFNWTl9JTlZBTElEX1JFVk5VTSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjAiLCBiYXNlX3Byb3BzLCBwb29sKTsKKyAg ICAgIGlmICghIGVycikKICAgICAgICAgeworICAgICAgICAgICp2Y2NfdXJsID0KKyAgICAgICAg ICAgICAgc3ZuX3JhX3NlcmZfX2dldF92ZXJfcHJvcChwcm9wcywgcGF0aCwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTVk5fSU5WQUxJRF9SRVZOVU0sCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIkRBVjoiLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICJ2ZXJzaW9uLWNvbnRyb2xsZWQtY29uZmlndXJhdGlv biIpOworCiAgICAgICAgICAgcmVsYXRpdmVfcGF0aCA9IHN2bl9yYV9zZXJmX19nZXRfdmVyX3By b3AocHJvcHMsIHBhdGgsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgU1ZOX0lOVkFMSURfUkVWTlVNLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNWTl9EQVZfUFJPUF9OU19EQVYsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImJhc2VsaW5lLXJl bGF0aXZlLXBhdGgiKTsKKworICAgICAgICAgIHV1aWQgPSBzdm5fcmFfc2VyZl9fZ2V0X3Zlcl9w cm9wKHByb3BzLCBwYXRoLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFNWTl9JTlZBTElEX1JFVk5VTSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBTVk5fREFWX1BST1BfTlNfREFWLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICJyZXBvc2l0b3J5LXV1aWQiKTsKICAgICAgICAgICBicmVhazsK ICAgICAgICAgfQotCi0gICAgICAvKiBUaGlzIGhhcHBlbnMgd2hlbiB0aGUgZmlsZSBpcyBtaXNz aW5nIGluIEhFQUQuICovCi0KLSAgICAgIC8qIE9rYXksIHN0cmlwIG9mZi4gKi8KLSAgICAgIHBy ZXNlbnRfcGF0aCA9IHN2bl9wYXRoX2pvaW4oc3ZuX3BhdGhfYmFzZW5hbWUocGF0aCwgcG9vbCks Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByZXNlbnRfcGF0aCwgcG9vbCk7 Ci0gICAgICBwYXRoID0gc3ZuX3BhdGhfZGlybmFtZShwYXRoLCBwb29sKTsKKyAgICAgIGVsc2UK KyAgICAgICAgeworICAgICAgICAgIGlmIChlcnItPmFwcl9lcnIgIT0gU1ZOX0VSUl9GU19OT1Rf Rk9VTkQpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgIHJldHVybiBlcnI7ICAvKiBmb3Vu ZCBhIF9yZWFsXyBlcnJvciAqLworICAgICAgICAgICAgfQorICAgICAgICAgIGVsc2UKKyAgICAg ICAgICAgIHsKKyAgICAgICAgICAgICAgLyogVGhpcyBoYXBwZW5zIHdoZW4gdGhlIGZpbGUgaXMg bWlzc2luZyBpbiBIRUFELiAqLworICAgICAgICAgICAgICBzdm5fZXJyb3JfY2xlYXIoZXJyKTsK KworICAgICAgICAgICAgICAvKiBPa2F5LCBzdHJpcCBvZmYuICovCisgICAgICAgICAgICAgIHBy ZXNlbnRfcGF0aCA9IHN2bl9wYXRoX2pvaW4oc3ZuX3BhdGhfYmFzZW5hbWUocGF0aCwgcG9vbCks CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJlc2VudF9wYXRo LCBwb29sKTsKKyAgICAgICAgICAgICAgcGF0aCA9IHN2bl9wYXRoX2Rpcm5hbWUocGF0aCwgcG9v bCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KICAgICB9CiAgIHdoaWxlICghc3ZuX3BhdGhf aXNfZW1wdHkocGF0aCkpOwogCkBAIC0xNDE5LDEyICsxNDM1LDIxIEBACiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzZXNzaW9uLT5wb29sKTsKICAgICB9CiAKKyAgLyogU3RvcmUgdGhl IHJlcG9zaXRvcnkgVVVJRCBpbiB0aGUgY2FjaGUuICovCisgIGlmICghc2Vzc2lvbi0+dXVpZCkK KyAgICB7CisgICAgICBzZXNzaW9uLT51dWlkID0gYXByX3BzdHJkdXAoc2Vzc2lvbi0+cG9vbCwg dXVpZCk7CisgICAgfQorCiAgIGlmIChyZWxfcGF0aCkKICAgICB7CiAgICAgICBpZiAocHJlc2Vu dF9wYXRoWzBdICE9ICdcMCcpCiAgICAgICAgIHsKLSAgICAgICAgICAqcmVsX3BhdGggPSBzdm5f cGF0aF91cmxfYWRkX2NvbXBvbmVudChyZWxhdGl2ZV9wYXRoLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHByZXNlbnRfcGF0aCwgcG9vbCk7CisgICAg ICAgICAgLyogVGhlIHJlbGF0aXZlIHBhdGggaXMgc3VwcG9zZWQgdG8gYmUgVVJJIGRlY29kZWQs IHNvIGRlY29kZQorICAgICAgICAgICAgIHByZXNlbnRfcGF0aCBiZWZvcmUgam9pbmluZyBib3Ro IHRvZ2V0aGVyLiAqLworICAgICAgICAgICpyZWxfcGF0aCA9IHN2bl9wYXRoX2pvaW4ocmVsYXRp dmVfcGF0aCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN2bl9wYXRoX3Vy aV9kZWNvZGUocHJlc2VudF9wYXRoLCBwb29sKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHBvb2wpOwogICAgICAgICB9CiAgICAgICBlbHNlCiAgICAgICAgIHsKQEAgLTE0 MzQsMyArMTQ1OSwxNiBAQAogCiAgIHJldHVybiBTVk5fTk9fRVJST1I7CiB9CisKK3N2bl9lcnJv cl90ICoKK3N2bl9yYV9zZXJmX19lcnJvcl9vbl9zdGF0dXMoaW50IHN0YXR1c19jb2RlLCBjb25z dCBjaGFyICpwYXRoKQoreworICBzd2l0Y2goc3RhdHVzX2NvZGUpIAorICAgIHsKKyAgICAgIGNh c2UgNDA0OgorICAgICAgICByZXR1cm4gc3ZuX2Vycm9yX2NyZWF0ZWYoU1ZOX0VSUl9GU19OT1Rf Rk9VTkQsIE5VTEwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfKCInJXMnIHBh dGggbm90IGZvdW5kIiksIHBhdGgpOworICAgIH0KKworICByZXR1cm4gU1ZOX05PX0VSUk9SOwor fQotLS0gc3VidmVyc2lvbi9zdm4vbWtkaXItY21kLmMKKysrIHN1YnZlcnNpb24vc3ZuL21rZGly LWNtZC5jCkBAIC04Nyw4ICs4Nyw3IEBACiAgICAgICBlbHNlIGlmICghKG9wdF9zdGF0ZS0+cGFy ZW50cykgJiYKICAgICAgICAgICAgICAgIChBUFJfU1RBVFVTX0lTX0VOT0VOVChlcnItPmFwcl9l cnIpIHx8IC8qIGluIHdjICovCiAgICAgICAgICAgICAgICAgZXJyLT5hcHJfZXJyID09IFNWTl9F UlJfRlNfTk9UX0RJUkVDVE9SWSB8fAotICAgICAgICAgICAgICAgIGVyci0+YXByX2VyciA9PSBT Vk5fRVJSX0ZTX05PVF9GT1VORCB8fCAvKiByYV9sb2NhbCBhbmQgcmFfc3ZuICovCi0gICAgICAg ICAgICAgICAgZXJyLT5hcHJfZXJyID09IFNWTl9FUlJfUkFfREFWX1BBVEhfTk9UX0ZPVU5EIC8q IHJhX25lb24gKi8pKQorICAgICAgICAgICAgICAgIGVyci0+YXByX2VyciA9PSBTVk5fRVJSX0ZT X05PVF9GT1VORCAvKiBhbGwgcmEgbGF5ZXJzICovKSkKICAgICAgICAgcmV0dXJuIHN2bl9lcnJv cl9xdWlja193cmFwCiAgICAgICAgICAgKGVyciwgXygiVHJ5ICdzdm4gbWtkaXIgLS1wYXJlbnRz JyBpbnN0ZWFkPyIpKTsKICAgICAgIGVsc2UK