68046 2011-09-13 18:17:34 -0700 WinCE builds with threads turned off 2012-09-20 10:14:27 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 54836 68068 68429 1 ggaren paroga dglazkov levin+threading webkit.review.bot oldest_to_newest 466752 0 ggaren 2011-09-13 18:17:34 -0700 Per email to webkit-dev, we're going to remove the "no threads" #ifdefs from JavaScriptCore and WebKit. Please update the WinCE platform to be compatible with this change. Try this, in Platform.h: Unconditionally set ENABLE_SINGLE_THREADED=0. Unconditionally set ENABLE_JSC_MULTIPLE_THREADS=1. Unconditionally set ENABLE_WTF_MULTIPLE_THREADS=1. Build and see what happens. I believe you'll need to link to libpthread to make the build succeed, or take on more extensive changes. See my suggestions here: https://bugs.webkit.org/show_bug.cgi?id=67864. 504769 1 115567 paroga 2011-11-17 05:18:45 -0800 Created attachment 115567 Patch 504775 2 115567 webkit-ews 2011-11-17 05:29:15 -0800 Comment on attachment 115567 Patch Attachment 115567 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/10312151 504783 3 115567 gyuyoung.kim 2011-11-17 05:55:40 -0800 Comment on attachment 115567 Patch Attachment 115567 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/10477165 504794 4 115567 webkit.review.bot 2011-11-17 06:17:04 -0800 Comment on attachment 115567 Patch Attachment 115567 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10312158 115567 2011-11-17 05:18:45 -0800 2011-11-17 06:17:56 -0800 Patch bug-68046-20111117141843.patch text/plain 8499 paroga U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx NDU1NDcxMzYyMjUyMTVmMjE1NmRkNWIxMmE2ZjE4ZWY1OGMyNGQwLi43MmRhYzM0YjZkZmNmOTg5 MDBkMWY0MjViYzcyMTc3YjViMDI1Y2IxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxMS0xMS0xNyAgUGF0cmljayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0 Lm9yZz4KKworICAgICAgICBbV0lOXSBSZW1vdmUgZGVwZW5kZW5jeSBvbiBwdGhyZWFkIGZyb20g TWFjaGluZVN0YWNrTWFya2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02ODA0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEltcGxlbWVudCBwdGhyZWFkIFRMUyBmdW5jdGlvbmFsaXR5IHdpdGggbmF0dmll IHdpbmRvd3MgZnVuY3Rpb25zLgorCisgICAgICAgICogaGVhcC9NYWNoaW5lU3RhY2tNYXJrZXIu Y3BwOiBVc2UgdGhlIG5ldyBmdW5jdGlvbnMgaW5zdGVhZCBvZiBwdGhyZWFkIGRpcmVjdGx5Lgor ICAgICAgICAqIGhlYXAvTWFjaGluZVN0YWNrTWFya2VyLmg6CisgICAgICAgICogd3RmL1RocmVh ZFNwZWNpZmljLmg6CisgICAgICAgIChXVEY6OlRocmVhZFNwZWNpZmljS2V5Q3JlYXRlKTogQWRk ZWQgd3JhcHBlciBhcm91bmQgcHRocmVhZF9rZXlfY3JlYXRlLgorICAgICAgICAoV1RGOjpUaHJl YWRTcGVjaWZpY0tleURlbGV0ZSk6IEFkZGVkIHdyYXBwZXIgYXJvdW5kIHB0aHJlYWRfa2V5X2Rl bGV0ZS4KKyAgICAgICAgKFdURjo6VGhyZWFkU3BlY2lmaWNTZXQpOiBBZGRlZCB3cmFwcGVyIGFy b3VuZCBwdGhyZWFkX3NldHNwZWNpZmljLgorICAgICAgICAoV1RGOjpUaHJlYWRTcGVjaWZpY0dl dCk6IEFkZGVkIHdyYXBwZXIgYXJvdW5kIHB0aHJlYWRfZ2V0c3BlY2lmaWMuCisgICAgICAgICog d3RmL1RocmVhZFNwZWNpZmljV2luLmNwcDoKKwogMjAxMS0xMS0xNSAgRmlsaXAgUGl6bG8gIDxm cGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIENvZGUgYmxvY2sgamV0dGlzb25pbmcgc2hvdWxk IGJlIHBhcnQgb2YgdGhlIEdDJ3MgdHJhbnNpdGl2ZSBjbG9zdXJlCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYWNoaW5lU3RhY2tNYXJrZXIuY3BwIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL2hlYXAvTWFjaGluZVN0YWNrTWFya2VyLmNwcAppbmRleCA4MDVjNjM0ZmI4 ZmViYTNhMmM0Y2Y1M2M3NGMwZjNiZDEwNzJmNzA3Li5kOTIxNjkzYzZkYjQ3YjBiN2QwM2IxOTNl OGY1NmIxOTI3YmM0NmNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9N YWNoaW5lU3RhY2tNYXJrZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01h Y2hpbmVTdGFja01hcmtlci5jcHAKQEAgLTE0NCwxMCArMTQ0LDggQEAgTWFjaGluZVRocmVhZHM6 Ok1hY2hpbmVUaHJlYWRzKEhlYXAqIGhlYXApCiAKIE1hY2hpbmVUaHJlYWRzOjp+TWFjaGluZVRo cmVhZHMoKQogewotICAgIGlmIChtX3RocmVhZFNwZWNpZmljKSB7Ci0gICAgICAgIGludCBlcnJv ciA9IHB0aHJlYWRfa2V5X2RlbGV0ZShtX3RocmVhZFNwZWNpZmljKTsKLSAgICAgICAgQVNTRVJU X1VOVVNFRChlcnJvciwgIWVycm9yKTsKLSAgICB9CisgICAgaWYgKG1fdGhyZWFkU3BlY2lmaWMp CisgICAgICAgIFdURjo6VGhyZWFkU3BlY2lmaWNLZXlEZWxldGUobV90aHJlYWRTcGVjaWZpYyk7 CiAKICAgICBNdXRleExvY2tlciByZWdpc3RlcmVkVGhyZWFkc0xvY2sobV9yZWdpc3RlcmVkVGhy ZWFkc011dGV4KTsKICAgICBmb3IgKFRocmVhZCogdCA9IG1fcmVnaXN0ZXJlZFRocmVhZHM7IHQ7 KSB7CkBAIC0xODQsMTkgKzE4MiwxNyBAQCB2b2lkIE1hY2hpbmVUaHJlYWRzOjptYWtlVXNhYmxl RnJvbU11bHRpcGxlVGhyZWFkcygpCiAgICAgaWYgKG1fdGhyZWFkU3BlY2lmaWMpCiAgICAgICAg IHJldHVybjsKIAotICAgIGludCBlcnJvciA9IHB0aHJlYWRfa2V5X2NyZWF0ZSgmbV90aHJlYWRT cGVjaWZpYywgcmVtb3ZlVGhyZWFkKTsKLSAgICBpZiAoZXJyb3IpCi0gICAgICAgIENSQVNIKCk7 CisgICAgVGhyZWFkU3BlY2lmaWNLZXlDcmVhdGUoJm1fdGhyZWFkU3BlY2lmaWMsIHJlbW92ZVRo cmVhZCk7CiB9CiAKIHZvaWQgTWFjaGluZVRocmVhZHM6OmFkZEN1cnJlbnRUaHJlYWQoKQogewog ICAgIEFTU0VSVCghbV9oZWFwLT5nbG9iYWxEYXRhKCktPmV4Y2x1c2l2ZVRocmVhZCB8fCBtX2hl YXAtPmdsb2JhbERhdGEoKS0+ZXhjbHVzaXZlVGhyZWFkID09IGN1cnJlbnRUaHJlYWQoKSk7CiAK LSAgICBpZiAoIW1fdGhyZWFkU3BlY2lmaWMgfHwgcHRocmVhZF9nZXRzcGVjaWZpYyhtX3RocmVh ZFNwZWNpZmljKSkKKyAgICBpZiAoIW1fdGhyZWFkU3BlY2lmaWMgfHwgVGhyZWFkU3BlY2lmaWNH ZXQobV90aHJlYWRTcGVjaWZpYykpCiAgICAgICAgIHJldHVybjsKIAotICAgIHB0aHJlYWRfc2V0 c3BlY2lmaWMobV90aHJlYWRTcGVjaWZpYywgdGhpcyk7CisgICAgVGhyZWFkU3BlY2lmaWNTZXQo bV90aHJlYWRTcGVjaWZpYywgdGhpcyk7CiAgICAgVGhyZWFkKiB0aHJlYWQgPSBuZXcgVGhyZWFk KGdldEN1cnJlbnRQbGF0Zm9ybVRocmVhZCgpLCBtX2hlYXAtPmdsb2JhbERhdGEoKS0+c3RhY2so KS5vcmlnaW4oKSk7CiAKICAgICBNdXRleExvY2tlciBsb2NrKG1fcmVnaXN0ZXJlZFRocmVhZHNN dXRleCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYWNoaW5lU3Rh Y2tNYXJrZXIuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL01hY2hpbmVTdGFja01hcmtl ci5oCmluZGV4IDY5YzQ1MzdiZGFiZWY2NGJkM2YwMDg4YjFlNGU2ODRlOTJmZWJlMmQuLjJhOTRk ZTA5NjZhM2E1MWViYWNkMWQ1ZTg5MTVjNDNjOTY1ODE1NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9oZWFwL01hY2hpbmVTdGFja01hcmtlci5oCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9oZWFwL01hY2hpbmVTdGFja01hcmtlci5oCkBAIC0yMiw4ICsyMiw4IEBACiAj aWZuZGVmIE1hY2hpbmVUaHJlYWRzX2gKICNkZWZpbmUgTWFjaGluZVRocmVhZHNfaAogCi0jaW5j bHVkZSA8cHRocmVhZC5oPgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgorI2luY2x1ZGUg PHd0Zi9UaHJlYWRTcGVjaWZpYy5oPgogI2luY2x1ZGUgPHd0Zi9UaHJlYWRpbmdQcmltaXRpdmVz Lmg+CiAKIG5hbWVzcGFjZSBKU0MgewpAQCAtNTUsNyArNTUsNyBAQCBuYW1lc3BhY2UgSlNDIHsK ICAgICAgICAgSGVhcCogbV9oZWFwOwogICAgICAgICBNdXRleCBtX3JlZ2lzdGVyZWRUaHJlYWRz TXV0ZXg7CiAgICAgICAgIFRocmVhZCogbV9yZWdpc3RlcmVkVGhyZWFkczsKLSAgICAgICAgcHRo cmVhZF9rZXlfdCBtX3RocmVhZFNwZWNpZmljOworICAgICAgICBXVEY6OlRocmVhZFNwZWNpZmlj S2V5IG1fdGhyZWFkU3BlY2lmaWM7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgSlNDCmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZFNwZWNpZmljLmggYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZFNwZWNpZmljLmgKaW5kZXggOTQwM2Q3MWVhZmYz NTFlMzU4YjIxZjI5OWVhYTZiZGQzNzU2NjBjOS4uMDU2YjIyM2ZiMjRiODc1NGZmODUwODg3ZTM0 MmZhNTc5ZmExMzQ5NSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9UaHJl YWRTcGVjaWZpYy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvVGhyZWFkU3BlY2lm aWMuaApAQCAtMSw2ICsxLDcgQEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDggQXBwbGUgSW5j LiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDA5IEppYW4gTGkgPGpp YW5saUBjaHJvbWl1bS5vcmc+CisgKiBDb3B5cmlnaHQgKEMpIDIwMTEgUGF0cmljayBHYW5zdGVy ZXIgPHBhcm9nYUBwYXJvZ2EuY29tPgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4g c291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9u LCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBA IC0xMTMsNiArMTE0LDQ2IEBAIHByaXZhdGU6CiAjZW5kaWYKIH07CiAKKyNpZiAhVVNFKFBUSFJF QURTKSAmJiAhUExBVEZPUk0oUVQpICYmICFQTEFURk9STShHVEspICYmIE9TKFdJTkRPV1MpCisK K2NsYXNzIFRocmVhZFNwZWNpZmljS2V5VmFsdWU7Cit0eXBlZGVmIFRocmVhZFNwZWNpZmljS2V5 VmFsdWUqIFRocmVhZFNwZWNpZmljS2V5OworCit2b2lkIFRocmVhZFNwZWNpZmljS2V5Q3JlYXRl KFRocmVhZFNwZWNpZmljS2V5Kiwgdm9pZCAoKikodm9pZCAqKSk7Cit2b2lkIFRocmVhZFNwZWNp ZmljS2V5RGVsZXRlKFRocmVhZFNwZWNpZmljS2V5KTsKK3ZvaWQgVGhyZWFkU3BlY2lmaWNTZXQo VGhyZWFkU3BlY2lmaWNLZXksIHZvaWQqKTsKK3ZvaWQqIFRocmVhZFNwZWNpZmljR2V0KFRocmVh ZFNwZWNpZmljS2V5KTsKKworI2Vsc2UKKwordHlwZWRlZiBwdGhyZWFkX2tleV90IFRocmVhZFNw ZWNpZmljS2V5OworCit2b2lkIFRocmVhZFNwZWNpZmljS2V5Q3JlYXRlKFRocmVhZFNwZWNpZmlj S2V5KiBrZXksIHZvaWQgKCpkZXN0cnVjdG9yKSh2b2lkICopKQoreworICAgIGludCBlcnJvciA9 IHB0aHJlYWRfa2V5X2NyZWF0ZShrZXksIGRlc3RydWN0b3IpOworICAgIGlmIChlcnJvcikKKyAg ICAgICAgQ1JBU0goKTsKK30KKwordm9pZCBUaHJlYWRTcGVjaWZpY0tleURlbGV0ZShUaHJlYWRT cGVjaWZpY0tleSBrZXkpCit7CisgICAgaW50IGVycm9yID0gcHRocmVhZF9rZXlfZGVsZXRlKGtl eSk7CisgICAgaWYgKGVycm9yKQorICAgICAgICBDUkFTSCgpOworfQorCit2b2lkIFRocmVhZFNw ZWNpZmljU2V0KFRocmVhZFNwZWNpZmljS2V5IGtleSwgdm9pZCogdmFsdWUpCit7CisgICAgcHRo cmVhZF9zZXRzcGVjaWZpYyhrZXksIHZhbHVlKTsKK30KKwordm9pZCogVGhyZWFkU3BlY2lmaWNH ZXQoVGhyZWFkU3BlY2lmaWNLZXkga2V5KQoreworICAgIHJldHVybiBwdGhyZWFkX2dldHNwZWNp ZmljKGtleSk7Cit9CisKKyNlbmRpZgorCiAjaWYgVVNFKFBUSFJFQURTKQogdGVtcGxhdGU8dHlw ZW5hbWUgVD4KIGlubGluZSBUaHJlYWRTcGVjaWZpYzxUPjo6VGhyZWFkU3BlY2lmaWMoKQpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRTcGVjaWZpY1dpbi5jcHAg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZFNwZWNpZmljV2luLmNwcAppbmRleCBk NzI5OTZhN2EwY2EwMjM5YTE0NjExOGQzZTA1YjFlNjgxYWQ1NjMxLi5lNGUxNzQ1OTg2MTRjZWI0 MTJjMTk1NWY4NjQyY2VjNjNiYWEyNmYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvd3RmL1RocmVhZFNwZWNpZmljV2luLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv d3RmL1RocmVhZFNwZWNpZmljV2luLmNwcApAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiBDb3B5cmln aHQgKEMpIDIwMDkgSmlhbiBMaSA8amlhbmxpQGNocm9taXVtLm9yZz4KKyAqIENvcHlyaWdodCAo QykgMjAxMSBQYXRyaWNrIEdhbnN0ZXJlciA8cGFyb2dhQHBhcm9nYS5jb20+CiAgKgogICogVGhp cyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9v cgogICogbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJh bCBQdWJsaWMKQEAgLTE5LDE1ICsyMCw3MiBAQAogICovCiAKICNpbmNsdWRlICJjb25maWcuaCIK LQogI2luY2x1ZGUgIlRocmVhZFNwZWNpZmljLmgiCiAKLSNpZiBVU0UoUFRIUkVBRFMpCi0jZXJy b3IgVGhpcyBmaWxlIHNob3VsZCBub3QgYmUgY29tcGlsZWQgYnkgcG9ydHMgdGhhdCBkbyBub3Qg dXNlIFdpbmRvd3MgbmF0aXZlIFRocmVhZFNwZWNpZmljIGltcGxlbWVudGF0aW9uLgotI2VuZGlm CisjaW5jbHVkZSAiU3RkTGliRXh0cmFzLmgiCisjaW5jbHVkZSAiVGhyZWFkaW5nUHJpbWl0aXZl cy5oIgorCisjaWYgIVVTRShQVEhSRUFEUykKIAogbmFtZXNwYWNlIFdURiB7CiAKK3N0YXRpYyBN dXRleCYgZGVzdHJ1Y3RvcnNNdXRleCgpCit7CisgICAgREVGSU5FX1NUQVRJQ19MT0NBTChNdXRl eCwgc3RhdGljTXV0ZXgsICgpKTsKKyAgICByZXR1cm4gc3RhdGljTXV0ZXg7Cit9CisKK2NsYXNz IFRocmVhZFNwZWNpZmljS2V5VmFsdWUgeworcHVibGljOgorICAgIFRocmVhZFNwZWNpZmljS2V5 VmFsdWUodm9pZCAoKmRlc3RydWN0b3IpKHZvaWQgKikpCisgICAgICAgIDogbV9kZXN0cnVjdG9y KGRlc3RydWN0b3IpCisgICAgeworICAgICAgICBtX3Rsc0tleSA9IFRsc0FsbG9jKCk7CisgICAg ICAgIGlmIChtX3Rsc0tleSA9PSBUTFNfT1VUX09GX0lOREVYRVMpCisgICAgICAgICAgICBDUkFT SCgpOworCisgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihkZXN0cnVjdG9yc011dGV4KCkpOwor ICAgICAgICBtX25leHQgPSBtX2ZpcnN0OworICAgICAgICBtX2ZpcnN0ID0gdGhpczsKKyAgICB9 CisKKyAgICB+VGhyZWFkU3BlY2lmaWNLZXlWYWx1ZSgpCisgICAgeworICAgICAgICBNdXRleExv Y2tlciBsb2NrZXIoZGVzdHJ1Y3RvcnNNdXRleCgpKTsKKyAgICAgICAgVGhyZWFkU3BlY2lmaWNL ZXlWYWx1ZSoqIG5leHQgPSAmbV9maXJzdDsKKyAgICAgICAgd2hpbGUgKCpuZXh0ICE9IHRoaXMp IHsKKyAgICAgICAgICAgIEFTU0VSVCgqbmV4dCk7CisgICAgICAgICAgICBuZXh0ID0gJigqbmV4 dCktPm1fbmV4dDsKKyAgICAgICAgfQorICAgICAgICAqbmV4dCA9ICgqbmV4dCktPm1fbmV4dDsK KworICAgICAgICBUbHNGcmVlKG1fdGxzS2V5KTsKKyAgICB9CisKKyAgICB2b2lkIHNldFZhbHVl KHZvaWQqIGRhdGEpIHsgVGxzU2V0VmFsdWUobV90bHNLZXksIGRhdGEpOyB9CisgICAgdm9pZCog dmFsdWUoKSB7IHJldHVybiBUbHNHZXRWYWx1ZShtX3Rsc0tleSk7IH0KKworICAgIHN0YXRpYyB2 b2lkIGNhbGxEZXN0cnVjdG9ycygpCisgICAgeworICAgICAgICBNdXRleExvY2tlciBsb2NrZXIo ZGVzdHJ1Y3RvcnNNdXRleCgpKTsKKyAgICAgICAgVGhyZWFkU3BlY2lmaWNLZXlWYWx1ZSogbmV4 dCA9IG1fZmlyc3Q7CisgICAgICAgIHdoaWxlIChuZXh0KSB7CisgICAgICAgICAgICBpZiAodm9p ZCogZGF0YSA9IG5leHQtPnZhbHVlKCkpCisgICAgICAgICAgICAgICAgbmV4dC0+bV9kZXN0cnVj dG9yKGRhdGEpOworICAgICAgICAgICAgbmV4dCA9IG5leHQtPm1fbmV4dDsKKyAgICAgICAgfQor ICAgIH0KKworcHJpdmF0ZToKKyAgICB2b2lkICgqbV9kZXN0cnVjdG9yKSh2b2lkICopOworICAg IERXT1JEIG1fdGxzS2V5OworICAgIFRocmVhZFNwZWNpZmljS2V5VmFsdWUqIG1fbmV4dDsKKwor ICAgIHN0YXRpYyBUaHJlYWRTcGVjaWZpY0tleVZhbHVlKiBtX2ZpcnN0OworfTsKKworVGhyZWFk U3BlY2lmaWNLZXlWYWx1ZSogVGhyZWFkU3BlY2lmaWNLZXlWYWx1ZTo6bV9maXJzdCA9IDA7CisK IGxvbmcmIHRsc0tleUNvdW50KCkKIHsKICAgICBzdGF0aWMgbG9uZyBjb3VudDsKQEAgLTQwLDYg Kzk4LDI2IEBAIERXT1JEKiB0bHNLZXlzKCkKICAgICByZXR1cm4ga2V5czsKIH0KIAordm9pZCBU aHJlYWRTcGVjaWZpY0tleUNyZWF0ZShUaHJlYWRTcGVjaWZpY0tleSoga2V5LCB2b2lkICgqZGVz dHJ1Y3Rvcikodm9pZCAqKSkKK3sKKyAgICAqa2V5ID0gbmV3IFRocmVhZFNwZWNpZmljS2V5VmFs dWUoZGVzdHJ1Y3Rvcik7Cit9CisKK3ZvaWQgVGhyZWFkU3BlY2lmaWNLZXlEZWxldGUoVGhyZWFk U3BlY2lmaWNLZXkga2V5KQoreworICAgIGRlbGV0ZSBrZXk7Cit9CisKK3ZvaWQgVGhyZWFkU3Bl Y2lmaWNTZXQoVGhyZWFkU3BlY2lmaWNLZXkga2V5LCB2b2lkKiBkYXRhKQoreworICAgIGtleS0+ c2V0VmFsdWUoZGF0YSk7Cit9CisKK3ZvaWQqIFRocmVhZFNwZWNpZmljR2V0KFRocmVhZFNwZWNp ZmljS2V5IGtleSkKK3sKKyAgICByZXR1cm4ga2V5LT52YWx1ZSgpOworfQorCiB2b2lkIFRocmVh ZFNwZWNpZmljVGhyZWFkRXhpdCgpCiB7CiAgICAgZm9yIChsb25nIGkgPSAwOyBpIDwgdGxzS2V5 Q291bnQoKTsgaSsrKSB7CkBAIC00OCw2ICsxMjYsMTAgQEAgdm9pZCBUaHJlYWRTcGVjaWZpY1Ro cmVhZEV4aXQoKQogICAgICAgICBpZiAoZGF0YSkKICAgICAgICAgICAgIGRhdGEtPmRlc3RydWN0 b3IoZGF0YSk7CiAgICAgfQorCisgICAgVGhyZWFkU3BlY2lmaWNLZXlWYWx1ZTo6Y2FsbERlc3Ry dWN0b3JzKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdURgorCisjZW5kaWYgLy8gIVVTRShQVEhS RUFEUykK