108795 2013-02-03 23:34:56 -0800 INPUT_MULTIPLE_FIELDS_UI: Read-only inputs should be focusable 2013-02-05 18:36:12 -0800 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 108447 108911 108914 108924 1 tkent tkent haraken mifenton morrita ojan.autocc webkit.review.bot oldest_to_newest 824092 0 tkent 2013-02-03 23:34:56 -0800 INPUT_MULTIPLE_FIELDS_UI: Read-only inputs should be focusable. http://www.whatwg.org/specs/web-apps/current-work/multipage/common-input-element-attributes.html#the-readonly-attribute > Note: The difference between disabled and readonly is that read-only controls are still focusable, so the user can still select the text and interact with it, whereas disabled controls are entirely non-interactive. (For this reason, only text controls can be made read-only: it wouldn't make sense for checkboxes or buttons, for instances.) 825908 1 186719 tkent 2013-02-05 16:00:43 -0800 Created attachment 186719 Patch 825970 2 186719 haraken 2013-02-05 17:44:06 -0800 Comment on attachment 186719 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186719&action=review > Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp:-130 > - if (isDisabled()) > - return; Is it OK to remove it? (Did you check all the call sites of handleKeyboardEvent() ?) > LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-keyboard-events.html:157 > +beginTest('Tab navigation should not skip readonly inputs, but editing operations should be ignored.', ''); > before.focus(); > +input.value = '01:01'; > input.readOnly = true; > keyDown('\t'); > +shouldBeEqualToString('document.activeElement.id', 'input'); > +shouldBeEqualToString('keyDown("upArrow"); input.value', '01:01'); > +shouldBeEqualToString('keyDown("downArrow"); input.value', '01:01'); > +keyDown('rightArrow'); > +shouldBeEqualToString('keyDown("3"); input.value', '01:01'); > +keyDown('\t'); > +keyDown('\t'); This test looks a bit weak to test the change. Could you test a focused element after each action by using internals.youngestShadowRoot(input).activeElement.getAttribute("pseudo") ? Also it would be good to add a test for keyDown('leftArrow'). 825981 3 186719 tkent 2013-02-05 18:05:30 -0800 Comment on attachment 186719 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186719&action=review >> Source/WebCore/html/shadow/DateTimeNumericFieldElement.cpp:-130 >> - return; > > Is it OK to remove it? (Did you check all the call sites of handleKeyboardEvent() ?) I'm very sure it's ok. I'll change this part to ASSERT(!isDisabled()); >> LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-keyboard-events.html:157 >> +keyDown('\t'); > > This test looks a bit weak to test the change. Could you test a focused element after each action by using internals.youngestShadowRoot(input).activeElement.getAttribute("pseudo") ? Also it would be good to add a test for keyDown('leftArrow'). will do 825985 4 186737 tkent 2013-02-05 18:09:01 -0800 Created attachment 186737 Patch 2 assert and test improvement 825989 5 186737 haraken 2013-02-05 18:14:39 -0800 Comment on attachment 186737 Patch 2 Looks OK 826003 6 186737 webkit.review.bot 2013-02-05 18:36:09 -0800 Comment on attachment 186737 Patch 2 Clearing flags on attachment: 186737 Committed r141960: <http://trac.webkit.org/changeset/141960> 826004 7 webkit.review.bot 2013-02-05 18:36:12 -0800 All reviewed patches have been landed. Closing bug. 186719 2013-02-05 16:00:43 -0800 2013-02-05 18:08:56 -0800 Patch bug-108795-20130206085720.patch text/plain 14124 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxOTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2JlNDhmODJmN2QwNTM2 MWIwNzM2NDVmNGE3ZTlkZmNhMGUyODNjYi4uZjMzZTk3YmRiMWMzZDgwZmQ1NTVlMmVkYmRlYzNl NWY0ODg0NTc4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYwIEBACisyMDEzLTAyLTA1ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBJTlBVVF9NVUxUSVBMRV9G SUVMRFNfVUk6IFJlYWQtb25seSBpbnB1dHMgc2hvdWxkIGJlIGZvY3VzYWJsZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4Nzk1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWNjb3JkaW5nIHRvIHRoZSBz dGFuZGFyZCBbMV0sIHJlYWRvbmx5IGZvcm0gY29udHJvbHMgc2hvdWxkIGJlIGZvY3VzYWJsZS4K KworICAgICAgICAtIFN1Yi1maWVsZHMgc2hvdWxkIGJlIGZvY3VzYWJsZSBpZiB0aGV5IGFyZSBy ZWFkLW9ubHkuIFdlIHNob3VsZCBjaGVjaworICAgICAgICAgIGlzRGlzYWJsZWQgbWFpbmx5Lgor ICAgICAgICAtIEFsbCBrZXlib2FyZCBvcGVyYXRpb25zIHNob3VsZCBub3QgYmUgaGFuZGxlZCBp ZiBhIGZpZWxkIGlzIGRpc2FibGVkLAorICAgICAgICAgIGFuZCBmb2N1cyBuYXZpZ2F0aW9uIGtl eWJvYXJkIG9wZXJhdGlvbnMgc2hvdWxkIGJlIGhhbmRsZWQgZXZlbiBpZiBhCisgICAgICAgICAg ZmllbGQgaXMgcmVhZC1vbmx5LgorCisgICAgICAgIFsxXSBodHRwOi8vd3d3LndoYXR3Zy5vcmcv c3BlY3Mvd2ViLWFwcHMvY3VycmVudC13b3JrL211bHRpcGFnZS9jb21tb24taW5wdXQtZWxlbWVu dC1hdHRyaWJ1dGVzLmh0bWwjdGhlLXJlYWRvbmx5LWF0dHJpYnV0ZQorCisgICAgICAgIE5vIG5l dyB0ZXN0cy4gVXBkYXRlCisgICAgICAgIGZhc3QvZm9ybXMvdGltZS1tdWx0aXBsZS1maWVsZHMv dGltZS1tdWx0aXBsZS1maWVsZHMta2V5Ym9hcmQtZXZlbnRzLmh0bWwKKyAgICAgICAgZm9yIHRo ZSBuZXcgYmVoYXZpb3IuCisKKyAgICAgICAgKiBodG1sL0Jhc2VNdWx0aXBsZUZpZWxkc0RhdGVB bmRUaW1lSW5wdXRUeXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkJhc2VNdWx0aXBsZUZpZWxk c0RhdGVBbmRUaW1lSW5wdXRUeXBlOjppc0tleWJvYXJkRm9jdXNhYmxlKToKKyAgICAgICAgTWFr ZSA8aW5wdXQ+IGZvY3VzYWJsZSBldmVuIGlmIGl0IGlzIHJlYWQtb25seS4KKyAgICAgICAgKiBo dG1sL3NoYWRvdy9EYXRlVGltZUVkaXRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRh dGVUaW1lRWRpdEVsZW1lbnQ6OmlzRmllbGRPd25lckRpc2FibGVkKToKKyAgICAgICAgU2VwYXJh dGUgaXNGaWVsZE93bmVyRGlzYWJsZWRPclJlYWRPbmx5IGludG8gdHdvLgorICAgICAgICAoV2Vi Q29yZTo6RGF0ZVRpbWVFZGl0RWxlbWVudDo6aXNGaWVsZE93bmVyUmVhZE9ubHkpOiBEaXR0by4K KyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lRWRpdEVsZW1lbnQ6OnVwZGF0ZVVJU3RhdGUpOgor ICAgICAgICBXZSBkb24ndCBuZWVkIHRvIGZvY3VzIG91dCBpZiB0aGlzIGlzIHJlYWQtb25seS4K KyAgICAgICAgKiBodG1sL3NoYWRvdy9EYXRlVGltZUVkaXRFbGVtZW50Lmg6CisgICAgICAgIChE YXRlVGltZUVkaXRFbGVtZW50KTogU2VwYXJhdGUgaXNGaWVsZE93bmVyRGlzYWJsZWRPclJlYWRP bmx5IGludG8gdHdvLgorICAgICAgICAqIGh0bWwvc2hhZG93L0RhdGVUaW1lRmllbGRFbGVtZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lRmllbGRFbGVtZW50OjpkZWZhdWx0RXZl bnRIYW5kbGVyKToKKyAgICAgICAgU2tpcCBoYW5kbGVLZXlib2FyZEV2ZW50IGlmIHRoZSBmaWVs ZCBpcyBkaXNhYmxlZCBvciB0aGUgb3duZXIgaW5wdXQgaXMKKyAgICAgICAgZGlzYWJsZWQgb3Ig cmVhZC1vbmx5LiBoYW5kbGVLZXlib2FyZEV2ZW50IGhhbmRsZXMgZWRpdGluZyBrZXkKKyAgICAg ICAgb3BlcmF0aW9ucy4KKyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lRmllbGRFbGVtZW50Ojpk ZWZhdWx0S2V5Ym9hcmRFdmVudEhhbmRsZXIpOgorICAgICAgICBJZiB0aGlzIGZpZWxkIGlzIGRp c2FibGVkIG9yIHRoZSBvd25lciBpbnB1dCBpcyBkaXNhYmxlZCwgYWxsIGtleWJvYXJkCisgICAg ICAgIGlucHV0cyBhcmUgaWdub3JlZC4KKyAgICAgICAgSWYgdGhpcyBmaWVsZCBpcyByZWFkLW9u bHksIHdlIGhhbmRsZSBvbmx5IGxlZnQgYW5kIHJpZ2h0IGFycm93cyB0bworICAgICAgICBjaGFu Z2UgZm9jdXMsIGFuZCBza2lwIGRvd24vdXAvYmFja3NwYWNlL2RlbCBrZXlzLgorICAgICAgICAo V2ViQ29yZTo6RGF0ZVRpbWVGaWVsZEVsZW1lbnQ6OmlzRmllbGRPd25lckRpc2FibGVkKToKKyAg ICAgICAgQSBoZWxwZXIgZnVuY3Rpb24gdG8gY2hlY2sgZGlzYWJsZSBzdGF0ZSBvZiB0aGUgb3du ZXIgaW5wdXQuCisgICAgICAgIChXZWJDb3JlOjpEYXRlVGltZUZpZWxkRWxlbWVudDo6aXNGaWVs ZE93bmVyUmVhZE9ubHkpOgorICAgICAgICBBIGhlbHBlciBmdW5jdGlvbiB0byBjaGVjayByZWFk LW9ubHkgc3RhdGUgb2YgdGhlIG93bmVyIGlucHV0LgorICAgICAgICAoV2ViQ29yZTo6RGF0ZVRp bWVGaWVsZEVsZW1lbnQ6OmlzRm9jdXNhYmxlKToKKyAgICAgICAgVGhpcyBmaWVsZCBzaG91bGQg YmUgZm9jdXNhYmxlIGlmIGl0IGlzIHJlYWQtb25seSBhbmQgbm90IGRpc2FibGVkLgorICAgICAg ICAqIGh0bWwvc2hhZG93L0RhdGVUaW1lRmllbGRFbGVtZW50Lmg6CisgICAgICAgIChGaWVsZE93 bmVyKTogU2VwYXJhdGUgaXNGaWVsZE93bmVyRGlzYWJsZWRPclJlYWRPbmx5IGludG8gdHdvLgor ICAgICAgICAoRGF0ZVRpbWVGaWVsZEVsZW1lbnQpOgorICAgICAgICBEZWNsYXJlIGlzRmllbGRP d25lckRpc2FibGVkIGFuZCBpc0ZpZWxkT3duZXJSZWFkT25seS4KKyAgICAgICAgKiBodG1sL3No YWRvdy9EYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50OjpoYW5kbGVLZXlib2FyZEV2ZW50KToKKyAgICAg ICAgUmVtb3ZlIHJlZHVuZGFudCBpc0Rpc2FibGVkIGNoZWNrLiBJdCBpcyBkb25lIGluCisgICAg ICAgIERhdGVUaW1lRmllbGRFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyLgorCiAyMDEzLTAy LTA1ICBZdXN1ZiBPenV5c2FsICA8eXVzdWZvQGdvb2dsZS5jb20+CiAKICAgICAgICAgW2Nocm9t aXVtXSBFbmFibGUgc2hvdWxkR2VzdHVyZXNUcmlnZ2VyQWN0aXZlIGZvciBBbmRyb2lkCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0Jhc2VNdWx0aXBsZUZpZWxkc0RhdGVBbmRUaW1l SW5wdXRUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvQmFzZU11bHRpcGxlRmllbGRzRGF0 ZUFuZFRpbWVJbnB1dFR5cGUuY3BwCmluZGV4IDBiMzJiOGQ1Yzg1MWY0NWExMzg3MWJiYWQxMzM0 YjJmNzhhZTY0MzAuLjYwNjQ3MDgyMzcxMDRhYzkwN2U3NjQwZWUwYTIwMjIwZmNiZWEzYTUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvQmFzZU11bHRpcGxlRmllbGRzRGF0ZUFuZFRp bWVJbnB1dFR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvQmFzZU11bHRpcGxlRmll bGRzRGF0ZUFuZFRpbWVJbnB1dFR5cGUuY3BwCkBAIC0yOTYsOCArMjk2LDcgQEAgYm9vbCBCYXNl TXVsdGlwbGVGaWVsZHNEYXRlQW5kVGltZUlucHV0VHlwZTo6aGFzQmFkSW5wdXQoKSBjb25zdAog CiBib29sIEJhc2VNdWx0aXBsZUZpZWxkc0RhdGVBbmRUaW1lSW5wdXRUeXBlOjppc0tleWJvYXJk Rm9jdXNhYmxlKEtleWJvYXJkRXZlbnQqKSBjb25zdAogewotICAgIC8vIEZJWE1FOiBUaGlzIHNo b3VsZCBiZSBmb2N1c2FibGUgZXZlbiBpZiByZWFkT25seSgpLiB3ZWJraXQub3JnL2IvMTA4Nzk1 LgotICAgIHJldHVybiBlbGVtZW50KCktPmlzVGV4dEZvcm1Db250cm9sRm9jdXNhYmxlKCkgJiYg IWVsZW1lbnQoKS0+cmVhZE9ubHkoKTsKKyAgICByZXR1cm4gZWxlbWVudCgpLT5pc1RleHRGb3Jt Q29udHJvbEZvY3VzYWJsZSgpOwogfQogCiBib29sIEJhc2VNdWx0aXBsZUZpZWxkc0RhdGVBbmRU aW1lSW5wdXRUeXBlOjppc01vdXNlRm9jdXNhYmxlKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lRWRpdEVsZW1lbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5jcHAKaW5kZXggZTVkYThhMTcy MTIyOWU2ZDRhMDM5NTMzZGMzMjhlYjc5NmZmN2JlNC4uNGVhNDA2MGY4M2E2ZTZkMmExMjU0MzBk NTA4NjBjYzgwMjRjZmE2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cv RGF0ZVRpbWVFZGl0RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cv RGF0ZVRpbWVFZGl0RWxlbWVudC5jcHAKQEAgLTU3NSw5ICs1NzUsMTQgQEAgYm9vbCBEYXRlVGlt ZUVkaXRFbGVtZW50Ojppc0Rpc2FibGVkKCkgY29uc3QKICAgICByZXR1cm4gbV9lZGl0Q29udHJv bE93bmVyICYmIG1fZWRpdENvbnRyb2xPd25lci0+aXNFZGl0Q29udHJvbE93bmVyRGlzYWJsZWQo KTsKIH0KIAotYm9vbCBEYXRlVGltZUVkaXRFbGVtZW50Ojppc0ZpZWxkT3duZXJEaXNhYmxlZE9y UmVhZE9ubHkoKSBjb25zdAorYm9vbCBEYXRlVGltZUVkaXRFbGVtZW50Ojppc0ZpZWxkT3duZXJE aXNhYmxlZCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGlzRGlzYWJsZWQoKSB8fCBpc1JlYWRPbmx5 KCk7CisgICAgcmV0dXJuIGlzRGlzYWJsZWQoKTsKK30KKworYm9vbCBEYXRlVGltZUVkaXRFbGVt ZW50Ojppc0ZpZWxkT3duZXJSZWFkT25seSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGlzUmVhZE9u bHkoKTsKIH0KIAogYm9vbCBEYXRlVGltZUVkaXRFbGVtZW50Ojppc1JlYWRPbmx5KCkgY29uc3QK QEAgLTcxMSw3ICs3MTYsNyBAQCB2b2lkIERhdGVUaW1lRWRpdEVsZW1lbnQ6OnN0ZXBVcCgpCiAK IHZvaWQgRGF0ZVRpbWVFZGl0RWxlbWVudDo6dXBkYXRlVUlTdGF0ZSgpCiB7Ci0gICAgaWYgKGlz RGlzYWJsZWQoKSB8fCBpc1JlYWRPbmx5KCkpIHsKKyAgICBpZiAoaXNEaXNhYmxlZCgpKSB7CiAg ICAgICAgIGlmIChEYXRlVGltZUZpZWxkRWxlbWVudCogZmllbGQgPSBmb2N1c2VkRmllbGQoKSkK ICAgICAgICAgICAgIGZpZWxkLT5ibHVyKCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5oCmluZGV4IGQ1YzM4MjhmYWZiMTZmNzY5 NWZmYzllZDMyYjBjOTY1M2U3NDVlNzMuLjJmOGNmODA2M2QzMjRmZmMxMTU0YmRkMWI5ZTczNDQ2 ZGVkZGMyZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1l RWRpdEVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUVk aXRFbGVtZW50LmgKQEAgLTEzOCw3ICsxMzgsOCBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9p ZCBmaWVsZFZhbHVlQ2hhbmdlZCgpIE9WRVJSSURFIEZJTkFMOwogICAgIHZpcnR1YWwgYm9vbCBm b2N1c09uTmV4dEZpZWxkKGNvbnN0IERhdGVUaW1lRmllbGRFbGVtZW50JikgT1ZFUlJJREUgRklO QUw7CiAgICAgdmlydHVhbCBib29sIGZvY3VzT25QcmV2aW91c0ZpZWxkKGNvbnN0IERhdGVUaW1l RmllbGRFbGVtZW50JikgT1ZFUlJJREUgRklOQUw7Ci0gICAgdmlydHVhbCBib29sIGlzRmllbGRP d25lckRpc2FibGVkT3JSZWFkT25seSgpIGNvbnN0IE9WRVJSSURFIEZJTkFMOworICAgIHZpcnR1 YWwgYm9vbCBpc0ZpZWxkT3duZXJEaXNhYmxlZCgpIGNvbnN0IE9WRVJSSURFIEZJTkFMOworICAg IHZpcnR1YWwgYm9vbCBpc0ZpZWxkT3duZXJSZWFkT25seSgpIGNvbnN0IE9WRVJSSURFIEZJTkFM OwogICAgIHZpcnR1YWwgQXRvbWljU3RyaW5nIGxvY2FsZUlkZW50aWZpZXIoKSBjb25zdCBPVkVS UklERSBGSU5BTDsKIAogICAgIFZlY3RvcjxEYXRlVGltZUZpZWxkRWxlbWVudCosIG1heGltdW1O dW1iZXJPZkZpZWxkcz4gbV9maWVsZHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9EYXRlVGltZUZpZWxkRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3No YWRvdy9EYXRlVGltZUZpZWxkRWxlbWVudC5jcHAKaW5kZXggMDIzNWZmM2NkNDA0NGY2NGE5OTc4 ODkwMzRkYjdkYTEwNmM3ZjZjZi4uYjk3MjEyZWE3OTc0YTVlOTZiNDk2MzVlYjNkZWEzMTIyY2Nj OGM3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVs ZEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lRmll bGRFbGVtZW50LmNwcApAQCAtNjMsOSArNjMsMTEgQEAgdm9pZCBEYXRlVGltZUZpZWxkRWxlbWVu dDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiAKICAgICBpZiAoZXZlbnQtPmlz S2V5Ym9hcmRFdmVudCgpKSB7CiAgICAgICAgIEtleWJvYXJkRXZlbnQqIGtleWJvYXJkRXZlbnQg PSBzdGF0aWNfY2FzdDxLZXlib2FyZEV2ZW50Kj4oZXZlbnQpOwotICAgICAgICBoYW5kbGVLZXli b2FyZEV2ZW50KGtleWJvYXJkRXZlbnQpOwotICAgICAgICBpZiAoa2V5Ym9hcmRFdmVudC0+ZGVm YXVsdEhhbmRsZWQoKSkKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgaWYgKCFpc0Rpc2Fi bGVkKCkgJiYgIWlzRmllbGRPd25lckRpc2FibGVkKCkgJiYgIWlzRmllbGRPd25lclJlYWRPbmx5 KCkpIHsKKyAgICAgICAgICAgIGhhbmRsZUtleWJvYXJkRXZlbnQoa2V5Ym9hcmRFdmVudCk7Cisg ICAgICAgICAgICBpZiAoa2V5Ym9hcmRFdmVudC0+ZGVmYXVsdEhhbmRsZWQoKSkKKyAgICAgICAg ICAgICAgICByZXR1cm47CisgICAgICAgIH0KICAgICAgICAgZGVmYXVsdEtleWJvYXJkRXZlbnRI YW5kbGVyKGtleWJvYXJkRXZlbnQpOwogICAgICAgICBpZiAoa2V5Ym9hcmRFdmVudC0+ZGVmYXVs dEhhbmRsZWQoKSkKICAgICAgICAgICAgIHJldHVybjsKQEAgLTc5LDE1ICs4MSwxMCBAQCB2b2lk IERhdGVUaW1lRmllbGRFbGVtZW50OjpkZWZhdWx0S2V5Ym9hcmRFdmVudEhhbmRsZXIoS2V5Ym9h cmRFdmVudCoga2V5Ym9hcmRFdgogICAgIGlmIChrZXlib2FyZEV2ZW50LT50eXBlKCkgIT0gZXZl bnROYW1lcygpLmtleWRvd25FdmVudCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgY29uc3QgU3Ry aW5nJiBrZXlJZGVudGlmaWVyID0ga2V5Ym9hcmRFdmVudC0+a2V5SWRlbnRpZmllcigpOwotCi0g ICAgaWYgKGtleUlkZW50aWZpZXIgPT0gIkRvd24iKSB7Ci0gICAgICAgIGlmIChrZXlib2FyZEV2 ZW50LT5nZXRNb2RpZmllclN0YXRlKCJBbHQiKSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAg ICAga2V5Ym9hcmRFdmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKLSAgICAgICAgc3RlcERvd24o KTsKKyAgICBpZiAoaXNEaXNhYmxlZCgpIHx8IGlzRmllbGRPd25lckRpc2FibGVkKCkpCiAgICAg ICAgIHJldHVybjsKLSAgICB9CisKKyAgICBjb25zdCBTdHJpbmcmIGtleUlkZW50aWZpZXIgPSBr ZXlib2FyZEV2ZW50LT5rZXlJZGVudGlmaWVyKCk7CiAKICAgICBpZiAoa2V5SWRlbnRpZmllciA9 PSAiTGVmdCIpIHsKICAgICAgICAgaWYgKCFtX2ZpZWxkT3duZXIpCkBAIC0xMDksNiArMTA2LDE3 IEBAIHZvaWQgRGF0ZVRpbWVGaWVsZEVsZW1lbnQ6OmRlZmF1bHRLZXlib2FyZEV2ZW50SGFuZGxl cihLZXlib2FyZEV2ZW50KiBrZXlib2FyZEV2CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAg ICBpZiAoaXNGaWVsZE93bmVyUmVhZE9ubHkoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYg KGtleUlkZW50aWZpZXIgPT0gIkRvd24iKSB7CisgICAgICAgIGlmIChrZXlib2FyZEV2ZW50LT5n ZXRNb2RpZmllclN0YXRlKCJBbHQiKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAga2V5 Ym9hcmRFdmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKKyAgICAgICAgc3RlcERvd24oKTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGlmIChrZXlJZGVudGlmaWVyID09ICJVcCIpIHsK ICAgICAgICAga2V5Ym9hcmRFdmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKICAgICAgICAgc3Rl cFVwKCk7CkBAIC0xNTUsMTEgKzE2MywyMSBAQCBib29sIERhdGVUaW1lRmllbGRFbGVtZW50Ojpp c0RhdGVUaW1lRmllbGRFbGVtZW50KCkgY29uc3QKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorYm9v bCBEYXRlVGltZUZpZWxkRWxlbWVudDo6aXNGaWVsZE93bmVyRGlzYWJsZWQoKSBjb25zdAorewor ICAgIHJldHVybiBtX2ZpZWxkT3duZXIgJiYgbV9maWVsZE93bmVyLT5pc0ZpZWxkT3duZXJEaXNh YmxlZCgpOworfQorCitib29sIERhdGVUaW1lRmllbGRFbGVtZW50Ojppc0ZpZWxkT3duZXJSZWFk T25seSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fZmllbGRPd25lciAmJiBtX2ZpZWxkT3duZXIt PmlzRmllbGRPd25lclJlYWRPbmx5KCk7Cit9CisKIGJvb2wgRGF0ZVRpbWVGaWVsZEVsZW1lbnQ6 OmlzRm9jdXNhYmxlKCkgY29uc3QKIHsKICAgICBpZiAoaXNEaXNhYmxlZCgpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0gICAgaWYgKG1fZmllbGRPd25lciAmJiBtX2ZpZWxkT3duZXItPmlzRmll bGRPd25lckRpc2FibGVkT3JSZWFkT25seSgpKQorICAgIGlmIChpc0ZpZWxkT3duZXJEaXNhYmxl ZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgcmV0dXJuIEhUTUxFbGVtZW50Ojppc0Zv Y3VzYWJsZSgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0 ZVRpbWVGaWVsZEVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1l RmllbGRFbGVtZW50LmgKaW5kZXggOWVjOTM1Y2Q3OGM2YTE3YmNhOWMzODMzODY2YTI1MDM5ZWU3 NzE4NS4uOGE3YTgzMDBlZDAxN2I0ZTFjYjVkM2E5OTVlZmRlNDZmOTdhNTUzYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUZpZWxkRWxlbWVudC5oCkBAIC01 Niw3ICs1Niw4IEBAIHB1YmxpYzoKICAgICAgICAgdmlydHVhbCB2b2lkIGZpZWxkVmFsdWVDaGFu Z2VkKCkgPSAwOwogICAgICAgICB2aXJ0dWFsIGJvb2wgZm9jdXNPbk5leHRGaWVsZChjb25zdCBE YXRlVGltZUZpZWxkRWxlbWVudCYpID0gMDsKICAgICAgICAgdmlydHVhbCBib29sIGZvY3VzT25Q cmV2aW91c0ZpZWxkKGNvbnN0IERhdGVUaW1lRmllbGRFbGVtZW50JikgPSAwOwotICAgICAgICB2 aXJ0dWFsIGJvb2wgaXNGaWVsZE93bmVyRGlzYWJsZWRPclJlYWRPbmx5KCkgY29uc3QgPSAwOwor ICAgICAgICB2aXJ0dWFsIGJvb2wgaXNGaWVsZE93bmVyRGlzYWJsZWQoKSBjb25zdCA9IDA7Cisg ICAgICAgIHZpcnR1YWwgYm9vbCBpc0ZpZWxkT3duZXJSZWFkT25seSgpIGNvbnN0ID0gMDsKICAg ICAgICAgdmlydHVhbCBBdG9taWNTdHJpbmcgbG9jYWxlSWRlbnRpZmllcigpIGNvbnN0ID0gMDsK ICAgICB9OwogCkBAIC05Myw2ICs5NCw4IEBAIHByb3RlY3RlZDoKIHByaXZhdGU6CiAgICAgdm9p ZCBkZWZhdWx0S2V5Ym9hcmRFdmVudEhhbmRsZXIoS2V5Ym9hcmRFdmVudCopOwogICAgIHZpcnR1 YWwgYm9vbCBpc0RhdGVUaW1lRmllbGRFbGVtZW50KCkgY29uc3QgT1ZFUlJJREU7CisgICAgYm9v bCBpc0ZpZWxkT3duZXJEaXNhYmxlZCgpIGNvbnN0OworICAgIGJvb2wgaXNGaWVsZE93bmVyUmVh ZE9ubHkoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNGb2N1cygpIGNvbnN0IE9W RVJSSURFIEZJTkFMOwogCiAgICAgRmllbGRPd25lciogbV9maWVsZE93bmVyOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lTnVtZXJpY0ZpZWxkRWxl bWVudC5jcHAKaW5kZXggYjMzYTA5NzViZmRhNTNlMDM4NGE2N2VmYWNhOTkxM2ZhY2MwNDBjYi4u ZmZkYmIxYzBkNTZmYWI0YmYwOGRjYTVlN2U4MjkxZGJkNzQ2ZWYyMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZU51bWVyaWNGaWVsZEVsZW1l bnQuY3BwCkBAIC0xMjYsOSArMTI2LDYgQEAgU3RyaW5nIERhdGVUaW1lTnVtZXJpY0ZpZWxkRWxl bWVudDo6Zm9ybWF0VmFsdWUoaW50IHZhbHVlKSBjb25zdAogCiB2b2lkIERhdGVUaW1lTnVtZXJp Y0ZpZWxkRWxlbWVudDo6aGFuZGxlS2V5Ym9hcmRFdmVudChLZXlib2FyZEV2ZW50KiBrZXlib2Fy ZEV2ZW50KQogewotICAgIGlmIChpc0Rpc2FibGVkKCkpCi0gICAgICAgIHJldHVybjsKLQogICAg IGlmIChrZXlib2FyZEV2ZW50LT50eXBlKCkgIT0gZXZlbnROYW1lcygpLmtleXByZXNzRXZlbnQp CiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDNiOThiNGJjMmI5ODFjY2EyOTllOGVkOGI0Nzg5 OWE5ODE2MjI0YTcuLjM1YmM0MGQ3OGM3MmRkYjNhODg1M2NmNjNkMjJmZDRiMmI0YzA3NDQgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMy0wMi0wNSAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJv bWl1bS5vcmc+CisKKyAgICAgICAgSU5QVVRfTVVMVElQTEVfRklFTERTX1VJOiBSZWFkLW9ubHkg aW5wdXRzIHNob3VsZCBiZSBmb2N1c2FibGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEwODc5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogZmFzdC9mb3Jtcy90aW1lLW11bHRpcGxlLWZpZWxkcy90aW1l LW11bHRpcGxlLWZpZWxkcy1rZXlib2FyZC1ldmVudHMtZXhwZWN0ZWQudHh0OgorICAgICAgICAq IGZhc3QvZm9ybXMvdGltZS1tdWx0aXBsZS1maWVsZHMvdGltZS1tdWx0aXBsZS1maWVsZHMta2V5 Ym9hcmQtZXZlbnRzLmh0bWw6CisKIDIwMTMtMDItMDUgIFJvZ2VyIEZvbmcgIDxyb2dlcl9mb25n QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGdhcmRlbmluZy4gV2luNyBwb3J0IGRv ZXNuJ3QgcnVuIFdlYkdMLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy90aW1l LW11bHRpcGxlLWZpZWxkcy90aW1lLW11bHRpcGxlLWZpZWxkcy1rZXlib2FyZC1ldmVudHMtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy90aW1lLW11bHRpcGxlLWZpZWxkcy90 aW1lLW11bHRpcGxlLWZpZWxkcy1rZXlib2FyZC1ldmVudHMtZXhwZWN0ZWQudHh0CmluZGV4IGY3 ZGYxMWIxMDRiMTgwOGE2OThiNjQ4MmRiNTZiZmUyYjUzN2MwZWIuLmMzYzE1NzdhN2NhNjE3MjZj ZjRjZjdhY2YzOTIwZjNiZmI4ZTRlNmYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZm9y bXMvdGltZS1tdWx0aXBsZS1maWVsZHMvdGltZS1tdWx0aXBsZS1maWVsZHMta2V5Ym9hcmQtZXZl bnRzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3RpbWUtbXVsdGlw bGUtZmllbGRzL3RpbWUtbXVsdGlwbGUtZmllbGRzLWtleWJvYXJkLWV2ZW50cy1leHBlY3RlZC50 eHQKQEAgLTM4LDggKzM4LDEzIEBAIFBBU1MgZXZlbnRzQ291bnRlci5jaGFuZ2UgaXMgMQogUEFT UyBpbnB1dC52YWx1ZSBpcyAiMDM6MDUiCiBQQVNTIGlucHV0LnZhbHVlIGlzICIwNzowNSIKIFBB U1MgZG9jdW1lbnQuYWN0aXZlRWxlbWVudC5pZCBpcyAiYW5vdGhlciIKLT09IFRhYiBuYXZpZ2F0 aW9uIHNob3VsZCBza2lwIGRpc2FibGVkL3JlYWRvbmx5IGlucHV0cyA9PQorPT0gVGFiIG5hdmln YXRpb24gc2hvdWxkIHNraXAgZGlzYWJsZWQgaW5wdXRzID09CiBQQVNTIGRvY3VtZW50LmFjdGl2 ZUVsZW1lbnQuaWQgaXMgImFub3RoZXIiCis9PSBUYWIgbmF2aWdhdGlvbiBzaG91bGQgbm90IHNr aXAgcmVhZG9ubHkgaW5wdXRzLCBidXQgZWRpdGluZyBvcGVyYXRpb25zIHNob3VsZCBiZSBpZ25v cmVkLiA9PQorUEFTUyBkb2N1bWVudC5hY3RpdmVFbGVtZW50LmlkIGlzICJpbnB1dCIKK1BBU1Mg a2V5RG93bigidXBBcnJvdyIpOyBpbnB1dC52YWx1ZSBpcyAiMDE6MDEiCitQQVNTIGtleURvd24o ImRvd25BcnJvdyIpOyBpbnB1dC52YWx1ZSBpcyAiMDE6MDEiCitQQVNTIGtleURvd24oIjMiKTsg aW5wdXQudmFsdWUgaXMgIjAxOjAxIgogUEFTUyBkb2N1bWVudC5hY3RpdmVFbGVtZW50LmlkIGlz ICJhbm90aGVyIgogPT0gU2hmaXQrVGFiIGtleSA9PQogUEFTUyBpbnB1dC52YWx1ZSBpcyAiMTU6 MDAiCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3RpbWUtbXVsdGlwbGUtZmll bGRzL3RpbWUtbXVsdGlwbGUtZmllbGRzLWtleWJvYXJkLWV2ZW50cy5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC9mb3Jtcy90aW1lLW11bHRpcGxlLWZpZWxkcy90aW1lLW11bHRpcGxlLWZpZWxkcy1r ZXlib2FyZC1ldmVudHMuaHRtbAppbmRleCA4NWIyNzE3NzVhNzAwZWYyNWJkNzhhMmU5OTNhYjU2 NmZjZDdlMDk1Li5kNWQ2N2RhOTkxMTlhMGVjZWM2YmY1NmIzYWRhNTM0MTIwMjk3ZmM1IDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3RpbWUtbXVsdGlwbGUtZmllbGRzL3RpbWUt bXVsdGlwbGUtZmllbGRzLWtleWJvYXJkLWV2ZW50cy5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvZm9ybXMvdGltZS1tdWx0aXBsZS1maWVsZHMvdGltZS1tdWx0aXBsZS1maWVsZHMta2V5Ym9h cmQtZXZlbnRzLmh0bWwKQEAgLTEzNiwxNiArMTM2LDI1IEBAIGtleURvd24oJ1x0Jyk7CiBrZXlE b3duKCdcdCcpOwogc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCdkb2N1bWVudC5hY3RpdmVFbGVtZW50 LmlkJywgJ2Fub3RoZXInKTsKIAotYmVnaW5UZXN0KCdUYWIgbmF2aWdhdGlvbiBzaG91bGQgc2tp cCBkaXNhYmxlZC9yZWFkb25seSBpbnB1dHMnLCAnJyk7CitiZWdpblRlc3QoJ1RhYiBuYXZpZ2F0 aW9uIHNob3VsZCBza2lwIGRpc2FibGVkIGlucHV0cycsICcnKTsKIGJlZm9yZS5mb2N1cygpOwog aW5wdXQuZGlzYWJsZWQgPSB0cnVlOwoga2V5RG93bignXHQnKTsKIHNob3VsZEJlRXF1YWxUb1N0 cmluZygnZG9jdW1lbnQuYWN0aXZlRWxlbWVudC5pZCcsICdhbm90aGVyJyk7CiBpbnB1dC5kaXNh YmxlZCA9IGZhbHNlOwogCitiZWdpblRlc3QoJ1RhYiBuYXZpZ2F0aW9uIHNob3VsZCBub3Qgc2tp cCByZWFkb25seSBpbnB1dHMsIGJ1dCBlZGl0aW5nIG9wZXJhdGlvbnMgc2hvdWxkIGJlIGlnbm9y ZWQuJywgJycpOwogYmVmb3JlLmZvY3VzKCk7CitpbnB1dC52YWx1ZSA9ICcwMTowMSc7CiBpbnB1 dC5yZWFkT25seSA9IHRydWU7CiBrZXlEb3duKCdcdCcpOworc2hvdWxkQmVFcXVhbFRvU3RyaW5n KCdkb2N1bWVudC5hY3RpdmVFbGVtZW50LmlkJywgJ2lucHV0Jyk7CitzaG91bGRCZUVxdWFsVG9T dHJpbmcoJ2tleURvd24oInVwQXJyb3ciKTsgaW5wdXQudmFsdWUnLCAnMDE6MDEnKTsKK3Nob3Vs ZEJlRXF1YWxUb1N0cmluZygna2V5RG93bigiZG93bkFycm93Iik7IGlucHV0LnZhbHVlJywgJzAx OjAxJyk7CitrZXlEb3duKCdyaWdodEFycm93Jyk7CitzaG91bGRCZUVxdWFsVG9TdHJpbmcoJ2tl eURvd24oIjMiKTsgaW5wdXQudmFsdWUnLCAnMDE6MDEnKTsKK2tleURvd24oJ1x0Jyk7CitrZXlE b3duKCdcdCcpOwogc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCdkb2N1bWVudC5hY3RpdmVFbGVtZW50 LmlkJywgJ2Fub3RoZXInKTsKIGlucHV0LnJlYWRPbmx5ID0gZmFsc2U7CiAK 186737 2013-02-05 18:09:01 -0800 2013-02-05 18:36:09 -0800 Patch 2 bug-108795-20130206110538.patch text/plain 15237 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxOTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2JlNDhmODJmN2QwNTM2 MWIwNzM2NDVmNGE3ZTlkZmNhMGUyODNjYi4uZjMzZTk3YmRiMWMzZDgwZmQ1NTVlMmVkYmRlYzNl NWY0ODg0NTc4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYwIEBACisyMDEzLTAyLTA1ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBJTlBVVF9NVUxUSVBMRV9G SUVMRFNfVUk6IFJlYWQtb25seSBpbnB1dHMgc2hvdWxkIGJlIGZvY3VzYWJsZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4Nzk1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWNjb3JkaW5nIHRvIHRoZSBz dGFuZGFyZCBbMV0sIHJlYWRvbmx5IGZvcm0gY29udHJvbHMgc2hvdWxkIGJlIGZvY3VzYWJsZS4K KworICAgICAgICAtIFN1Yi1maWVsZHMgc2hvdWxkIGJlIGZvY3VzYWJsZSBpZiB0aGV5IGFyZSBy ZWFkLW9ubHkuIFdlIHNob3VsZCBjaGVjaworICAgICAgICAgIGlzRGlzYWJsZWQgbWFpbmx5Lgor ICAgICAgICAtIEFsbCBrZXlib2FyZCBvcGVyYXRpb25zIHNob3VsZCBub3QgYmUgaGFuZGxlZCBp ZiBhIGZpZWxkIGlzIGRpc2FibGVkLAorICAgICAgICAgIGFuZCBmb2N1cyBuYXZpZ2F0aW9uIGtl eWJvYXJkIG9wZXJhdGlvbnMgc2hvdWxkIGJlIGhhbmRsZWQgZXZlbiBpZiBhCisgICAgICAgICAg ZmllbGQgaXMgcmVhZC1vbmx5LgorCisgICAgICAgIFsxXSBodHRwOi8vd3d3LndoYXR3Zy5vcmcv c3BlY3Mvd2ViLWFwcHMvY3VycmVudC13b3JrL211bHRpcGFnZS9jb21tb24taW5wdXQtZWxlbWVu dC1hdHRyaWJ1dGVzLmh0bWwjdGhlLXJlYWRvbmx5LWF0dHJpYnV0ZQorCisgICAgICAgIE5vIG5l dyB0ZXN0cy4gVXBkYXRlCisgICAgICAgIGZhc3QvZm9ybXMvdGltZS1tdWx0aXBsZS1maWVsZHMv dGltZS1tdWx0aXBsZS1maWVsZHMta2V5Ym9hcmQtZXZlbnRzLmh0bWwKKyAgICAgICAgZm9yIHRo ZSBuZXcgYmVoYXZpb3IuCisKKyAgICAgICAgKiBodG1sL0Jhc2VNdWx0aXBsZUZpZWxkc0RhdGVB bmRUaW1lSW5wdXRUeXBlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkJhc2VNdWx0aXBsZUZpZWxk c0RhdGVBbmRUaW1lSW5wdXRUeXBlOjppc0tleWJvYXJkRm9jdXNhYmxlKToKKyAgICAgICAgTWFr ZSA8aW5wdXQ+IGZvY3VzYWJsZSBldmVuIGlmIGl0IGlzIHJlYWQtb25seS4KKyAgICAgICAgKiBo dG1sL3NoYWRvdy9EYXRlVGltZUVkaXRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRh dGVUaW1lRWRpdEVsZW1lbnQ6OmlzRmllbGRPd25lckRpc2FibGVkKToKKyAgICAgICAgU2VwYXJh dGUgaXNGaWVsZE93bmVyRGlzYWJsZWRPclJlYWRPbmx5IGludG8gdHdvLgorICAgICAgICAoV2Vi Q29yZTo6RGF0ZVRpbWVFZGl0RWxlbWVudDo6aXNGaWVsZE93bmVyUmVhZE9ubHkpOiBEaXR0by4K KyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lRWRpdEVsZW1lbnQ6OnVwZGF0ZVVJU3RhdGUpOgor ICAgICAgICBXZSBkb24ndCBuZWVkIHRvIGZvY3VzIG91dCBpZiB0aGlzIGlzIHJlYWQtb25seS4K KyAgICAgICAgKiBodG1sL3NoYWRvdy9EYXRlVGltZUVkaXRFbGVtZW50Lmg6CisgICAgICAgIChE YXRlVGltZUVkaXRFbGVtZW50KTogU2VwYXJhdGUgaXNGaWVsZE93bmVyRGlzYWJsZWRPclJlYWRP bmx5IGludG8gdHdvLgorICAgICAgICAqIGh0bWwvc2hhZG93L0RhdGVUaW1lRmllbGRFbGVtZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lRmllbGRFbGVtZW50OjpkZWZhdWx0RXZl bnRIYW5kbGVyKToKKyAgICAgICAgU2tpcCBoYW5kbGVLZXlib2FyZEV2ZW50IGlmIHRoZSBmaWVs ZCBpcyBkaXNhYmxlZCBvciB0aGUgb3duZXIgaW5wdXQgaXMKKyAgICAgICAgZGlzYWJsZWQgb3Ig cmVhZC1vbmx5LiBoYW5kbGVLZXlib2FyZEV2ZW50IGhhbmRsZXMgZWRpdGluZyBrZXkKKyAgICAg ICAgb3BlcmF0aW9ucy4KKyAgICAgICAgKFdlYkNvcmU6OkRhdGVUaW1lRmllbGRFbGVtZW50Ojpk ZWZhdWx0S2V5Ym9hcmRFdmVudEhhbmRsZXIpOgorICAgICAgICBJZiB0aGlzIGZpZWxkIGlzIGRp c2FibGVkIG9yIHRoZSBvd25lciBpbnB1dCBpcyBkaXNhYmxlZCwgYWxsIGtleWJvYXJkCisgICAg ICAgIGlucHV0cyBhcmUgaWdub3JlZC4KKyAgICAgICAgSWYgdGhpcyBmaWVsZCBpcyByZWFkLW9u bHksIHdlIGhhbmRsZSBvbmx5IGxlZnQgYW5kIHJpZ2h0IGFycm93cyB0bworICAgICAgICBjaGFu Z2UgZm9jdXMsIGFuZCBza2lwIGRvd24vdXAvYmFja3NwYWNlL2RlbCBrZXlzLgorICAgICAgICAo V2ViQ29yZTo6RGF0ZVRpbWVGaWVsZEVsZW1lbnQ6OmlzRmllbGRPd25lckRpc2FibGVkKToKKyAg ICAgICAgQSBoZWxwZXIgZnVuY3Rpb24gdG8gY2hlY2sgZGlzYWJsZSBzdGF0ZSBvZiB0aGUgb3du ZXIgaW5wdXQuCisgICAgICAgIChXZWJDb3JlOjpEYXRlVGltZUZpZWxkRWxlbWVudDo6aXNGaWVs ZE93bmVyUmVhZE9ubHkpOgorICAgICAgICBBIGhlbHBlciBmdW5jdGlvbiB0byBjaGVjayByZWFk LW9ubHkgc3RhdGUgb2YgdGhlIG93bmVyIGlucHV0LgorICAgICAgICAoV2ViQ29yZTo6RGF0ZVRp bWVGaWVsZEVsZW1lbnQ6OmlzRm9jdXNhYmxlKToKKyAgICAgICAgVGhpcyBmaWVsZCBzaG91bGQg YmUgZm9jdXNhYmxlIGlmIGl0IGlzIHJlYWQtb25seSBhbmQgbm90IGRpc2FibGVkLgorICAgICAg ICAqIGh0bWwvc2hhZG93L0RhdGVUaW1lRmllbGRFbGVtZW50Lmg6CisgICAgICAgIChGaWVsZE93 bmVyKTogU2VwYXJhdGUgaXNGaWVsZE93bmVyRGlzYWJsZWRPclJlYWRPbmx5IGludG8gdHdvLgor ICAgICAgICAoRGF0ZVRpbWVGaWVsZEVsZW1lbnQpOgorICAgICAgICBEZWNsYXJlIGlzRmllbGRP d25lckRpc2FibGVkIGFuZCBpc0ZpZWxkT3duZXJSZWFkT25seS4KKyAgICAgICAgKiBodG1sL3No YWRvdy9EYXRlVGltZU51bWVyaWNGaWVsZEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50OjpoYW5kbGVLZXlib2FyZEV2ZW50KToKKyAgICAg ICAgUmVtb3ZlIHJlZHVuZGFudCBpc0Rpc2FibGVkIGNoZWNrLiBJdCBpcyBkb25lIGluCisgICAg ICAgIERhdGVUaW1lRmllbGRFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyLgorCiAyMDEzLTAy LTA1ICBZdXN1ZiBPenV5c2FsICA8eXVzdWZvQGdvb2dsZS5jb20+CiAKICAgICAgICAgW2Nocm9t aXVtXSBFbmFibGUgc2hvdWxkR2VzdHVyZXNUcmlnZ2VyQWN0aXZlIGZvciBBbmRyb2lkCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0Jhc2VNdWx0aXBsZUZpZWxkc0RhdGVBbmRUaW1l SW5wdXRUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvQmFzZU11bHRpcGxlRmllbGRzRGF0 ZUFuZFRpbWVJbnB1dFR5cGUuY3BwCmluZGV4IDBiMzJiOGQ1Yzg1MWY0NWExMzg3MWJiYWQxMzM0 YjJmNzhhZTY0MzAuLjYwNjQ3MDgyMzcxMDRhYzkwN2U3NjQwZWUwYTIwMjIwZmNiZWEzYTUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvQmFzZU11bHRpcGxlRmllbGRzRGF0ZUFuZFRp bWVJbnB1dFR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvQmFzZU11bHRpcGxlRmll bGRzRGF0ZUFuZFRpbWVJbnB1dFR5cGUuY3BwCkBAIC0yOTYsOCArMjk2LDcgQEAgYm9vbCBCYXNl TXVsdGlwbGVGaWVsZHNEYXRlQW5kVGltZUlucHV0VHlwZTo6aGFzQmFkSW5wdXQoKSBjb25zdAog CiBib29sIEJhc2VNdWx0aXBsZUZpZWxkc0RhdGVBbmRUaW1lSW5wdXRUeXBlOjppc0tleWJvYXJk Rm9jdXNhYmxlKEtleWJvYXJkRXZlbnQqKSBjb25zdAogewotICAgIC8vIEZJWE1FOiBUaGlzIHNo b3VsZCBiZSBmb2N1c2FibGUgZXZlbiBpZiByZWFkT25seSgpLiB3ZWJraXQub3JnL2IvMTA4Nzk1 LgotICAgIHJldHVybiBlbGVtZW50KCktPmlzVGV4dEZvcm1Db250cm9sRm9jdXNhYmxlKCkgJiYg IWVsZW1lbnQoKS0+cmVhZE9ubHkoKTsKKyAgICByZXR1cm4gZWxlbWVudCgpLT5pc1RleHRGb3Jt Q29udHJvbEZvY3VzYWJsZSgpOwogfQogCiBib29sIEJhc2VNdWx0aXBsZUZpZWxkc0RhdGVBbmRU aW1lSW5wdXRUeXBlOjppc01vdXNlRm9jdXNhYmxlKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lRWRpdEVsZW1lbnQuY3BwIGIvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5jcHAKaW5kZXggZTVkYThhMTcy MTIyOWU2ZDRhMDM5NTMzZGMzMjhlYjc5NmZmN2JlNC4uNGVhNDA2MGY4M2E2ZTZkMmExMjU0MzBk NTA4NjBjYzgwMjRjZmE2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cv RGF0ZVRpbWVFZGl0RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cv RGF0ZVRpbWVFZGl0RWxlbWVudC5jcHAKQEAgLTU3NSw5ICs1NzUsMTQgQEAgYm9vbCBEYXRlVGlt ZUVkaXRFbGVtZW50Ojppc0Rpc2FibGVkKCkgY29uc3QKICAgICByZXR1cm4gbV9lZGl0Q29udHJv bE93bmVyICYmIG1fZWRpdENvbnRyb2xPd25lci0+aXNFZGl0Q29udHJvbE93bmVyRGlzYWJsZWQo KTsKIH0KIAotYm9vbCBEYXRlVGltZUVkaXRFbGVtZW50Ojppc0ZpZWxkT3duZXJEaXNhYmxlZE9y UmVhZE9ubHkoKSBjb25zdAorYm9vbCBEYXRlVGltZUVkaXRFbGVtZW50Ojppc0ZpZWxkT3duZXJE aXNhYmxlZCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGlzRGlzYWJsZWQoKSB8fCBpc1JlYWRPbmx5 KCk7CisgICAgcmV0dXJuIGlzRGlzYWJsZWQoKTsKK30KKworYm9vbCBEYXRlVGltZUVkaXRFbGVt ZW50Ojppc0ZpZWxkT3duZXJSZWFkT25seSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIGlzUmVhZE9u bHkoKTsKIH0KIAogYm9vbCBEYXRlVGltZUVkaXRFbGVtZW50Ojppc1JlYWRPbmx5KCkgY29uc3QK QEAgLTcxMSw3ICs3MTYsNyBAQCB2b2lkIERhdGVUaW1lRWRpdEVsZW1lbnQ6OnN0ZXBVcCgpCiAK IHZvaWQgRGF0ZVRpbWVFZGl0RWxlbWVudDo6dXBkYXRlVUlTdGF0ZSgpCiB7Ci0gICAgaWYgKGlz RGlzYWJsZWQoKSB8fCBpc1JlYWRPbmx5KCkpIHsKKyAgICBpZiAoaXNEaXNhYmxlZCgpKSB7CiAg ICAgICAgIGlmIChEYXRlVGltZUZpZWxkRWxlbWVudCogZmllbGQgPSBmb2N1c2VkRmllbGQoKSkK ICAgICAgICAgICAgIGZpZWxkLT5ibHVyKCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvRGF0ZVRpbWVFZGl0RWxlbWVudC5oCmluZGV4IGQ1YzM4MjhmYWZiMTZmNzY5 NWZmYzllZDMyYjBjOTY1M2U3NDVlNzMuLjJmOGNmODA2M2QzMjRmZmMxMTU0YmRkMWI5ZTczNDQ2 ZGVkZGMyZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1l RWRpdEVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUVk aXRFbGVtZW50LmgKQEAgLTEzOCw3ICsxMzgsOCBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9p ZCBmaWVsZFZhbHVlQ2hhbmdlZCgpIE9WRVJSSURFIEZJTkFMOwogICAgIHZpcnR1YWwgYm9vbCBm b2N1c09uTmV4dEZpZWxkKGNvbnN0IERhdGVUaW1lRmllbGRFbGVtZW50JikgT1ZFUlJJREUgRklO QUw7CiAgICAgdmlydHVhbCBib29sIGZvY3VzT25QcmV2aW91c0ZpZWxkKGNvbnN0IERhdGVUaW1l RmllbGRFbGVtZW50JikgT1ZFUlJJREUgRklOQUw7Ci0gICAgdmlydHVhbCBib29sIGlzRmllbGRP d25lckRpc2FibGVkT3JSZWFkT25seSgpIGNvbnN0IE9WRVJSSURFIEZJTkFMOworICAgIHZpcnR1 YWwgYm9vbCBpc0ZpZWxkT3duZXJEaXNhYmxlZCgpIGNvbnN0IE9WRVJSSURFIEZJTkFMOworICAg IHZpcnR1YWwgYm9vbCBpc0ZpZWxkT3duZXJSZWFkT25seSgpIGNvbnN0IE9WRVJSSURFIEZJTkFM OwogICAgIHZpcnR1YWwgQXRvbWljU3RyaW5nIGxvY2FsZUlkZW50aWZpZXIoKSBjb25zdCBPVkVS UklERSBGSU5BTDsKIAogICAgIFZlY3RvcjxEYXRlVGltZUZpZWxkRWxlbWVudCosIG1heGltdW1O dW1iZXJPZkZpZWxkcz4gbV9maWVsZHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9EYXRlVGltZUZpZWxkRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3No YWRvdy9EYXRlVGltZUZpZWxkRWxlbWVudC5jcHAKaW5kZXggMDIzNWZmM2NkNDA0NGY2NGE5OTc4 ODkwMzRkYjdkYTEwNmM3ZjZjZi4uYjk3MjEyZWE3OTc0YTVlOTZiNDk2MzVlYjNkZWEzMTIyY2Nj OGM3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVs ZEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lRmll bGRFbGVtZW50LmNwcApAQCAtNjMsOSArNjMsMTEgQEAgdm9pZCBEYXRlVGltZUZpZWxkRWxlbWVu dDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiAKICAgICBpZiAoZXZlbnQtPmlz S2V5Ym9hcmRFdmVudCgpKSB7CiAgICAgICAgIEtleWJvYXJkRXZlbnQqIGtleWJvYXJkRXZlbnQg PSBzdGF0aWNfY2FzdDxLZXlib2FyZEV2ZW50Kj4oZXZlbnQpOwotICAgICAgICBoYW5kbGVLZXli b2FyZEV2ZW50KGtleWJvYXJkRXZlbnQpOwotICAgICAgICBpZiAoa2V5Ym9hcmRFdmVudC0+ZGVm YXVsdEhhbmRsZWQoKSkKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgaWYgKCFpc0Rpc2Fi bGVkKCkgJiYgIWlzRmllbGRPd25lckRpc2FibGVkKCkgJiYgIWlzRmllbGRPd25lclJlYWRPbmx5 KCkpIHsKKyAgICAgICAgICAgIGhhbmRsZUtleWJvYXJkRXZlbnQoa2V5Ym9hcmRFdmVudCk7Cisg ICAgICAgICAgICBpZiAoa2V5Ym9hcmRFdmVudC0+ZGVmYXVsdEhhbmRsZWQoKSkKKyAgICAgICAg ICAgICAgICByZXR1cm47CisgICAgICAgIH0KICAgICAgICAgZGVmYXVsdEtleWJvYXJkRXZlbnRI YW5kbGVyKGtleWJvYXJkRXZlbnQpOwogICAgICAgICBpZiAoa2V5Ym9hcmRFdmVudC0+ZGVmYXVs dEhhbmRsZWQoKSkKICAgICAgICAgICAgIHJldHVybjsKQEAgLTc5LDE1ICs4MSwxMCBAQCB2b2lk IERhdGVUaW1lRmllbGRFbGVtZW50OjpkZWZhdWx0S2V5Ym9hcmRFdmVudEhhbmRsZXIoS2V5Ym9h cmRFdmVudCoga2V5Ym9hcmRFdgogICAgIGlmIChrZXlib2FyZEV2ZW50LT50eXBlKCkgIT0gZXZl bnROYW1lcygpLmtleWRvd25FdmVudCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgY29uc3QgU3Ry aW5nJiBrZXlJZGVudGlmaWVyID0ga2V5Ym9hcmRFdmVudC0+a2V5SWRlbnRpZmllcigpOwotCi0g ICAgaWYgKGtleUlkZW50aWZpZXIgPT0gIkRvd24iKSB7Ci0gICAgICAgIGlmIChrZXlib2FyZEV2 ZW50LT5nZXRNb2RpZmllclN0YXRlKCJBbHQiKSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAg ICAga2V5Ym9hcmRFdmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKLSAgICAgICAgc3RlcERvd24o KTsKKyAgICBpZiAoaXNEaXNhYmxlZCgpIHx8IGlzRmllbGRPd25lckRpc2FibGVkKCkpCiAgICAg ICAgIHJldHVybjsKLSAgICB9CisKKyAgICBjb25zdCBTdHJpbmcmIGtleUlkZW50aWZpZXIgPSBr ZXlib2FyZEV2ZW50LT5rZXlJZGVudGlmaWVyKCk7CiAKICAgICBpZiAoa2V5SWRlbnRpZmllciA9 PSAiTGVmdCIpIHsKICAgICAgICAgaWYgKCFtX2ZpZWxkT3duZXIpCkBAIC0xMDksNiArMTA2LDE3 IEBAIHZvaWQgRGF0ZVRpbWVGaWVsZEVsZW1lbnQ6OmRlZmF1bHRLZXlib2FyZEV2ZW50SGFuZGxl cihLZXlib2FyZEV2ZW50KiBrZXlib2FyZEV2CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAg ICBpZiAoaXNGaWVsZE93bmVyUmVhZE9ubHkoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYg KGtleUlkZW50aWZpZXIgPT0gIkRvd24iKSB7CisgICAgICAgIGlmIChrZXlib2FyZEV2ZW50LT5n ZXRNb2RpZmllclN0YXRlKCJBbHQiKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAga2V5 Ym9hcmRFdmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKKyAgICAgICAgc3RlcERvd24oKTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGlmIChrZXlJZGVudGlmaWVyID09ICJVcCIpIHsK ICAgICAgICAga2V5Ym9hcmRFdmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKICAgICAgICAgc3Rl cFVwKCk7CkBAIC0xNTUsMTEgKzE2MywyMSBAQCBib29sIERhdGVUaW1lRmllbGRFbGVtZW50Ojpp c0RhdGVUaW1lRmllbGRFbGVtZW50KCkgY29uc3QKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAorYm9v bCBEYXRlVGltZUZpZWxkRWxlbWVudDo6aXNGaWVsZE93bmVyRGlzYWJsZWQoKSBjb25zdAorewor ICAgIHJldHVybiBtX2ZpZWxkT3duZXIgJiYgbV9maWVsZE93bmVyLT5pc0ZpZWxkT3duZXJEaXNh YmxlZCgpOworfQorCitib29sIERhdGVUaW1lRmllbGRFbGVtZW50Ojppc0ZpZWxkT3duZXJSZWFk T25seSgpIGNvbnN0Cit7CisgICAgcmV0dXJuIG1fZmllbGRPd25lciAmJiBtX2ZpZWxkT3duZXIt PmlzRmllbGRPd25lclJlYWRPbmx5KCk7Cit9CisKIGJvb2wgRGF0ZVRpbWVGaWVsZEVsZW1lbnQ6 OmlzRm9jdXNhYmxlKCkgY29uc3QKIHsKICAgICBpZiAoaXNEaXNhYmxlZCgpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7Ci0gICAgaWYgKG1fZmllbGRPd25lciAmJiBtX2ZpZWxkT3duZXItPmlzRmll bGRPd25lckRpc2FibGVkT3JSZWFkT25seSgpKQorICAgIGlmIChpc0ZpZWxkT3duZXJEaXNhYmxl ZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgcmV0dXJuIEhUTUxFbGVtZW50Ojppc0Zv Y3VzYWJsZSgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0 ZVRpbWVGaWVsZEVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1l RmllbGRFbGVtZW50LmgKaW5kZXggOWVjOTM1Y2Q3OGM2YTE3YmNhOWMzODMzODY2YTI1MDM5ZWU3 NzE4NS4uOGE3YTgzMDBlZDAxN2I0ZTFjYjVkM2E5OTVlZmRlNDZmOTdhNTUzYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVGaWVsZEVsZW1lbnQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZUZpZWxkRWxlbWVudC5oCkBAIC01 Niw3ICs1Niw4IEBAIHB1YmxpYzoKICAgICAgICAgdmlydHVhbCB2b2lkIGZpZWxkVmFsdWVDaGFu Z2VkKCkgPSAwOwogICAgICAgICB2aXJ0dWFsIGJvb2wgZm9jdXNPbk5leHRGaWVsZChjb25zdCBE YXRlVGltZUZpZWxkRWxlbWVudCYpID0gMDsKICAgICAgICAgdmlydHVhbCBib29sIGZvY3VzT25Q cmV2aW91c0ZpZWxkKGNvbnN0IERhdGVUaW1lRmllbGRFbGVtZW50JikgPSAwOwotICAgICAgICB2 aXJ0dWFsIGJvb2wgaXNGaWVsZE93bmVyRGlzYWJsZWRPclJlYWRPbmx5KCkgY29uc3QgPSAwOwor ICAgICAgICB2aXJ0dWFsIGJvb2wgaXNGaWVsZE93bmVyRGlzYWJsZWQoKSBjb25zdCA9IDA7Cisg ICAgICAgIHZpcnR1YWwgYm9vbCBpc0ZpZWxkT3duZXJSZWFkT25seSgpIGNvbnN0ID0gMDsKICAg ICAgICAgdmlydHVhbCBBdG9taWNTdHJpbmcgbG9jYWxlSWRlbnRpZmllcigpIGNvbnN0ID0gMDsK ICAgICB9OwogCkBAIC05Myw2ICs5NCw4IEBAIHByb3RlY3RlZDoKIHByaXZhdGU6CiAgICAgdm9p ZCBkZWZhdWx0S2V5Ym9hcmRFdmVudEhhbmRsZXIoS2V5Ym9hcmRFdmVudCopOwogICAgIHZpcnR1 YWwgYm9vbCBpc0RhdGVUaW1lRmllbGRFbGVtZW50KCkgY29uc3QgT1ZFUlJJREU7CisgICAgYm9v bCBpc0ZpZWxkT3duZXJEaXNhYmxlZCgpIGNvbnN0OworICAgIGJvb2wgaXNGaWVsZE93bmVyUmVh ZE9ubHkoKSBjb25zdDsKICAgICB2aXJ0dWFsIGJvb2wgc3VwcG9ydHNGb2N1cygpIGNvbnN0IE9W RVJSSURFIEZJTkFMOwogCiAgICAgRmllbGRPd25lciogbV9maWVsZE93bmVyOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0RhdGVUaW1lTnVtZXJpY0ZpZWxkRWxl bWVudC5jcHAKaW5kZXggYjMzYTA5NzViZmRhNTNlMDM4NGE2N2VmYWNhOTkxM2ZhY2MwNDBjYi4u ZDIzMDBiNzU2ODViZmE3MDkzZDM5NzZmMDc0NjBlOWMxMmVlNTMwNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvRGF0ZVRpbWVOdW1lcmljRmllbGRFbGVtZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9EYXRlVGltZU51bWVyaWNGaWVsZEVsZW1l bnQuY3BwCkBAIC0xMjYsOSArMTI2LDcgQEAgU3RyaW5nIERhdGVUaW1lTnVtZXJpY0ZpZWxkRWxl bWVudDo6Zm9ybWF0VmFsdWUoaW50IHZhbHVlKSBjb25zdAogCiB2b2lkIERhdGVUaW1lTnVtZXJp Y0ZpZWxkRWxlbWVudDo6aGFuZGxlS2V5Ym9hcmRFdmVudChLZXlib2FyZEV2ZW50KiBrZXlib2Fy ZEV2ZW50KQogewotICAgIGlmIChpc0Rpc2FibGVkKCkpCi0gICAgICAgIHJldHVybjsKLQorICAg IEFTU0VSVCghaXNEaXNhYmxlZCgpKTsKICAgICBpZiAoa2V5Ym9hcmRFdmVudC0+dHlwZSgpICE9 IGV2ZW50TmFtZXMoKS5rZXlwcmVzc0V2ZW50KQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAz Yjk4YjRiYzJiOTgxY2NhMjk5ZThlZDhiNDc4OTlhOTgxNjIyNGE3Li4zNWJjNDBkNzhjNzJkZGIz YTg4NTNjZjYzZDIyZmQ0YjJiNGMwNzQ0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMDIt MDUgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIElOUFVUX01V TFRJUExFX0ZJRUxEU19VSTogUmVhZC1vbmx5IGlucHV0cyBzaG91bGQgYmUgZm9jdXNhYmxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDg3OTUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvZm9y bXMvdGltZS1tdWx0aXBsZS1maWVsZHMvdGltZS1tdWx0aXBsZS1maWVsZHMta2V5Ym9hcmQtZXZl bnRzLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBmYXN0L2Zvcm1zL3RpbWUtbXVsdGlwbGUtZmll bGRzL3RpbWUtbXVsdGlwbGUtZmllbGRzLWtleWJvYXJkLWV2ZW50cy5odG1sOgorCiAyMDEzLTAy LTA1ICBSb2dlciBGb25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZp ZXdlZCBnYXJkZW5pbmcuIFdpbjcgcG9ydCBkb2Vzbid0IHJ1biBXZWJHTC4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvdGltZS1tdWx0aXBsZS1maWVsZHMvdGltZS1tdWx0aXBs ZS1maWVsZHMta2V5Ym9hcmQtZXZlbnRzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3Qv Zm9ybXMvdGltZS1tdWx0aXBsZS1maWVsZHMvdGltZS1tdWx0aXBsZS1maWVsZHMta2V5Ym9hcmQt ZXZlbnRzLWV4cGVjdGVkLnR4dAppbmRleCBmN2RmMTFiMTA0YjE4MDhhNjk4YjY0ODJkYjU2YmZl MmI1MzdjMGViLi5lOTliMjJiZTgxMTdjNmZjNmZmMDAwMzg2ZjIzY2I2YmJkMDhiZjFlIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3RpbWUtbXVsdGlwbGUtZmllbGRzL3RpbWUt bXVsdGlwbGUtZmllbGRzLWtleWJvYXJkLWV2ZW50cy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9mb3Jtcy90aW1lLW11bHRpcGxlLWZpZWxkcy90aW1lLW11bHRpcGxlLWZpZWxk cy1rZXlib2FyZC1ldmVudHMtZXhwZWN0ZWQudHh0CkBAIC0zOCw4ICszOCwxNyBAQCBQQVNTIGV2 ZW50c0NvdW50ZXIuY2hhbmdlIGlzIDEKIFBBU1MgaW5wdXQudmFsdWUgaXMgIjAzOjA1IgogUEFT UyBpbnB1dC52YWx1ZSBpcyAiMDc6MDUiCiBQQVNTIGRvY3VtZW50LmFjdGl2ZUVsZW1lbnQuaWQg aXMgImFub3RoZXIiCi09PSBUYWIgbmF2aWdhdGlvbiBzaG91bGQgc2tpcCBkaXNhYmxlZC9yZWFk b25seSBpbnB1dHMgPT0KKz09IFRhYiBuYXZpZ2F0aW9uIHNob3VsZCBza2lwIGRpc2FibGVkIGlu cHV0cyA9PQogUEFTUyBkb2N1bWVudC5hY3RpdmVFbGVtZW50LmlkIGlzICJhbm90aGVyIgorPT0g VGFiIG5hdmlnYXRpb24gc2hvdWxkIG5vdCBza2lwIHJlYWRvbmx5IGlucHV0cywgYnV0IGVkaXRp bmcgb3BlcmF0aW9ucyBzaG91bGQgYmUgaWdub3JlZC4gPT0KK1BBU1MgZG9jdW1lbnQuYWN0aXZl RWxlbWVudC5pZCBpcyAiaW5wdXQiCitQQVNTIHBzZXVkb09mRm9jdXNlZFN1YkZpZWxkKGlucHV0 KSBpcyAiLXdlYmtpdC1kYXRldGltZS1lZGl0LWhvdXItZmllbGQiCitQQVNTIGtleURvd24oInVw QXJyb3ciKTsgaW5wdXQudmFsdWUgaXMgIjAxOjAxIgorUEFTUyBrZXlEb3duKCJkb3duQXJyb3ci KTsgaW5wdXQudmFsdWUgaXMgIjAxOjAxIgorUEFTUyBwc2V1ZG9PZkZvY3VzZWRTdWJGaWVsZChp bnB1dCkgaXMgIi13ZWJraXQtZGF0ZXRpbWUtZWRpdC1taW51dGUtZmllbGQiCitQQVNTIGtleURv d24oIjMiKTsgaW5wdXQudmFsdWUgaXMgIjAxOjAxIgorUEFTUyBwc2V1ZG9PZkZvY3VzZWRTdWJG aWVsZChpbnB1dCkgaXMgIi13ZWJraXQtZGF0ZXRpbWUtZWRpdC1hbXBtLWZpZWxkIgorUEFTUyBw c2V1ZG9PZkZvY3VzZWRTdWJGaWVsZChpbnB1dCkgaXMgIi13ZWJraXQtZGF0ZXRpbWUtZWRpdC1t aW51dGUtZmllbGQiCiBQQVNTIGRvY3VtZW50LmFjdGl2ZUVsZW1lbnQuaWQgaXMgImFub3RoZXIi CiA9PSBTaGZpdCtUYWIga2V5ID09CiBQQVNTIGlucHV0LnZhbHVlIGlzICIxNTowMCIKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvdGltZS1tdWx0aXBsZS1maWVsZHMvdGltZS1t dWx0aXBsZS1maWVsZHMta2V5Ym9hcmQtZXZlbnRzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Zv cm1zL3RpbWUtbXVsdGlwbGUtZmllbGRzL3RpbWUtbXVsdGlwbGUtZmllbGRzLWtleWJvYXJkLWV2 ZW50cy5odG1sCmluZGV4IDg1YjI3MTc3NWE3MDBlZjI1YmQ3OGEyZTk5M2FiNTY2ZmNkN2UwOTUu LjNmOWMzMWZlOWFkMWRiNDM1Y2ZhNmQ4ZDNiODMxODlkMTk0MWU5YjMgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2Zhc3QvZm9ybXMvdGltZS1tdWx0aXBsZS1maWVsZHMvdGltZS1tdWx0aXBsZS1m aWVsZHMta2V5Ym9hcmQtZXZlbnRzLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy90 aW1lLW11bHRpcGxlLWZpZWxkcy90aW1lLW11bHRpcGxlLWZpZWxkcy1rZXlib2FyZC1ldmVudHMu aHRtbApAQCAtMjYsNiArMjYsMTEgQEAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCiAgICAgaW50ZXJu YWxzLnNldHRpbmdzLnNldExhbmdBdHRyaWJ1dGVBd2FyZUZvcm1Db250cm9sVUlFbmFibGVkKHRy dWUpOwogdmFyIGlucHV0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImlucHV0Iik7CiAKK2Z1 bmN0aW9uIHBzZXVkb09mRm9jdXNlZFN1YkZpZWxkKGhvc3QpCit7CisgICAgcmV0dXJuIGludGVy bmFscy55b3VuZ2VzdFNoYWRvd1Jvb3QoaG9zdCkuYWN0aXZlRWxlbWVudC5nZXRBdHRyaWJ1dGUo InBzZXVkbyIpCit9CisKIGZ1bmN0aW9uIGtleURvd24oa2V5LCBtb2RpZmllcnMpCiB7CiAgICAg aWYgKCF3aW5kb3cuZXZlbnRTZW5kZXIpCkBAIC0xMzYsMTYgKzE0MSwzMSBAQCBrZXlEb3duKCdc dCcpOwoga2V5RG93bignXHQnKTsKIHNob3VsZEJlRXF1YWxUb1N0cmluZygnZG9jdW1lbnQuYWN0 aXZlRWxlbWVudC5pZCcsICdhbm90aGVyJyk7CiAKLWJlZ2luVGVzdCgnVGFiIG5hdmlnYXRpb24g c2hvdWxkIHNraXAgZGlzYWJsZWQvcmVhZG9ubHkgaW5wdXRzJywgJycpOworYmVnaW5UZXN0KCdU YWIgbmF2aWdhdGlvbiBzaG91bGQgc2tpcCBkaXNhYmxlZCBpbnB1dHMnLCAnJyk7CiBiZWZvcmUu Zm9jdXMoKTsKIGlucHV0LmRpc2FibGVkID0gdHJ1ZTsKIGtleURvd24oJ1x0Jyk7CiBzaG91bGRC ZUVxdWFsVG9TdHJpbmcoJ2RvY3VtZW50LmFjdGl2ZUVsZW1lbnQuaWQnLCAnYW5vdGhlcicpOwog aW5wdXQuZGlzYWJsZWQgPSBmYWxzZTsKIAorYmVnaW5UZXN0KCdUYWIgbmF2aWdhdGlvbiBzaG91 bGQgbm90IHNraXAgcmVhZG9ubHkgaW5wdXRzLCBidXQgZWRpdGluZyBvcGVyYXRpb25zIHNob3Vs ZCBiZSBpZ25vcmVkLicsICcnKTsKIGJlZm9yZS5mb2N1cygpOworaW5wdXQudmFsdWUgPSAnMDE6 MDEnOwogaW5wdXQucmVhZE9ubHkgPSB0cnVlOwoga2V5RG93bignXHQnKTsKK3Nob3VsZEJlRXF1 YWxUb1N0cmluZygnZG9jdW1lbnQuYWN0aXZlRWxlbWVudC5pZCcsICdpbnB1dCcpOworc2hvdWxk QmVFcXVhbFRvU3RyaW5nKCdwc2V1ZG9PZkZvY3VzZWRTdWJGaWVsZChpbnB1dCknLCAnLXdlYmtp dC1kYXRldGltZS1lZGl0LWhvdXItZmllbGQnKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygna2V5 RG93bigidXBBcnJvdyIpOyBpbnB1dC52YWx1ZScsICcwMTowMScpOworc2hvdWxkQmVFcXVhbFRv U3RyaW5nKCdrZXlEb3duKCJkb3duQXJyb3ciKTsgaW5wdXQudmFsdWUnLCAnMDE6MDEnKTsKK2tl eURvd24oJ3JpZ2h0QXJyb3cnKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygncHNldWRvT2ZGb2N1 c2VkU3ViRmllbGQoaW5wdXQpJywgJy13ZWJraXQtZGF0ZXRpbWUtZWRpdC1taW51dGUtZmllbGQn KTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygna2V5RG93bigiMyIpOyBpbnB1dC52YWx1ZScsICcw MTowMScpOwora2V5RG93bignXHQnKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygncHNldWRvT2ZG b2N1c2VkU3ViRmllbGQoaW5wdXQpJywgJy13ZWJraXQtZGF0ZXRpbWUtZWRpdC1hbXBtLWZpZWxk Jyk7CitrZXlEb3duKCdsZWZ0QXJyb3cnKTsKK3Nob3VsZEJlRXF1YWxUb1N0cmluZygncHNldWRv T2ZGb2N1c2VkU3ViRmllbGQoaW5wdXQpJywgJy13ZWJraXQtZGF0ZXRpbWUtZWRpdC1taW51dGUt ZmllbGQnKTsKK2tleURvd24oJ1x0Jyk7CitrZXlEb3duKCdcdCcpOwogc2hvdWxkQmVFcXVhbFRv U3RyaW5nKCdkb2N1bWVudC5hY3RpdmVFbGVtZW50LmlkJywgJ2Fub3RoZXInKTsKIGlucHV0LnJl YWRPbmx5ID0gZmFsc2U7CiAK