101301 2012-11-05 22:08:20 -0800 Web Inspector: JsDoc-annotate KeyboardShortcuts 2012-11-21 23:44:05 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 102476 101026 1 eustas.bug eustas.bug apavlov caseq eustas.bug keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 759244 0 eustas.bug 2012-11-05 22:08:20 -0800 JsDoc-annotate KeyboardShortcuts to improve readability. 759250 1 172486 eustas.bug 2012-11-05 22:19:39 -0800 Created attachment 172486 Patch 766388 2 174069 eustas.bug 2012-11-13 21:17:00 -0800 Created attachment 174069 Patch rebased 766471 3 174069 webkit.review.bot 2012-11-13 23:12:50 -0800 Comment on attachment 174069 Patch Clearing flags on attachment: 174069 Committed r134552: <http://trac.webkit.org/changeset/134552> 766472 4 webkit.review.bot 2012-11-13 23:12:53 -0800 All reviewed patches have been landed. Closing bug. 769088 5 vsevik 2012-11-16 03:51:08 -0800 Reopened since it was rolled out 172486 2012-11-05 22:19:39 -0800 2012-11-13 22:38:15 -0800 Patch bug-101301-20121106101751.patch text/plain 6600 eustas.bug U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzNTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWM1MDhmYzk2NzQxOTI5 YTg4ODRiYTY3MzkzZTVmZDIxMjI1NjZjMS4uZjYxNGZhODc1OTY0ZDAzY2Q4OThmNGEzNGI1MGNj OWYxN2Y4YmE5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTExLTA1ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXMuYnVnQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBKc0RvYy1hbm5vdGF0ZSBLZXlib2FyZFNob3J0Y3V0cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMzAxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSnNEb2MtYW5ub3RhdGUgS2V5Ym9hcmRT aG9ydGN1dHMgdG8gaW1wcm92ZSByZWFkYWJpbGl0eS4KKworICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvQWR2YW5jZWRTZWFyY2hDb250cm9sbGVyLmpzOiBGaXggcGFyYW1ldGVyIHR5cGUu CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9LZXlib2FyZFNob3J0Y3V0LmpzOiBBZGQg YW5ub3RhdGlvbnMuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qczogTWFr ZSBldmVudCBwYXJhbWV0ZXIgdHlwZWQuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanM6IERpdHRvLgorCiAyMDEyLTExLTA1ICBLZW5pY2hpIElzaGliYXNoaSAgPGJh c2hpQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIFVuaWNvZGUgY29tYmluaW5n IGRpYWNyaXRpY2FsIGFyZW4ndCBhbHdheXMgY29tYmluZWQgb24gTGludXgKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQWR2YW5jZWRTZWFyY2hDb250cm9s bGVyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BZHZhbmNlZFNlYXJj aENvbnRyb2xsZXIuanMKaW5kZXggOWRmYTc4Y2Q1ZjY4MGYzMjViMGQ2YjA1MWEyNTMxZTMzNzgx MTVhMy4uODU3ZWJhNDkwNThiOWZhMTBiN2QyZjI0ZDYwZmE4MzU2NWJmZjA2ZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BZHZhbmNlZFNlYXJjaENvbnRy b2xsZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BZHZhbmNl ZFNlYXJjaENvbnRyb2xsZXIuanMKQEAgLTQ5LDcgKzQ5LDcgQEAgV2ViSW5zcGVjdG9yLkFkdmFu Y2VkU2VhcmNoQ29udHJvbGxlci5jcmVhdGVTaG9ydGN1dCA9IGZ1bmN0aW9uKCkKIAogV2ViSW5z cGVjdG9yLkFkdmFuY2VkU2VhcmNoQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAgICAgLyoqCi0g ICAgICogQHBhcmFtIHtFdmVudH0gZXZlbnQKKyAgICAgKiBAcGFyYW0ge0tleWJvYXJkRXZlbnR9 IGV2ZW50CiAgICAgICogQHJldHVybiB7Ym9vbGVhbn0KICAgICAgKi8KICAgICBoYW5kbGVTaG9y dGN1dDogZnVuY3Rpb24oZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0tleWJvYXJkU2hvcnRjdXQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0tleWJvYXJkU2hvcnRjdXQuanMKaW5kZXggMzA1ZDliMTA1ZmUwZmNlM2Qx NDA1NjBlMjE4NzZjOGMxZTc1ZTI5Ni4uZDc2ODVhMDE3YTQ4ZGQwYWRiZTM2MGViMjI0YjExMzBi OWM0ZGQyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9L ZXlib2FyZFNob3J0Y3V0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvS2V5Ym9hcmRTaG9ydGN1dC5qcwpAQCAtNTEsNiArNTEsMTAgQEAgV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQuTW9kaWZpZXJzID0gewogICAgIH0KIH07CiAKKy8qKiBAdHlwZWRlZiB7 e2NvZGU6IG51bWJlciwgbmFtZTogKHN0cmluZ3xPYmplY3QuPHN0cmluZywgc3RyaW5nPil9fSAq LworV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5OworCisvKiogQHR5cGUgeyFPYmpl Y3QuPHN0cmluZywgIVdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleT59ICovCiBXZWJJ bnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlzID0gewogICAgIEJhY2tzcGFjZTogeyBjb2Rl OiA4LCBuYW1lOiAiXHUyMWE0IiB9LAogICAgIFRhYjogeyBjb2RlOiA5LCBuYW1lOiB7IG1hYzog Ilx1MjFlNSIsIG90aGVyOiAiPFRhYj4iIH0gfSwKQEAgLTkyLDggKzk2LDEwIEBAIFdlYkluc3Bl Y3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMgPSB7CiAvKioKICAqIENyZWF0ZXMgYSBudW1iZXIg ZW5jb2Rpbmcga2V5Q29kZSBpbiB0aGUgbG93ZXIgOCBiaXRzIGFuZCBtb2RpZmllcnMgbWFzayBp biB0aGUgaGlnaGVyIDggYml0cy4KICAqIEl0IGlzIHVzZWZ1bCBmb3IgbWF0Y2hpbmcgcHJlc3Nl ZCBrZXlzLgotICoga2V5Q29kZSBpcyB0aGUgQ29kZSBvZiB0aGUga2V5LCBvciBhIGNoYXJhY3Rl ciAiYS16IiB3aGljaCBpcyBjb252ZXJ0ZWQgdG8gYSBrZXlDb2RlIHZhbHVlLgorICoKKyAqIEBw YXJhbSB7bnVtYmVyfHN0cmluZ30ga2V5Q29kZSBUaGUgQ29kZSBvZiB0aGUga2V5LCBvciBhIGNo YXJhY3RlciAiYS16IiB3aGljaCBpcyBjb252ZXJ0ZWQgdG8gYSBrZXlDb2RlIHZhbHVlLgogICog QHBhcmFtIHtudW1iZXI9fSBtb2RpZmllcnMgT3B0aW9uYWwgbGlzdCBvZiBtb2RpZmllcnMgcGFz c2VkIGFzIGFkZGl0aW9uYWwgcGFyYW1lcnRlcnMuCisgKiBAcmV0dXJuIHtudW1iZXJ9CiAgKi8K IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VLZXkgPSBmdW5jdGlvbihrZXlDb2Rl LCBtb2RpZmllcnMpCiB7CkBAIC0xMDMsNiArMTA5LDEwIEBAIFdlYkluc3BlY3Rvci5LZXlib2Fy ZFNob3J0Y3V0Lm1ha2VLZXkgPSBmdW5jdGlvbihrZXlDb2RlLCBtb2RpZmllcnMpCiAgICAgcmV0 dXJuIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Ll9tYWtlS2V5RnJvbUNvZGVBbmRNb2Rp ZmllcnMoa2V5Q29kZSwgbW9kaWZpZXJzKTsKIH0KIAorLyoqCisgKiBAcGFyYW0ge0tleWJvYXJk RXZlbnR9IGtleWJvYXJkRXZlbnQKKyAqIEByZXR1cm4ge251bWJlcn0KKyAqLwogV2ViSW5zcGVj dG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleUZyb21FdmVudCA9IGZ1bmN0aW9uKGtleWJvYXJk RXZlbnQpCiB7CiAgICAgdmFyIG1vZGlmaWVycyA9IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0 Y3V0Lk1vZGlmaWVycy5Ob25lOwpAQCAtMTE3LDEzICsxMjcsMjEgQEAgV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQubWFrZUtleUZyb21FdmVudCA9IGZ1bmN0aW9uKGtleWJvYXJkRXZlbnQp CiAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Ll9tYWtlS2V5RnJvbUNv ZGVBbmRNb2RpZmllcnMoa2V5Ym9hcmRFdmVudC5rZXlDb2RlLCBtb2RpZmllcnMpOwogfQogCisv KioKKyAqIEBwYXJhbSB7S2V5Ym9hcmRFdmVudH0gZXZlbnQKKyAqLwogV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQuZXZlbnRIYXNDdHJsT3JNZXRhID0gZnVuY3Rpb24oZXZlbnQpCiB7CiAg ICAgcmV0dXJuIFdlYkluc3BlY3Rvci5pc01hYygpID8gZXZlbnQubWV0YUtleSAmJiAhZXZlbnQu Y3RybEtleSA6IGV2ZW50LmN0cmxLZXkgJiYgIWV2ZW50Lm1ldGFLZXk7CiB9CiAKKy8qKiBAdHlw ZWRlZiB7e2tleTogbnVtYmVyLCBuYW1lOiBzdHJpbmd9fSAqLworV2ViSW5zcGVjdG9yLktleWJv YXJkU2hvcnRjdXQuRGVzY3JpcHRvcjsKKwogLyoqCisgKiBAcGFyYW0ge3N0cmluZ3xXZWJJbnNw ZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXl9IGtleQogICogQHBhcmFtIHtudW1iZXI9fSBtb2Rp ZmllcnMKKyAqIEByZXR1cm4ge1dlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LkRlc2NyaXB0 b3J9CiAgKi8KIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VEZXNjcmlwdG9yID0g ZnVuY3Rpb24oa2V5LCBtb2RpZmllcnMpCiB7CkBAIC0xMzQsMjcgKzE1Miw0MiBAQCBXZWJJbnNw ZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlRGVzY3JpcHRvciA9IGZ1bmN0aW9uKGtleSwgbW9k aWZpZXJzKQogfQogCiAvKioKKyAqIEBwYXJhbSB7c3RyaW5nfFdlYkluc3BlY3Rvci5LZXlib2Fy ZFNob3J0Y3V0LktleX0ga2V5CiAgKiBAcGFyYW0ge251bWJlcj19IG1vZGlmaWVycworICogQHJl dHVybiB7c3RyaW5nfQogICovCiBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5zaG9ydGN1 dFRvU3RyaW5nID0gZnVuY3Rpb24oa2V5LCBtb2RpZmllcnMpCiB7CiAgICAgcmV0dXJuIFdlYklu c3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Ll9tb2RpZmllcnNUb1N0cmluZyhtb2RpZmllcnMpICsg V2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuX2tleU5hbWUoa2V5KTsKIH0KIAorLyoqCisg KiBAcGFyYW0ge3N0cmluZ3xXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXl9IGtleQor ICogQHJldHVybiB7c3RyaW5nfQorICovCiBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5f a2V5TmFtZSA9IGZ1bmN0aW9uKGtleSkKIHsKICAgICBpZiAodHlwZW9mIGtleSA9PT0gInN0cmlu ZyIpCiAgICAgICAgIHJldHVybiBrZXkudG9VcHBlckNhc2UoKTsKICAgICBpZiAodHlwZW9mIGtl eS5uYW1lID09PSAic3RyaW5nIikKICAgICAgICAgcmV0dXJuIGtleS5uYW1lOwotICAgIHJldHVy biBrZXkubmFtZVtXZWJJbnNwZWN0b3IucGxhdGZvcm0oKV0gfHwga2V5Lm5hbWUub3RoZXI7Cisg ICAgcmV0dXJuIGtleS5uYW1lW1dlYkluc3BlY3Rvci5wbGF0Zm9ybSgpXSB8fCBrZXkubmFtZS5v dGhlciB8fCAnJzsKIH0KIAorLyoqCisgKiBAcGFyYW0ge251bWJlcn0ga2V5Q29kZQorICogQHBh cmFtIHs/bnVtYmVyfSBtb2RpZmllcnMKKyAqIEByZXR1cm4ge251bWJlcn0KKyAqLwogV2ViSW5z cGVjdG9yLktleWJvYXJkU2hvcnRjdXQuX21ha2VLZXlGcm9tQ29kZUFuZE1vZGlmaWVycyA9IGZ1 bmN0aW9uKGtleUNvZGUsIG1vZGlmaWVycykKIHsKICAgICByZXR1cm4gKGtleUNvZGUgJiAyNTUp IHwgKG1vZGlmaWVycyA8PCA4KTsKIH07CiAKKy8qKgorICogQHBhcmFtIHtudW1iZXJ8dW5kZWZp bmVkfSBtb2RpZmllcnMKKyAqIEByZXR1cm4ge3N0cmluZ30KKyAqLwogV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQuX21vZGlmaWVyc1RvU3RyaW5nID0gZnVuY3Rpb24obW9kaWZpZXJzKQog ewogICAgIGNvbnN0IGNtZEtleSA9ICJcdTIzMTgiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUGFuZWwuanMKaW5kZXggZjA1ZGIyMDQ0OTkyNjczNzViZmRiODBlZDMzMDhk N2M3NWQxZjU4Yi4uMThhZjBhMTM0NDQ0YTIzM2U2ZTBiYzMxMDI2MDNiMzRkYTZiYWM5ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzCkBAIC0yMjksNiAr MjI5LDkgQEAgV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJu IFtdOwogICAgIH0sCiAKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0tleWJvYXJkRXZlbnR9IGV2 ZW50CisgICAgICovCiAgICAgaGFuZGxlU2hvcnRjdXQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsK ICAgICAgICAgdmFyIHNob3J0Y3V0S2V5ID0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQu bWFrZUtleUZyb21FdmVudChldmVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDc5OWQ0ZDk4MDcxNzI3NDdlZDUyNGJkNGVhMTdh ZDVmNjc5ODVkZDkuLjM5MTQ4ZTFmYWNjNTAxZGEzZWI2NDlhNDE3OTRiMWM5NDAwM2ZiYzMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCkBA IC02NDcsNiArNjQ3LDkgQEAgV2ViSW5zcGVjdG9yLl9yZWdpc3RlclNob3J0Y3V0cyA9IGZ1bmN0 aW9uKCkKICAgICBzZWN0aW9uLmFkZEtleShnb1RvU2hvcnRjdXQubmFtZSwgV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJHbyB0byBsaW5lIikpOwogfQogCisvKioKKyAqIEBwYXJhbSB7S2V5Ym9hcmRF dmVudH0gZXZlbnQKKyAqLwogV2ViSW5zcGVjdG9yLmRvY3VtZW50S2V5RG93biA9IGZ1bmN0aW9u KGV2ZW50KQogewogICAgIGNvbnN0IGhlbHBLZXkgPSBXZWJJbnNwZWN0b3IuaXNNYWMoKSA/ICJV KzAwM0YiIDogIlUrMDBCRiI7IC8vICI/IiBmb3IgYm90aCBwbGF0Zm9ybXMK 174069 2012-11-13 21:17:00 -0800 2012-11-13 23:12:50 -0800 Patch bug-101301-20121114091459.patch text/plain 6612 eustas.bug U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0NTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmNkODRjMzRkNjllNDE3 NWI1NGZlMmMyZGY2YTRlN2QyOTVlZGMxYi4uMmFlNmE5MTZmZjk4Y2Q0ZjkxZmY3MmVmM2M3Njk0 ZmVmMGUyZjgwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTExLTE0ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXMuYnVnQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBKc0RvYy1hbm5vdGF0ZSBLZXlib2FyZFNob3J0Y3V0cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMzAxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSnNEb2MtYW5ub3RhdGUgS2V5Ym9hcmRT aG9ydGN1dHMgdG8gaW1wcm92ZSByZWFkYWJpbGl0eS4KKworICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvQWR2YW5jZWRTZWFyY2hDb250cm9sbGVyLmpzOiBGaXggcGFyYW1ldGVyIHR5cGUu CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9LZXlib2FyZFNob3J0Y3V0LmpzOiBBZGQg YW5ub3RhdGlvbnMuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qczogTWFr ZSBldmVudCBwYXJhbWV0ZXIgdHlwZWQuCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9p bnNwZWN0b3IuanM6IERpdHRvLgorCiAyMDEyLTExLTEzICBKb3NodWEgQmVsbCAgPGpzYmVsbEBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgSW5kZXhlZERCOiBSdW4gbXVsdGlwbGUgdGFza3MgcGVy IHRyYW5zYWN0aW9uIHRpY2sKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvQWR2YW5jZWRTZWFyY2hDb250cm9sbGVyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9BZHZhbmNlZFNlYXJjaENvbnRyb2xsZXIuanMKaW5kZXggN2EyYzI2 ZGZhYWFiOTc4ODViNDk4MWRhNTM0ZTgwMGNhZTMzYjg1Zi4uM2Y0ZjhkZmQ0MDg4YWM4YjJlMjkz OTI5OGQ3OGExM2I0NTkwMGQ4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9BZHZhbmNlZFNlYXJjaENvbnRyb2xsZXIuanMKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BZHZhbmNlZFNlYXJjaENvbnRyb2xsZXIuanMKQEAgLTUy LDcgKzUyLDcgQEAgV2ViSW5zcGVjdG9yLkFkdmFuY2VkU2VhcmNoQ29udHJvbGxlci5jcmVhdGVT aG9ydGN1dCA9IGZ1bmN0aW9uKCkKIAogV2ViSW5zcGVjdG9yLkFkdmFuY2VkU2VhcmNoQ29udHJv bGxlci5wcm90b3R5cGUgPSB7CiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtFdmVudH0gZXZlbnQK KyAgICAgKiBAcGFyYW0ge0tleWJvYXJkRXZlbnR9IGV2ZW50CiAgICAgICogQHJldHVybiB7Ym9v bGVhbn0KICAgICAgKi8KICAgICBoYW5kbGVTaG9ydGN1dDogZnVuY3Rpb24oZXZlbnQpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0tleWJvYXJkU2hvcnRj dXQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0tleWJvYXJkU2hvcnRj dXQuanMKaW5kZXggOWExZjUyMGNkZDQzNjcyYWIwY2YwNzljM2FkMDBjZDYyYTgxZTEwZS4uOWI4 ZDg2OGY3YTY5ODg3OWU4ZWNlYmM1YzcwYmJmNWNjMTFiYmIzNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9LZXlib2FyZFNob3J0Y3V0LmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvS2V5Ym9hcmRTaG9ydGN1dC5qcwpAQCAt NTEsNiArNTEsMTAgQEAgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXJzID0g ewogICAgIH0KIH07CiAKKy8qKiBAdHlwZWRlZiB7e2NvZGU6IG51bWJlciwgbmFtZTogKHN0cmlu Z3xPYmplY3QuPHN0cmluZywgc3RyaW5nPil9fSAqLworV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQuS2V5OworCisvKiogQHR5cGUgeyFPYmplY3QuPHN0cmluZywgIVdlYkluc3BlY3Rvci5L ZXlib2FyZFNob3J0Y3V0LktleT59ICovCiBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5L ZXlzID0gewogICAgIEJhY2tzcGFjZTogeyBjb2RlOiA4LCBuYW1lOiAiXHUyMWE0IiB9LAogICAg IFRhYjogeyBjb2RlOiA5LCBuYW1lOiB7IG1hYzogIlx1MjFlNSIsIG90aGVyOiAiPFRhYj4iIH0g fSwKQEAgLTkyLDggKzk2LDEwIEBAIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMg PSB7CiAvKioKICAqIENyZWF0ZXMgYSBudW1iZXIgZW5jb2Rpbmcga2V5Q29kZSBpbiB0aGUgbG93 ZXIgOCBiaXRzIGFuZCBtb2RpZmllcnMgbWFzayBpbiB0aGUgaGlnaGVyIDggYml0cy4KICAqIEl0 IGlzIHVzZWZ1bCBmb3IgbWF0Y2hpbmcgcHJlc3NlZCBrZXlzLgotICoga2V5Q29kZSBpcyB0aGUg Q29kZSBvZiB0aGUga2V5LCBvciBhIGNoYXJhY3RlciAiYS16IiB3aGljaCBpcyBjb252ZXJ0ZWQg dG8gYSBrZXlDb2RlIHZhbHVlLgorICoKKyAqIEBwYXJhbSB7bnVtYmVyfHN0cmluZ30ga2V5Q29k ZSBUaGUgQ29kZSBvZiB0aGUga2V5LCBvciBhIGNoYXJhY3RlciAiYS16IiB3aGljaCBpcyBjb252 ZXJ0ZWQgdG8gYSBrZXlDb2RlIHZhbHVlLgogICogQHBhcmFtIHtudW1iZXI9fSBtb2RpZmllcnMg T3B0aW9uYWwgbGlzdCBvZiBtb2RpZmllcnMgcGFzc2VkIGFzIGFkZGl0aW9uYWwgcGFyYW1lcnRl cnMuCisgKiBAcmV0dXJuIHtudW1iZXJ9CiAgKi8KIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0 Y3V0Lm1ha2VLZXkgPSBmdW5jdGlvbihrZXlDb2RlLCBtb2RpZmllcnMpCiB7CkBAIC0xMDMsNiAr MTA5LDEwIEBAIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VLZXkgPSBmdW5jdGlv bihrZXlDb2RlLCBtb2RpZmllcnMpCiAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0Ll9tYWtlS2V5RnJvbUNvZGVBbmRNb2RpZmllcnMoa2V5Q29kZSwgbW9kaWZpZXJzKTsK IH0KIAorLyoqCisgKiBAcGFyYW0ge0tleWJvYXJkRXZlbnR9IGtleWJvYXJkRXZlbnQKKyAqIEBy ZXR1cm4ge251bWJlcn0KKyAqLwogV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtl eUZyb21FdmVudCA9IGZ1bmN0aW9uKGtleWJvYXJkRXZlbnQpCiB7CiAgICAgdmFyIG1vZGlmaWVy cyA9IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5Ob25lOwpAQCAtMTE3 LDE2ICsxMjcsMjEgQEAgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleUZyb21F dmVudCA9IGZ1bmN0aW9uKGtleWJvYXJkRXZlbnQpCiAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5L ZXlib2FyZFNob3J0Y3V0Ll9tYWtlS2V5RnJvbUNvZGVBbmRNb2RpZmllcnMoa2V5Ym9hcmRFdmVu dC5rZXlDb2RlLCBtb2RpZmllcnMpOwogfQogCisvKioKKyAqIEBwYXJhbSB7S2V5Ym9hcmRFdmVu dH0gZXZlbnQKKyAqLwogV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuZXZlbnRIYXNDdHJs T3JNZXRhID0gZnVuY3Rpb24oZXZlbnQpCiB7CiAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5pc01h YygpID8gZXZlbnQubWV0YUtleSAmJiAhZXZlbnQuY3RybEtleSA6IGV2ZW50LmN0cmxLZXkgJiYg IWV2ZW50Lm1ldGFLZXk7CiB9CiAKIC8qKiBAdHlwZWRlZiB7e2tleTogbnVtYmVyLCBuYW1lOiBz dHJpbmd9fSAqLwotIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LkRlc2NyaXB0b3I7CitX ZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5EZXNjcmlwdG9yOwogCiAvKioKKyAqIEBwYXJh bSB7c3RyaW5nfFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleX0ga2V5CiAgKiBAcGFy YW0ge251bWJlcj19IG1vZGlmaWVycworICogQHJldHVybiB7V2ViSW5zcGVjdG9yLktleWJvYXJk U2hvcnRjdXQuRGVzY3JpcHRvcn0KICAqLwogV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQu bWFrZURlc2NyaXB0b3IgPSBmdW5jdGlvbihrZXksIG1vZGlmaWVycykKIHsKQEAgLTEzNywyNyAr MTUyLDQyIEBAIFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VEZXNjcmlwdG9yID0g ZnVuY3Rpb24oa2V5LCBtb2RpZmllcnMpCiB9CiAKIC8qKgorICogQHBhcmFtIHtzdHJpbmd8V2Vi SW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5fSBrZXkKICAqIEBwYXJhbSB7bnVtYmVyPX0g bW9kaWZpZXJzCisgKiBAcmV0dXJuIHtzdHJpbmd9CiAgKi8KIFdlYkluc3BlY3Rvci5LZXlib2Fy ZFNob3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmcgPSBmdW5jdGlvbihrZXksIG1vZGlmaWVycykKIHsK ICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuX21vZGlmaWVyc1RvU3Ry aW5nKG1vZGlmaWVycykgKyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5fa2V5TmFtZShr ZXkpOwogfQogCisvKioKKyAqIEBwYXJhbSB7c3RyaW5nfFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0LktleX0ga2V5CisgKiBAcmV0dXJuIHtzdHJpbmd9CisgKi8KIFdlYkluc3BlY3Rvci5L ZXlib2FyZFNob3J0Y3V0Ll9rZXlOYW1lID0gZnVuY3Rpb24oa2V5KQogewogICAgIGlmICh0eXBl b2Yga2V5ID09PSAic3RyaW5nIikKICAgICAgICAgcmV0dXJuIGtleS50b1VwcGVyQ2FzZSgpOwog ICAgIGlmICh0eXBlb2Yga2V5Lm5hbWUgPT09ICJzdHJpbmciKQogICAgICAgICByZXR1cm4ga2V5 Lm5hbWU7Ci0gICAgcmV0dXJuIGtleS5uYW1lW1dlYkluc3BlY3Rvci5wbGF0Zm9ybSgpXSB8fCBr ZXkubmFtZS5vdGhlcjsKKyAgICByZXR1cm4ga2V5Lm5hbWVbV2ViSW5zcGVjdG9yLnBsYXRmb3Jt KCldIHx8IGtleS5uYW1lLm90aGVyIHx8ICcnOwogfQogCisvKioKKyAqIEBwYXJhbSB7bnVtYmVy fSBrZXlDb2RlCisgKiBAcGFyYW0gez9udW1iZXJ9IG1vZGlmaWVycworICogQHJldHVybiB7bnVt YmVyfQorICovCiBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5fbWFrZUtleUZyb21Db2Rl QW5kTW9kaWZpZXJzID0gZnVuY3Rpb24oa2V5Q29kZSwgbW9kaWZpZXJzKQogewogICAgIHJldHVy biAoa2V5Q29kZSAmIDI1NSkgfCAobW9kaWZpZXJzIDw8IDgpOwogfTsKIAorLyoqCisgKiBAcGFy YW0ge251bWJlcnx1bmRlZmluZWR9IG1vZGlmaWVycworICogQHJldHVybiB7c3RyaW5nfQorICov CiBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5fbW9kaWZpZXJzVG9TdHJpbmcgPSBmdW5j dGlvbihtb2RpZmllcnMpCiB7CiAgICAgY29uc3QgY21kS2V5ID0gIlx1MjMxOCI7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BhbmVsLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcwppbmRleCAzYjEzMTQwOGQ3MWFl ZTkxNzE5NmI1YTIyNDA5ZjNiMjgwMWQ3MmQwLi4yNDhkYjk5NTNiNThkZmIzMDU2ZjE1ODYwNTg5 YmQ1NjhkNGYxZTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFu ZWwuanMKQEAgLTIyOSw2ICsyMjksOSBAQCBXZWJJbnNwZWN0b3IuUGFuZWwucHJvdG90eXBlID0g ewogICAgICAgICByZXR1cm4gW107CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEBwYXJhbSB7 S2V5Ym9hcmRFdmVudH0gZXZlbnQKKyAgICAgKi8KICAgICBoYW5kbGVTaG9ydGN1dDogZnVuY3Rp b24oZXZlbnQpCiAgICAgewogICAgICAgICB2YXIgc2hvcnRjdXRLZXkgPSBXZWJJbnNwZWN0b3Iu S2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5RnJvbUV2ZW50KGV2ZW50KTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggNDE1YzNkYTg3ZjQ3 YjRhM2E5ZWUyZTIwNWUwMTY1OTRkOWJkMTU4Yi4uZWQ2NmUxMjFkYjMwNzIxMWExNWNhYzk1Y2Jh ZWIwZWZiNTMyNGU5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9pbnNwZWN0b3IuanMKQEAgLTY0OCw2ICs2NDgsOSBAQCBXZWJJbnNwZWN0b3IuX3JlZ2lzdGVy U2hvcnRjdXRzID0gZnVuY3Rpb24oKQogICAgIHNlY3Rpb24uYWRkS2V5KGdvVG9TaG9ydGN1dCwg V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJHbyB0byBsaW5lIikpOwogfQogCisvKioKKyAqIEBwYXJh bSB7S2V5Ym9hcmRFdmVudH0gZXZlbnQKKyAqLwogV2ViSW5zcGVjdG9yLmRvY3VtZW50S2V5RG93 biA9IGZ1bmN0aW9uKGV2ZW50KQogewogICAgIGNvbnN0IGhlbHBLZXkgPSBXZWJJbnNwZWN0b3Iu aXNNYWMoKSA/ICJVKzAwM0YiIDogIlUrMDBCRiI7IC8vICI/IiBmb3IgYm90aCBwbGF0Zm9ybXMK