13471 2007-04-24 06:46:05 -0700 REGRESSION (r21045): Secure keyboard entry mode remains in effect after leaving a password field by submitting 2007-04-28 18:54:44 -0700 1 1 1 Unclassified WebKit Forms 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED HasReduction, InRadar, Regression P1 Major --- 1 mitz webkit-unassigned adele oldest_to_newest 13039 0 mitz 2007-04-24 06:46:05 -0700 To reproduce: 1) Use System Preferences > International > Input Menu to enable a non-Roman input source, e.g. Arabic. 2) Open the attached test case and click in the password field. 3) Check that non-Roman input sources are disabled in the Input menu (the flag on the right side of the menu bar). 4) Press Return. 5) Click in the text field. 6) Check that non-Roman input sources are enabled and selectable in the Input menu. Expected results: disabled in 3) and enabled in 6). Actual results: disabled in 3) and in 6). Regressed in <http://trac.webkit.org/projects/webkit/changeset/21045>. 13010 1 14156 mitz 2007-04-24 06:46:42 -0700 Created attachment 14156 Test case 13011 2 14157 mitz 2007-04-24 07:18:17 -0700 Created attachment 14157 Reset secure keyboard entry mode in Frame::setView The reason why you can reset to false unconditionally is that pages containing password fields are not allowed in the page cache, so you know that in setView() you're never entering a page with a focused password field. If you think it's necessary, I can add a FIXME in FrameLoader::canCachePage() saying that if you ever decide to allow password fields in the page cache, then you should address this problem. 13009 3 14157 darin 2007-04-24 08:05:24 -0700 Comment on attachment 14157 Reset secure keyboard entry mode in Frame::setView Why not spell it "submit" everywhere? What's the key reason this needs to be called? Is it really the change in view that's the issue? Doesn't the input element lose focus? I think this fix is fine, but it would be stronger if I understood exactly why this is the right point in time to clear this. It has to have something about the input that was sponsoring secure keyboard entry. r=me 13005 4 14157 mitz 2007-04-24 08:41:15 -0700 Comment on attachment 14157 Reset secure keyboard entry mode in Frame::setView (In reply to comment #3) > (From update of attachment 14157 [edit]) > Why not spell it "submit" everywhere? Why not say "you made a typo"? ;-) > What's the key reason this needs to be called? Is it really the change in view > that's the issue? Doesn't the input element lose focus? In many senses, it never does (so I think that even prior to r21045, if you happened to be in a secure text field when the new page was loaded, you'd remain in Roman-only mode). The Frame doesn't keep track of focus, it just serves requests from nodes to switch secure mode on or off. Presumably, those nodes are in the Frame's Document. So now I'm thinking it may be more appropriate to patch setDocument() instead of setView(). It would still just reset to false unconditionally, since it can't (and doesn't need to) ask the new document's focused node if it requires secure keyboard entry. However, that could be changed in the future (if password fields can go into the page cache). 12993 5 darin 2007-04-24 09:47:17 -0700 (In reply to comment #4) > Why not say "you made a typo"? ;-) Sorry, I was just in a silly mood. > > What's the key reason this needs to be called? Is it really the change in view > > that's the issue? Doesn't the input element lose focus? > > In many senses, it never does (so I think that even prior to r21045, if you > happened to be in a secure text field when the new page was loaded, you'd > remain in Roman-only mode). The Frame doesn't keep track of focus, it just > serves requests from nodes to switch secure mode on or off. Presumably, those > nodes are in the Frame's Document. So now I'm thinking it may be more > appropriate to patch setDocument() instead of setView(). Sounds good; easier to explain at least. I think either is fine in practice. > It would still just > reset to false unconditionally, since it can't (and doesn't need to) ask the > new document's focused node if it requires secure keyboard entry. However, that > could be changed in the future (if password fields can go into the page cache). Makes sense. This is subtle enough that I think we need a comment or two. I really like the idea of putting a comment in FrameLoader::canCachePage -- I don't think it needs to be a FIXME, just a warning that if you change the rule then this other code will need to change too. 12985 6 14159 mitz 2007-04-24 11:46:09 -0700 Created attachment 14159 Reset secure entry mode in setDocument This turned out to be a slightly bigger change. I can go all the way and de-friend FrameLoader and Frame by adding a couple of public accessors and making cleanupScriptObjects() public. Feel free to r- if you want me to do it (or for any other reason!). 12984 7 14159 mitz 2007-04-24 11:48:06 -0700 Comment on attachment 14159 Reset secure entry mode in setDocument Wait! Found another typo! 12972 8 14160 mitz 2007-04-24 11:49:10 -0700 Created attachment 14160 Reset secure entry mode in setDocument See comment #6. 12973 9 14160 darin 2007-04-24 13:07:33 -0700 Comment on attachment 14160 Reset secure entry mode in setDocument I do like the idea of "going all the way" and eliminating the friendship, but I don't see any need to do this as part of this patch. setDocument should be changed to take a PassRefPtr. r=me 12349 10 darin 2007-04-26 08:31:40 -0700 <rdar://problem/5163498> 12045 11 darin 2007-04-28 18:54:44 -0700 Sending WebCore/ChangeLog Sending WebCore/loader/FrameLoader.cpp Adding WebCore/manual-tests/secure-keyboard-enabled-after-submit.html Sending WebCore/page/Frame.cpp Transmitting file data .... Committed revision 21172. 14156 2007-04-24 06:46:42 -0700 2007-04-24 06:46:42 -0700 Test case 13471 test case.html text/html 174 mitz PGZvcm0gYWN0aW9uPSJkYXRhOnRleHQvaHRtbCxDYW4geW91IGVudGVyIG5vbi1Sb21hbiBjaGFy YWN0ZXJzIGluIHRoaXMgZmllbGQgbm93ICUzY2lucHV0JTNlIj4KICAgIEZvY3VzIHRoZSBwYXNz d29yZCBmaWVsZCBhbmQgcHJlc3MgUmV0dXJuIDxpbnB1dCB0eXBlPSJwYXNzd29yZCI+CjwvZm9y bT4K 14157 2007-04-24 07:18:17 -0700 2007-04-24 08:41:15 -0700 Reset secure keyboard entry mode in Frame::setView 13471_r1.patch text/plain 2846 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMTA2OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDctMDQtMjQgIE1pdHogUGV0dGVsICA8bWl0ekB3ZWJraXQub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gZml4 IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDcxCisgICAgICAgICAg UkVHUkVTU0lPTiAocjIxMDQ1KTogU2VjdXJlIGtleWJvYXJkIGVudHJ5IG1vZGUgcmVtYWlucyBp biBlZmZlY3QgYWZ0ZXIgbGVhdmluZyBhIHBhc3N3b3JkIGZpZWxkIGJ5IHN1bWJpdHRpbmcKKwor ICAgICAgICAqIG1hbnVhbC10ZXN0cy9zZWN1cmUta2V5Ym9hcmQtZW5hYmxlZC1hZnRlci1zdW1i aXQuaHRtbDogQWRkZWQuCisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZTo6c2V0Vmlldyk6IFJlc2V0IHNlY3VyZSBrZXlib2FyZCBlbnRyeS4KKwogMjAw Ny0wNC0yNCAgTWl0eiBQZXR0ZWwgIDxtaXR6QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGF2ZSBIeWF0dC4KSW5kZXg6IFdlYkNvcmUvbWFudWFsLXRlc3RzL3NlY3VyZS1rZXli b2FyZC1lbmFibGVkLWFmdGVyLXN1bWJpdC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbWFu dWFsLXRlc3RzL3NlY3VyZS1rZXlib2FyZC1lbmFibGVkLWFmdGVyLXN1bWJpdC5odG1sCShyZXZp c2lvbiAwKQorKysgV2ViQ29yZS9tYW51YWwtdGVzdHMvc2VjdXJlLWtleWJvYXJkLWVuYWJsZWQt YWZ0ZXItc3VtYml0Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMzQgQEAKKzwhRE9DVFlQ RSBIVE1MIFBVQkxJQyAiLS8vVzNDLy9EVEQgSFRNTCA0LjAxLy9FTiIKKyAgICAgICAgImh0dHA6 Ly93d3cudzMub3JnL1RSL2h0bWw0L3N0cmljdC5kdGQiPgorPGh0bWwgbGFuZz0iZW4iPgorPGhl YWQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwPjxiPkJVRyBJRDo8L2I+IDxhIGhyZWY9Imh0dHA6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDcxIj5CdWd6aWxsYSBidWcgMTM0NzE8 L2E+IFJFR1JFU1NJT04gKHIyMTA0NSk6IFNlY3VyZSBrZXlib2FyZCBlbnRyeSBtb2RlIHJlbWFp bnMgaW4gZWZmZWN0IGFmdGVyIGxlYXZpbmcgYSBwYXNzd29yZCBmaWVsZCBieSBzdW1iaXR0aW5n PC9wPgorCis8cCBpZD0idGVzdCIgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6c2t5Ymx1ZTsgcGFk ZGluZzozcHg7Ij48Yj5TVEVQUyBUTyBURVNUOjwvYj4gPGJyPgorMSkgVXNlIFN5c3RlbSBQcmVm ZXJlbmNlcyA+IEludGVybmF0aW9uYWwgPiBJbnB1dCBNZW51IHRvIGVuYWJsZSBhIG5vbi1Sb21h bgoraW5wdXQgc291cmNlLCBlLmcuIEFyYWJpYy48YnI+CisyKSBDbGljayBpbiB0aGUgcGFzc3dv cmQgZmllbGQgYmVsb3cuPGJyPgorMykgQ2hlY2sgdGhhdCBub24tUm9tYW4gaW5wdXQgc291cmNl cyBhcmUgZGlzYWJsZWQgaW4gdGhlIElucHV0IG1lbnUgKHRoZSBmbGFnCitvbiB0aGUgcmlnaHQg c2lkZSBvZiB0aGUgbWVudSBiYXIpLjxicj4KKzQpIFByZXNzIFJldHVybiB0byBzdWJtaXQgdGhl IGZvcm0uPGJyPgorNSkgQ2xpY2sgaW4gdGhlIHRleHQgZmllbGQuPGJyPgorNikgQ2hlY2sgdGhh dCBub24tUm9tYW4gaW5wdXQgc291cmNlcyBhcmUgZW5hYmxlZCBhbmQgc2VsZWN0YWJsZSBpbiB0 aGUgSW5wdXQKK21lbnUuCis8L3A+CisKKzxwIGlkPSJzdWNjZXNzIiBzdHlsZT0iYmFja2dyb3Vu ZC1jb2xvcjpwYWxlZ3JlZW47IHBhZGRpbmc6M3B4OyI+PGI+VEVTVCBQQVNTOjwvYj4gCitOb24t Um9tYW4gaW5wdXQgc291cmNlcyB3aWxsIGJlIGRpc2FibGVkIGluIHN0ZXAgMyBidXQgd2lsbCBi ZSBlbmFibGVkIGFnYWluIGluIHN0ZXAgNi4KKzwvcD4KKworPHAgaWQ9ImZhaWx1cmUiIHN0eWxl PSJiYWNrZ3JvdW5kLWNvbG9yOiNGRjMzMDA7IHBhZGRpbmc6M3B4OyI+PGI+VEVTVCBGQUlMOjwv Yj4gIAorTm9uLVJvbWFuIGlucHV0IHNvdXJjZXMgd2lsbCBiZSBkaXNhYmxlZCBpbiBzdGVwIDYu Cis8L3A+CisKKzxmb3JtIG1ldGhvZD0icG9zdCIgYWN0aW9uPSJkYXRhOnRleHQvaHRtbCxDYW4g eW91IGVudGVyIG5vbi1Sb21hbiBjaGFyYWN0ZXJzIGluIHRoaXMgZmllbGQgbm93PyAlM2NpbnB1 dCUzZSI+CisgICAgRm9jdXMgdGhpcyBwYXNzd29yZCBmaWVsZCBhbmQgcHJlc3MgUmV0dXJuOiA8 aW5wdXQgdHlwZT0icGFzc3dvcmQiPgorPC9mb3JtPgorCis8L2JvZHk+Cis8L2h0bWw+CkluZGV4 OiBXZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9GcmFt ZS5jcHAJKHJldmlzaW9uIDIxMDY5KQorKysgV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjczLDYgKzI3Myw3IEBAIHZvaWQgRnJhbWU6OnNldFZpZXcoRnJhbWVWaWV3 KiB2aWV3KQogICAgICAgICAgICAgZC0+bV92aWV3LT51bnNjaGVkdWxlUmVsYXlvdXQoKTsKICAg ICB9CiAgICAgZXZlbnRIYW5kbGVyKCktPmNsZWFyKCk7CisgICAgc2V0VXNlU2VjdXJlS2V5Ym9h cmRFbnRyeVdoZW5BY3RpdmUoZmFsc2UpOwogCiAgICAgZC0+bV92aWV3ID0gdmlldzsKIAo= 14159 2007-04-24 11:46:09 -0700 2007-04-24 11:48:06 -0700 Reset secure entry mode in setDocument 13471_r2.patch text/plain 6312 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMTA3MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDctMDQtMjQgIE1pdHogUGV0dGVsICA8bWl0ekB3ZWJraXQub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gZml4 IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDcxCisgICAgICAgICAg UkVHUkVTU0lPTiAocjIxMDQ1KTogU2VjdXJlIGtleWJvYXJkIGVudHJ5IG1vZGUgcmVtYWlucyBp biBlZmZlY3QgYWZ0ZXIgbGVhdmluZyBhIHBhc3N3b3JkIGZpZWxkIGJ5IHN1Ym1pdHRpbmcKKwor ICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFt ZUxvYWRlcjo6Y2xlYXIpOiBSZXBsYWNlZCBkaXJlY3QgYWNjZXNzIHRvIEZyYW1lJ3MgZC0+bV9k b2MKKyAgICAgICAgd2l0aCBhIGNhbGwgdG8gRnJhbWU6OnNldERvY3VtZW50LgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVMb2FkZXI6OmJlZ2luKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpG cmFtZUxvYWRlcjo6b3Blbik6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6 OnN3aXRjaE91dExvd0JhbmR3aWR0aERpc3BsYXlJZlJlYWR5KTogRGl0dG8uCisgICAgICAgIChX ZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y2FuQ2FjaGVQYWdlKTogQWRkZWQgYSBjb21tZW50LgorICAg ICAgICAqIG1hbnVhbC10ZXN0cy9zZWN1cmUta2V5Ym9hcmQtZW5hYmxlZC1hZnRlci1zdWJtaXQu aHRtbDogQWRkZWQuCisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZTo6c2V0RG9jdW1lbnQpOiBSZXNldCBzZWN1cmUga2V5Ym9hcmQgZW50cnksIGluIGNh c2UgdGhlCisgICAgICAgIG9sZCBkb2N1bWVudCdzIGZvY3VzZWQgbm9kZSBoYXMgc2V0IGl0Lgor CiAyMDA3LTA0LTI0ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBKdXN0aW4uCkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiAy MTA2OSkKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNzYwLDcgKzc2MCw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNsZWFyKGJvb2wgY2xlYXJXaW5k b3cKIAogICAgIC8vIERvIG5vdCBkcm9wIHRoZSBkb2N1bWVudCBiZWZvcmUgdGhlIHNjcmlwdCBw cm94eSBhbmQgdmlldyBhcmUgY2xlYXJlZCwgYXMgc29tZSBkZXN0cnVjdG9ycwogICAgIC8vIG1p Z2h0IHN0aWxsIHRyeSB0byBhY2Nlc3MgdGhlIGRvY3VtZW50LgotICAgIG1fZnJhbWUtPmQtPm1f ZG9jID0gMDsKKyAgICBtX2ZyYW1lLT5zZXREb2N1bWVudCgwKTsKICAgICBtX2RlY29kZXIgPSAw OwogCiAgICAgbV9jb250YWluc1BsdWdJbnMgPSBmYWxzZTsKQEAgLTg0MCwxMCArODQwLDggQEAg dm9pZCBGcmFtZUxvYWRlcjo6YmVnaW4oY29uc3QgS1VSTCYgdXJsKQogCiAgICAgUmVmUHRyPERv Y3VtZW50PiBkb2N1bWVudCA9IERPTUltcGxlbWVudGF0aW9uOjppbnN0YW5jZSgpLT4KICAgICAg ICAgY3JlYXRlRG9jdW1lbnQobV9yZXNwb25zZU1JTUVUeXBlLCBtX2ZyYW1lLT52aWV3KCksIG1f ZnJhbWUtPmluVmlld1NvdXJjZU1vZGUoKSk7Ci0gICAgbV9mcmFtZS0+ZC0+bV9kb2MgPSBkb2N1 bWVudDsKKyAgICBtX2ZyYW1lLT5zZXREb2N1bWVudChkb2N1bWVudC5nZXQoKSk7CiAKLSAgICBp ZiAoIWRvY3VtZW50LT5hdHRhY2hlZCgpKQotICAgICAgICBkb2N1bWVudC0+YXR0YWNoKCk7CiAg ICAgZG9jdW1lbnQtPnNldFVSTChtX1VSTC51cmwoKSk7CiAgICAgLy8gV2UgcHJlZmVyIG1fYmFz ZVVSTCBvdmVyIG1fVVJMIGJlY2F1c2UgbV9VUkwgY2hhbmdlcyB3aGVuIHdlIGFyZQogICAgIC8v IGFib3V0IHRvIGxvYWQgYSBuZXcgcGFnZS4KQEAgLTE2MTgsNiArMTYxNiw5IEBAIGJvb2wgRnJh bWVMb2FkZXI6OmNhbkNhY2hlUGFnZSgpCiAgICAgICAgICYmICFtX1VSTC5wcm90b2NvbCgpLnN0 YXJ0c1dpdGgoImh0dHBzIikKICAgICAgICAgJiYgIW1fZnJhbWUtPmRvY3VtZW50KCktPmFwcGxl dHMoKS0+bGVuZ3RoKCkKICAgICAgICAgJiYgIW1fZnJhbWUtPmRvY3VtZW50KCktPmhhc1dpbmRv d0V2ZW50TGlzdGVuZXIodW5sb2FkRXZlbnQpCisgICAgICAgIC8vIElmIHlvdSBjaGFuZ2UgdGhl IGZvbGxvd2luZyB0byBhbGxvdyBjYWNoaW5nIG9mIGRvY3VtZW50cyB3aXRoIHBhc3N3b3JkIGZp ZWxkcywKKyAgICAgICAgLy8geW91IGFsc28gbmVlZCB0byBtYWtlIHN1cmUgdGhhdCBGcmFtZTo6 c2V0RG9jdW1lbnQgdHVybnMgb24gc2VjdXJlIGtleWJvYXJkCisgICAgICAgIC8vIGVudHJ5IG1v ZGUgaWYgdGhlIGRvY3VtZW50J3MgZm9jdXNlZCBub2RlIHJlcXVpcmVzIGl0LgogICAgICAgICAm JiAhbV9mcmFtZS0+ZG9jdW1lbnQoKS0+aGFzUGFzc3dvcmRGaWVsZCgpOwogfQogCkBAIC0yNTU2 LDcgKzI1NTcsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpvcGVuKENhY2hlZFBhZ2UmIGNhY2hlCiAg ICAgCiAgICAgbV9mcmFtZS0+c2V0Vmlldyhkb2N1bWVudC0+dmlldygpKTsKICAgICAKLSAgICBt X2ZyYW1lLT5kLT5tX2RvYyA9IGRvY3VtZW50OworICAgIG1fZnJhbWUtPnNldERvY3VtZW50KGRv Y3VtZW50KTsKICAgICBtX2RlY29kZXIgPSBkb2N1bWVudC0+ZGVjb2RlcigpOwogCiAgICAgdXBk YXRlUG9saWN5QmFzZVVSTCgpOwpAQCAtNDUwMCw5ICs0NTAxLDcgQEAgdm9pZCBGcmFtZUxvYWRl cjo6c3dpdGNoT3V0TG93QmFuZHdpZHRoRAogICAgICAgICAgICAgLy8gc2ltaWxhciB0byBiZWdp bigpLCBzaG91bGQgYmUgcmVmYWN0b3JlZCB0byBzaGFyZSBtb3JlIGNvZGUKICAgICAgICAgICAg IFJlZlB0cjxEb2N1bWVudD4gbmV3RG9jID0gRE9NSW1wbGVtZW50YXRpb246Omluc3RhbmNlKCkt PgogICAgICAgICAgICAgICAgIGNyZWF0ZURvY3VtZW50KG1fcmVzcG9uc2VNSU1FVHlwZSwgbV9m cmFtZS0+dmlldygpLCBtX2ZyYW1lLT5pblZpZXdTb3VyY2VNb2RlKCkpOwotICAgICAgICAgICAg bV9mcmFtZS0+ZC0+bV9kb2MgPSBuZXdEb2M7Ci0gICAgICAgICAgICBpZiAoIW5ld0RvYy0+YXR0 YWNoZWQoKSkKLSAgICAgICAgICAgICAgICBuZXdEb2MtPmF0dGFjaCgpOworICAgICAgICAgICAg bV9mcmFtZS0+c2V0RG9jdW1lbnQobmV3RG9jKTsKICAgICAgICAgICAgIG5ld0RvYy0+c2V0VVJM KG1fVVJMLnVybCgpKTsKICAgICAgICAgICAgIG5ld0RvYy0+c2V0QmFzZVVSTChtX1VSTC51cmwo KSk7CiAgICAgICAgICAgICBpZiAobV9kZWNvZGVyKQpJbmRleDogV2ViQ29yZS9tYW51YWwtdGVz dHMvc2VjdXJlLWtleWJvYXJkLWVuYWJsZWQtYWZ0ZXItc3VibWl0Lmh0bWwKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9tYW51YWwtdGVzdHMvc2VjdXJlLWtleWJvYXJkLWVuYWJsZWQtYWZ0ZXItc3Vi bWl0Lmh0bWwJKHJldmlzaW9uIDApCisrKyBXZWJDb3JlL21hbnVhbC10ZXN0cy9zZWN1cmUta2V5 Ym9hcmQtZW5hYmxlZC1hZnRlci1zdWJtaXQuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwz NCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEvL0VOIgor ICAgICAgICAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQvc3RyaWN0LmR0ZCI+Cis8aHRtbCBs YW5nPSJlbiI+Cis8aGVhZD4KKzwvaGVhZD4KKzxib2R5PgorPHA+PGI+QlVHIElEOjwvYj4gPGEg aHJlZj0iaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0NzEiPkJ1Z3pp bGxhIGJ1ZyAxMzQ3MTwvYT4gUkVHUkVTU0lPTiAocjIxMDQ1KTogU2VjdXJlIGtleWJvYXJkIGVu dHJ5IG1vZGUgcmVtYWlucyBpbiBlZmZlY3QgYWZ0ZXIgbGVhdmluZyBhIHBhc3N3b3JkIGZpZWxk IGJ5IHN1Ym1pdHRpbmc8L3A+CisKKzxwIGlkPSJ0ZXN0IiBzdHlsZT0iYmFja2dyb3VuZC1jb2xv cjpza3libHVlOyBwYWRkaW5nOjNweDsiPjxiPlNURVBTIFRPIFRFU1Q6PC9iPiA8YnI+CisxKSBV c2UgU3lzdGVtIFByZWZlcmVuY2VzID4gSW50ZXJuYXRpb25hbCA+IElucHV0IE1lbnUgdG8gZW5h YmxlIGEgbm9uLVJvbWFuCitpbnB1dCBzb3VyY2UsIGUuZy4gQXJhYmljLjxicj4KKzIpIENsaWNr IGluIHRoZSBwYXNzd29yZCBmaWVsZCBiZWxvdy48YnI+CiszKSBDaGVjayB0aGF0IG5vbi1Sb21h biBpbnB1dCBzb3VyY2VzIGFyZSBkaXNhYmxlZCBpbiB0aGUgSW5wdXQgbWVudSAodGhlIGZsYWcK K29uIHRoZSByaWdodCBzaWRlIG9mIHRoZSBtZW51IGJhcikuPGJyPgorNCkgUHJlc3MgUmV0dXJu IHRvIHN1Ym1pdCB0aGUgZm9ybS48YnI+Cis1KSBDbGljayBpbiB0aGUgdGV4dCBmaWVsZC48YnI+ Cis2KSBDaGVjayB0aGF0IG5vbi1Sb21hbiBpbnB1dCBzb3VyY2VzIGFyZSBlbmFibGVkIGFuZCBz ZWxlY3RhYmxlIGluIHRoZSBJbnB1dAorbWVudS4KKzwvcD4KKworPHAgaWQ9InN1Y2Nlc3MiIHN0 eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOnBhbGVncmVlbjsgcGFkZGluZzozcHg7Ij48Yj5URVNUIFBB U1M6PC9iPiAKK05vbi1Sb21hbiBpbnB1dCBzb3VyY2VzIHdpbGwgYmUgZGlzYWJsZWQgaW4gc3Rl cCAzIGJ1dCB3aWxsIGJlIGVuYWJsZWQgYWdhaW4gaW4gc3RlcCA2LgorPC9wPgorCis8cCBpZD0i ZmFpbHVyZSIgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6I0ZGMzMwMDsgcGFkZGluZzozcHg7Ij48 Yj5URVNUIEZBSUw6PC9iPiAgCitOb24tUm9tYW4gaW5wdXQgc291cmNlcyB3aWxsIGJlIGRpc2Fi bGVkIGluIHN0ZXAgNi4KKzwvcD4KKworPGZvcm0gbWV0aG9kPSJwb3N0IiBhY3Rpb249ImRhdGE6 dGV4dC9odG1sLENhbiB5b3UgZW50ZXIgbm9uLVJvbWFuIGNoYXJhY3RlcnMgaW4gdGhpcyBmaWVs ZCBub3c/ICUzY2lucHV0JTNlIj4KKyAgICBGb2N1cyB0aGlzIHBhc3N3b3JkIGZpZWxkIGFuZCBw cmVzcyBSZXR1cm46IDxpbnB1dCB0eXBlPSJwYXNzd29yZCI+Cis8L2Zvcm0+CisKKzwvYm9keT4K KzwvaHRtbD4KSW5kZXg6IFdlYkNvcmUvcGFnZS9GcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wYWdlL0ZyYW1lLmNwcAkocmV2aXNpb24gMjEwNjkpCisrKyBXZWJDb3JlL3BhZ2UvRnJh bWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMDMsMTAgKzMwMywxNyBAQCBEb2N1bWVudCAqRnJh bWU6OmRvY3VtZW50KCkgY29uc3QKIHZvaWQgRnJhbWU6OnNldERvY3VtZW50KERvY3VtZW50KiBu ZXdEb2MpCiB7CiAgICAgaWYgKGQpIHsKLSAgICAgICAgaWYgKGQtPm1fZG9jKQotICAgICAgICAg ICAgZC0+bV9kb2MtPmRldGFjaCgpOworICAgICAgICBpZiAoZC0+bV9kb2MpIHsKKyAgICAgICAg ICAgIGlmIChkLT5tX2RvYy0+YXR0YWNoZWQoKSkKKyAgICAgICAgICAgICAgICBkLT5tX2RvYy0+ ZGV0YWNoKCk7CisgICAgICAgICAgICAvLyBUaGUgb2xkIGRvY3VtZW50J3MgZm9jdXNlZCBub2Rl IG1heSBoYXZlIHR1cm5lZCBvbiBzZWN1cmUga2V5Ym9hcmQgZW50cnkuCisgICAgICAgICAgICAv LyBOb3cgdGhhdCBpdCdzIGdvaW5nIGF3YXksIHR1cm4gaXQgb2ZmLiBEb2N1bWVudHMgY29udGFp bmluZyBhIHBhc3N3b3JkCisgICAgICAgICAgICAvLyBmaWVsZCBjYW5ub3QgZW50ZXIgdGhlIHBh Z2UgY2FjaGUsIHRoZXJlZm9yZSB8bmV3RG9jfCBjYW5ub3QgY29udGFpbiBhCisgICAgICAgICAg ICAvLyBmb2N1c2VkIHBhc3N3b3JkIGZpZWxkLCBhbmQgaGVuY2Ugd2UgY2FuIGFsd2F5c2Ugc2V0 IHRvIGZhbHNlLgorICAgICAgICAgICAgc2V0VXNlU2VjdXJlS2V5Ym9hcmRFbnRyeVdoZW5BY3Rp dmUoZmFsc2UpOworICAgICAgICB9CiAgICAgICAgIGQtPm1fZG9jID0gbmV3RG9jOwotICAgICAg ICBpZiAobmV3RG9jKQorICAgICAgICBpZiAobmV3RG9jICYmICFuZXdEb2MtPmF0dGFjaGVkKCkp CiAgICAgICAgICAgICBuZXdEb2MtPmF0dGFjaCgpOwogICAgIH0KIH0K 14160 2007-04-24 11:49:10 -0700 2007-04-24 13:07:33 -0700 Reset secure entry mode in setDocument 13471_r2.patch text/plain 6311 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMTA3MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDctMDQtMjQgIE1pdHogUGV0dGVsICA8bWl0ekB3ZWJraXQub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gZml4 IGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNDcxCisgICAgICAgICAg UkVHUkVTU0lPTiAocjIxMDQ1KTogU2VjdXJlIGtleWJvYXJkIGVudHJ5IG1vZGUgcmVtYWlucyBp biBlZmZlY3QgYWZ0ZXIgbGVhdmluZyBhIHBhc3N3b3JkIGZpZWxkIGJ5IHN1Ym1pdHRpbmcKKwor ICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFt ZUxvYWRlcjo6Y2xlYXIpOiBSZXBsYWNlZCBkaXJlY3QgYWNjZXNzIHRvIEZyYW1lJ3MgZC0+bV9k b2MKKyAgICAgICAgd2l0aCBhIGNhbGwgdG8gRnJhbWU6OnNldERvY3VtZW50LgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVMb2FkZXI6OmJlZ2luKTogRGl0dG8uCisgICAgICAgIChXZWJDb3JlOjpG cmFtZUxvYWRlcjo6b3Blbik6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6 OnN3aXRjaE91dExvd0JhbmR3aWR0aERpc3BsYXlJZlJlYWR5KTogRGl0dG8uCisgICAgICAgIChX ZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y2FuQ2FjaGVQYWdlKTogQWRkZWQgYSBjb21tZW50LgorICAg ICAgICAqIG1hbnVhbC10ZXN0cy9zZWN1cmUta2V5Ym9hcmQtZW5hYmxlZC1hZnRlci1zdWJtaXQu aHRtbDogQWRkZWQuCisgICAgICAgICogcGFnZS9GcmFtZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpGcmFtZTo6c2V0RG9jdW1lbnQpOiBSZXNldCBzZWN1cmUga2V5Ym9hcmQgZW50cnksIGluIGNh c2UgdGhlCisgICAgICAgIG9sZCBkb2N1bWVudCdzIGZvY3VzZWQgbm9kZSBoYXMgc2V0IGl0Lgor CiAyMDA3LTA0LTI0ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBKdXN0aW4uCkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiAy MTA2OSkKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNzYwLDcgKzc2MCw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNsZWFyKGJvb2wgY2xlYXJXaW5k b3cKIAogICAgIC8vIERvIG5vdCBkcm9wIHRoZSBkb2N1bWVudCBiZWZvcmUgdGhlIHNjcmlwdCBw cm94eSBhbmQgdmlldyBhcmUgY2xlYXJlZCwgYXMgc29tZSBkZXN0cnVjdG9ycwogICAgIC8vIG1p Z2h0IHN0aWxsIHRyeSB0byBhY2Nlc3MgdGhlIGRvY3VtZW50LgotICAgIG1fZnJhbWUtPmQtPm1f ZG9jID0gMDsKKyAgICBtX2ZyYW1lLT5zZXREb2N1bWVudCgwKTsKICAgICBtX2RlY29kZXIgPSAw OwogCiAgICAgbV9jb250YWluc1BsdWdJbnMgPSBmYWxzZTsKQEAgLTg0MCwxMCArODQwLDggQEAg dm9pZCBGcmFtZUxvYWRlcjo6YmVnaW4oY29uc3QgS1VSTCYgdXJsKQogCiAgICAgUmVmUHRyPERv Y3VtZW50PiBkb2N1bWVudCA9IERPTUltcGxlbWVudGF0aW9uOjppbnN0YW5jZSgpLT4KICAgICAg ICAgY3JlYXRlRG9jdW1lbnQobV9yZXNwb25zZU1JTUVUeXBlLCBtX2ZyYW1lLT52aWV3KCksIG1f ZnJhbWUtPmluVmlld1NvdXJjZU1vZGUoKSk7Ci0gICAgbV9mcmFtZS0+ZC0+bV9kb2MgPSBkb2N1 bWVudDsKKyAgICBtX2ZyYW1lLT5zZXREb2N1bWVudChkb2N1bWVudC5nZXQoKSk7CiAKLSAgICBp ZiAoIWRvY3VtZW50LT5hdHRhY2hlZCgpKQotICAgICAgICBkb2N1bWVudC0+YXR0YWNoKCk7CiAg ICAgZG9jdW1lbnQtPnNldFVSTChtX1VSTC51cmwoKSk7CiAgICAgLy8gV2UgcHJlZmVyIG1fYmFz ZVVSTCBvdmVyIG1fVVJMIGJlY2F1c2UgbV9VUkwgY2hhbmdlcyB3aGVuIHdlIGFyZQogICAgIC8v IGFib3V0IHRvIGxvYWQgYSBuZXcgcGFnZS4KQEAgLTE2MTgsNiArMTYxNiw5IEBAIGJvb2wgRnJh bWVMb2FkZXI6OmNhbkNhY2hlUGFnZSgpCiAgICAgICAgICYmICFtX1VSTC5wcm90b2NvbCgpLnN0 YXJ0c1dpdGgoImh0dHBzIikKICAgICAgICAgJiYgIW1fZnJhbWUtPmRvY3VtZW50KCktPmFwcGxl dHMoKS0+bGVuZ3RoKCkKICAgICAgICAgJiYgIW1fZnJhbWUtPmRvY3VtZW50KCktPmhhc1dpbmRv d0V2ZW50TGlzdGVuZXIodW5sb2FkRXZlbnQpCisgICAgICAgIC8vIElmIHlvdSBjaGFuZ2UgdGhl IGZvbGxvd2luZyB0byBhbGxvdyBjYWNoaW5nIG9mIGRvY3VtZW50cyB3aXRoIHBhc3N3b3JkIGZp ZWxkcywKKyAgICAgICAgLy8geW91IGFsc28gbmVlZCB0byBtYWtlIHN1cmUgdGhhdCBGcmFtZTo6 c2V0RG9jdW1lbnQgdHVybnMgb24gc2VjdXJlIGtleWJvYXJkCisgICAgICAgIC8vIGVudHJ5IG1v ZGUgaWYgdGhlIGRvY3VtZW50J3MgZm9jdXNlZCBub2RlIHJlcXVpcmVzIGl0LgogICAgICAgICAm JiAhbV9mcmFtZS0+ZG9jdW1lbnQoKS0+aGFzUGFzc3dvcmRGaWVsZCgpOwogfQogCkBAIC0yNTU2 LDcgKzI1NTcsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpvcGVuKENhY2hlZFBhZ2UmIGNhY2hlCiAg ICAgCiAgICAgbV9mcmFtZS0+c2V0Vmlldyhkb2N1bWVudC0+dmlldygpKTsKICAgICAKLSAgICBt X2ZyYW1lLT5kLT5tX2RvYyA9IGRvY3VtZW50OworICAgIG1fZnJhbWUtPnNldERvY3VtZW50KGRv Y3VtZW50KTsKICAgICBtX2RlY29kZXIgPSBkb2N1bWVudC0+ZGVjb2RlcigpOwogCiAgICAgdXBk YXRlUG9saWN5QmFzZVVSTCgpOwpAQCAtNDUwMCw5ICs0NTAxLDcgQEAgdm9pZCBGcmFtZUxvYWRl cjo6c3dpdGNoT3V0TG93QmFuZHdpZHRoRAogICAgICAgICAgICAgLy8gc2ltaWxhciB0byBiZWdp bigpLCBzaG91bGQgYmUgcmVmYWN0b3JlZCB0byBzaGFyZSBtb3JlIGNvZGUKICAgICAgICAgICAg IFJlZlB0cjxEb2N1bWVudD4gbmV3RG9jID0gRE9NSW1wbGVtZW50YXRpb246Omluc3RhbmNlKCkt PgogICAgICAgICAgICAgICAgIGNyZWF0ZURvY3VtZW50KG1fcmVzcG9uc2VNSU1FVHlwZSwgbV9m cmFtZS0+dmlldygpLCBtX2ZyYW1lLT5pblZpZXdTb3VyY2VNb2RlKCkpOwotICAgICAgICAgICAg bV9mcmFtZS0+ZC0+bV9kb2MgPSBuZXdEb2M7Ci0gICAgICAgICAgICBpZiAoIW5ld0RvYy0+YXR0 YWNoZWQoKSkKLSAgICAgICAgICAgICAgICBuZXdEb2MtPmF0dGFjaCgpOworICAgICAgICAgICAg bV9mcmFtZS0+c2V0RG9jdW1lbnQobmV3RG9jKTsKICAgICAgICAgICAgIG5ld0RvYy0+c2V0VVJM KG1fVVJMLnVybCgpKTsKICAgICAgICAgICAgIG5ld0RvYy0+c2V0QmFzZVVSTChtX1VSTC51cmwo KSk7CiAgICAgICAgICAgICBpZiAobV9kZWNvZGVyKQpJbmRleDogV2ViQ29yZS9tYW51YWwtdGVz dHMvc2VjdXJlLWtleWJvYXJkLWVuYWJsZWQtYWZ0ZXItc3VibWl0Lmh0bWwKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9tYW51YWwtdGVzdHMvc2VjdXJlLWtleWJvYXJkLWVuYWJsZWQtYWZ0ZXItc3Vi bWl0Lmh0bWwJKHJldmlzaW9uIDApCisrKyBXZWJDb3JlL21hbnVhbC10ZXN0cy9zZWN1cmUta2V5 Ym9hcmQtZW5hYmxlZC1hZnRlci1zdWJtaXQuaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwz NCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEvL0VOIgor ICAgICAgICAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQvc3RyaWN0LmR0ZCI+Cis8aHRtbCBs YW5nPSJlbiI+Cis8aGVhZD4KKzwvaGVhZD4KKzxib2R5PgorPHA+PGI+QlVHIElEOjwvYj4gPGEg aHJlZj0iaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0NzEiPkJ1Z3pp bGxhIGJ1ZyAxMzQ3MTwvYT4gUkVHUkVTU0lPTiAocjIxMDQ1KTogU2VjdXJlIGtleWJvYXJkIGVu dHJ5IG1vZGUgcmVtYWlucyBpbiBlZmZlY3QgYWZ0ZXIgbGVhdmluZyBhIHBhc3N3b3JkIGZpZWxk IGJ5IHN1Ym1pdHRpbmc8L3A+CisKKzxwIGlkPSJ0ZXN0IiBzdHlsZT0iYmFja2dyb3VuZC1jb2xv cjpza3libHVlOyBwYWRkaW5nOjNweDsiPjxiPlNURVBTIFRPIFRFU1Q6PC9iPiA8YnI+CisxKSBV c2UgU3lzdGVtIFByZWZlcmVuY2VzID4gSW50ZXJuYXRpb25hbCA+IElucHV0IE1lbnUgdG8gZW5h YmxlIGEgbm9uLVJvbWFuCitpbnB1dCBzb3VyY2UsIGUuZy4gQXJhYmljLjxicj4KKzIpIENsaWNr IGluIHRoZSBwYXNzd29yZCBmaWVsZCBiZWxvdy48YnI+CiszKSBDaGVjayB0aGF0IG5vbi1Sb21h biBpbnB1dCBzb3VyY2VzIGFyZSBkaXNhYmxlZCBpbiB0aGUgSW5wdXQgbWVudSAodGhlIGZsYWcK K29uIHRoZSByaWdodCBzaWRlIG9mIHRoZSBtZW51IGJhcikuPGJyPgorNCkgUHJlc3MgUmV0dXJu IHRvIHN1Ym1pdCB0aGUgZm9ybS48YnI+Cis1KSBDbGljayBpbiB0aGUgdGV4dCBmaWVsZC48YnI+ Cis2KSBDaGVjayB0aGF0IG5vbi1Sb21hbiBpbnB1dCBzb3VyY2VzIGFyZSBlbmFibGVkIGFuZCBz ZWxlY3RhYmxlIGluIHRoZSBJbnB1dAorbWVudS4KKzwvcD4KKworPHAgaWQ9InN1Y2Nlc3MiIHN0 eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOnBhbGVncmVlbjsgcGFkZGluZzozcHg7Ij48Yj5URVNUIFBB U1M6PC9iPiAKK05vbi1Sb21hbiBpbnB1dCBzb3VyY2VzIHdpbGwgYmUgZGlzYWJsZWQgaW4gc3Rl cCAzIGJ1dCB3aWxsIGJlIGVuYWJsZWQgYWdhaW4gaW4gc3RlcCA2LgorPC9wPgorCis8cCBpZD0i ZmFpbHVyZSIgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6I0ZGMzMwMDsgcGFkZGluZzozcHg7Ij48 Yj5URVNUIEZBSUw6PC9iPiAgCitOb24tUm9tYW4gaW5wdXQgc291cmNlcyB3aWxsIGJlIGRpc2Fi bGVkIGluIHN0ZXAgNi4KKzwvcD4KKworPGZvcm0gbWV0aG9kPSJwb3N0IiBhY3Rpb249ImRhdGE6 dGV4dC9odG1sLENhbiB5b3UgZW50ZXIgbm9uLVJvbWFuIGNoYXJhY3RlcnMgaW4gdGhpcyBmaWVs ZCBub3c/ICUzY2lucHV0JTNlIj4KKyAgICBGb2N1cyB0aGlzIHBhc3N3b3JkIGZpZWxkIGFuZCBw cmVzcyBSZXR1cm46IDxpbnB1dCB0eXBlPSJwYXNzd29yZCI+Cis8L2Zvcm0+CisKKzwvYm9keT4K KzwvaHRtbD4KSW5kZXg6IFdlYkNvcmUvcGFnZS9GcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wYWdlL0ZyYW1lLmNwcAkocmV2aXNpb24gMjEwNjkpCisrKyBXZWJDb3JlL3BhZ2UvRnJh bWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMDMsMTAgKzMwMywxNyBAQCBEb2N1bWVudCAqRnJh bWU6OmRvY3VtZW50KCkgY29uc3QKIHZvaWQgRnJhbWU6OnNldERvY3VtZW50KERvY3VtZW50KiBu ZXdEb2MpCiB7CiAgICAgaWYgKGQpIHsKLSAgICAgICAgaWYgKGQtPm1fZG9jKQotICAgICAgICAg ICAgZC0+bV9kb2MtPmRldGFjaCgpOworICAgICAgICBpZiAoZC0+bV9kb2MpIHsKKyAgICAgICAg ICAgIGlmIChkLT5tX2RvYy0+YXR0YWNoZWQoKSkKKyAgICAgICAgICAgICAgICBkLT5tX2RvYy0+ ZGV0YWNoKCk7CisgICAgICAgICAgICAvLyBUaGUgb2xkIGRvY3VtZW50J3MgZm9jdXNlZCBub2Rl IG1heSBoYXZlIHR1cm5lZCBvbiBzZWN1cmUga2V5Ym9hcmQgZW50cnkuCisgICAgICAgICAgICAv LyBOb3cgdGhhdCBpdCdzIGdvaW5nIGF3YXksIHR1cm4gaXQgb2ZmLiBEb2N1bWVudHMgY29udGFp bmluZyBhIHBhc3N3b3JkCisgICAgICAgICAgICAvLyBmaWVsZCBjYW5ub3QgZW50ZXIgdGhlIHBh Z2UgY2FjaGUsIHRoZXJlZm9yZSB8bmV3RG9jfCBjYW5ub3QgY29udGFpbiBhCisgICAgICAgICAg ICAvLyBmb2N1c2VkIHBhc3N3b3JkIGZpZWxkLCBhbmQgaGVuY2Ugd2UgY2FuIGFsd2F5cyBzZXQg dG8gZmFsc2UuCisgICAgICAgICAgICBzZXRVc2VTZWN1cmVLZXlib2FyZEVudHJ5V2hlbkFjdGl2 ZShmYWxzZSk7CisgICAgICAgIH0KICAgICAgICAgZC0+bV9kb2MgPSBuZXdEb2M7Ci0gICAgICAg IGlmIChuZXdEb2MpCisgICAgICAgIGlmIChuZXdEb2MgJiYgIW5ld0RvYy0+YXR0YWNoZWQoKSkK ICAgICAgICAgICAgIG5ld0RvYy0+YXR0YWNoKCk7CiAgICAgfQogfQo=