11294 2006-10-14 14:04:04 -0700 Add getModifierState method to KeyboardEvent 2006-10-15 15:29:01 -0700 1 1 1 Unclassified WebKit WebCore Misc. 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned oldest_to_newest 53146 0 sam 2006-10-14 14:04:04 -0700 The DOM3 events spec (http://www.w3.org/TR/2003/NOTE-DOM-Level-3-Events-20031107/events.html#Events-KeyboardEvent) includes a getModifierState method that currently we only implement in the Objective-C bindings. We should implement in KeyboardEvent instead so that it can be used for all the bindings. 53152 1 11090 sam 2006-10-14 15:34:09 -0700 Created attachment 11090 patch Moves functionality down from Objective-C DOM file DOMEvents.mm to KeyboardEvent class. 53082 2 11100 sam 2006-10-15 14:25:40 -0700 Created attachment 11100 patch 2 Updated based on conversation with mitz in IRC. 53062 3 11100 mitz 2006-10-15 14:29:07 -0700 Comment on attachment 11100 patch 2 r=me 53040 4 sam 2006-10-15 15:29:01 -0700 Landed in r17064. 11090 2006-10-14 15:34:09 -0700 2006-10-15 14:25:40 -0700 patch AddgetModifierState.diff text/plain 4685 sam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNzA1OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDYtMTAtMTQgIFNhbSBXZWluaWcgIDxzYW0ud2VpbmlnQGdtYWls LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXggZm9yIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjk0CisgICAg ICAgIEFkZCBnZXRNb2RpZmllclN0YXRlIG1ldGhvZCB0byBLZXlib2FyZEV2ZW50CisKKyAgICAg ICAgKiBiaW5kaW5ncy9vYmpjL0RPTUV2ZW50cy5oOgorICAgICAgICAqIGJpbmRpbmdzL29iamMv RE9NRXZlbnRzLm1tOgorICAgICAgICAqIGJpbmRpbmdzL29iamMvUHVibGljRE9NSW50ZXJmYWNl cy5oOgorICAgICAgICAqIGRvbS9LZXlib2FyZEV2ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OktleWJvYXJkRXZlbnQ6OmdldE1vZGlmaWVyU3RhdGUpOgorICAgICAgICAqIGRvbS9LZXlib2Fy ZEV2ZW50Lmg6CisgICAgICAgICogZG9tL0tleWJvYXJkRXZlbnQuaWRsOgorCiAyMDA2LTEwLTE0 ICBEYXZpZCBIYXJyaXNvbiAgPGhhcnJpc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBHZW9mZi4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET01FdmVudHMuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL29iamMvRE9NRXZlbnRzLmgJKHJldmlzaW9uIDE3 MDU5KQorKysgV2ViQ29yZS9iaW5kaW5ncy9vYmpjL0RPTUV2ZW50cy5oCSh3b3JraW5nIGNvcHkp CkBAIC00MCw5ICs0MCw1IEBACiAjaW1wb3J0IDxXZWJDb3JlL0RPTVVJRXZlbnQuaD4KICNpbXBv cnQgPFdlYkNvcmUvRE9NV2hlZWxFdmVudC5oPgogCi1AaW50ZXJmYWNlIERPTUtleWJvYXJkRXZl bnQgKE5vblN0YW5kYXJkQWRkaXRpb25zKQotLSAoQk9PTClnZXRNb2RpZmllclN0YXRlOihOU1N0 cmluZyAqKWtleUlkZW50aWZpZXJBcmc7Ci1AZW5kCi0KIEBpbnRlcmZhY2UgRE9NTm9kZSAoRE9N RXZlbnRUYXJnZXQpIDxET01FdmVudFRhcmdldD4KIEBlbmQKSW5kZXg6IFdlYkNvcmUvYmluZGlu Z3Mvb2JqYy9ET01FdmVudHMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9vYmpj L0RPTUV2ZW50cy5tbQkocmV2aXNpb24gMTcwNTkpCisrKyBXZWJDb3JlL2JpbmRpbmdzL29iamMv RE9NRXZlbnRzLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMCw3ICszMCw2IEBACiAKICNpbXBvcnQg IkRPTUludGVybmFsLmgiCiAjaW1wb3J0ICJET01Qcml2YXRlLmgiCi0jaW1wb3J0ICJEb2N1bWVu dC5oIgogI2ltcG9ydCAiRXZlbnQuaCIKICNpbXBvcnQgIktleWJvYXJkRXZlbnQuaCIKICNpbXBv cnQgIk1vdXNlRXZlbnQuaCIKQEAgLTk4LDI1ICs5NywzIEBACiB9CiAKIEBlbmQKLQotCi0vLy0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQotLy8gRE9NS2V5Ym9hcmRFdmVudAotCi1A aW1wbGVtZW50YXRpb24gRE9NS2V5Ym9hcmRFdmVudCAoTm9uU3RhbmRhcmRBZGRpdGlvbnMpCi0K LS8vIEZJWE1FOiB0aGlzIHNob3VsZCBiZSBpbXBsZW1lbnRlZCBpbiB0aGUgaW1wbGVtZW50YXRp b24KLS0gKEJPT0wpZ2V0TW9kaWZpZXJTdGF0ZTooTlNTdHJpbmcgKilrZXlJZGVudGlmaWVyQXJn Ci17Ci0gICAgaWYgKFtrZXlJZGVudGlmaWVyQXJnIGlzRXF1YWxUb1N0cmluZzpAIkNvbnRyb2wi XSAmJiBbc2VsZiBjdHJsS2V5XSkKLSAgICAgICAgcmV0dXJuIFlFUzsKLSAgICBpZiAoW2tleUlk ZW50aWZpZXJBcmcgaXNFcXVhbFRvU3RyaW5nOkAiU2hpZnQiXSAmJiBbc2VsZiBzaGlmdEtleV0p Ci0gICAgICAgIHJldHVybiBZRVM7Ci0gICAgaWYgKFtrZXlJZGVudGlmaWVyQXJnIGlzRXF1YWxU b1N0cmluZzpAIkFsdCJdICYmIFtzZWxmIGFsdEtleV0pCi0gICAgICAgIHJldHVybiBZRVM7Ci0g ICAgaWYgKFtrZXlJZGVudGlmaWVyQXJnIGlzRXF1YWxUb1N0cmluZzpAIk1ldGEiXSAmJiBbc2Vs ZiBtZXRhS2V5XSkKLSAgICAgICAgcmV0dXJuIFlFUzsKLSAgICByZXR1cm4gTk87Ci19Ci0KLUBl bmQKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9QdWJsaWNET01JbnRlcmZhY2VzLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9vYmpjL1B1YmxpY0RPTUludGVyZmFjZXMuaAko cmV2aXNpb24gMTcwNTkpCisrKyBXZWJDb3JlL2JpbmRpbmdzL29iamMvUHVibGljRE9NSW50ZXJm YWNlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC05MjYsNiArOTI2LDcgQEAKIEBwcm9wZXJ0eShyZWFk b25seSkgQk9PTCBtZXRhS2V5OwogQHByb3BlcnR5KHJlYWRvbmx5KSBpbnQga2V5Q29kZTsKIEBw cm9wZXJ0eShyZWFkb25seSkgaW50IGNoYXJDb2RlOworLSAoQk9PTClnZXRNb2RpZmllclN0YXRl OihOU1N0cmluZyAqKWtleUlkZW50aWZpZXJBcmc7CiBAZW5kCiAKIEBpbnRlcmZhY2UgRE9NTW91 c2VFdmVudCA6IERPTVVJRXZlbnQKSW5kZXg6IFdlYkNvcmUvZG9tL0tleWJvYXJkRXZlbnQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL0tleWJvYXJkRXZlbnQuY3BwCShyZXZpc2lvbiAx NzA1OSkKKysrIFdlYkNvcmUvZG9tL0tleWJvYXJkRXZlbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC04Miw2ICs4MiwxOSBAQCB2b2lkIEtleWJvYXJkRXZlbnQ6OmluaXRLZXlib2FyZEV2ZW50KGNv CiAgICAgbV9hbHRHcmFwaEtleSA9IGFsdEdyYXBoS2V5OwogfQogCitib29sIEtleWJvYXJkRXZl bnQ6OmdldE1vZGlmaWVyU3RhdGUoY29uc3QgU3RyaW5nJiBrZXlJZGVudGlmaWVyKSBjb25zdAor eworICAgIGlmIChrZXlJZGVudGlmaWVyID09ICJDb250cm9sIiAmJiBjdHJsS2V5KCkpCisgICAg ICAgIHJldHVybiB0cnVlOworICAgIGlmIChrZXlJZGVudGlmaWVyID09ICJTaGlmdCIgJiYgc2hp ZnRLZXkoKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYgKGtleUlkZW50aWZpZXIgPT0g IkFsdCIgJiYgYWx0S2V5KCkpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIGlmIChrZXlJZGVu dGlmaWVyID09ICJNZXRhIiAmJiBtZXRhS2V5KCkpCisgICAgICAgIHJldHVybiB0cnVlOworICAg IHJldHVybiBmYWxzZTsKK30KKwogaW50IEtleWJvYXJkRXZlbnQ6OmtleUNvZGUoKSBjb25zdAog ewogICAgIGlmICghbV9rZXlFdmVudCkKSW5kZXg6IFdlYkNvcmUvZG9tL0tleWJvYXJkRXZlbnQu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9LZXlib2FyZEV2ZW50LmgJKHJldmlzaW9uIDE3 MDU5KQorKysgV2ViQ29yZS9kb20vS2V5Ym9hcmRFdmVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC01 NSw3ICs1NSw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAKICAgICAgICAgU3RyaW5nIGtl eUlkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBtX2tleUlkZW50aWZpZXI7IH0KICAgICAgICAg dW5zaWduZWQga2V5TG9jYXRpb24oKSBjb25zdCB7IHJldHVybiBtX2tleUxvY2F0aW9uOyB9Ci0g ICAgCisKKyAgICAgICAgYm9vbCBnZXRNb2RpZmllclN0YXRlKGNvbnN0IFN0cmluZyYga2V5SWRl bnRpZmllcikgY29uc3Q7CisKICAgICAgICAgYm9vbCBhbHRHcmFwaEtleSgpIGNvbnN0IHsgcmV0 dXJuIG1fYWx0R3JhcGhLZXk7IH0KICAgICAKICAgICAgICAgY29uc3QgUGxhdGZvcm1LZXlib2Fy ZEV2ZW50KiBrZXlFdmVudCgpIGNvbnN0IHsgcmV0dXJuIG1fa2V5RXZlbnQ7IH0KSW5kZXg6IFdl YkNvcmUvZG9tL0tleWJvYXJkRXZlbnQuaWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL0tl eWJvYXJkRXZlbnQuaWRsCShyZXZpc2lvbiAxNzA1OSkKKysrIFdlYkNvcmUvZG9tL0tleWJvYXJk RXZlbnQuaWRsCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw3ICszOSw3IEBAIG1vZHVsZSBldmVudHMg ewogICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgYm9vbGVhbiAgICAgICAgICBtZXRhS2V5Owog ICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgYm9vbGVhbiAgICAgICAgICBhbHRHcmFwaEtleTsK IAotI2lmICFkZWZpbmVkKExBTkdVQUdFX0pBVkFTQ1JJUFQpICYmICFkZWZpbmVkKExBTkdVQUdF X09CSkVDVElWRV9DKQorI2lmICFkZWZpbmVkKExBTkdVQUdFX0pBVkFTQ1JJUFQpCiAgICAgICAg IGJvb2xlYW4gZ2V0TW9kaWZpZXJTdGF0ZShpbiBET01TdHJpbmcga2V5SWRlbnRpZmllckFyZyk7 CiAjZW5kaWYKIAo= 11100 2006-10-15 14:25:40 -0700 2006-10-15 14:29:07 -0700 patch 2 AddgetModifierState2.diff text/plain 4653 sam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNzA1OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDYtMTAtMTUgIFNhbSBXZWluaWcgIDxzYW0ud2VpbmlnQGdtYWls LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBG aXggZm9yIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjk0CisgICAg ICAgIEFkZCBnZXRNb2RpZmllclN0YXRlIG1ldGhvZCB0byBLZXlib2FyZEV2ZW50CisKKyAgICAg ICAgKiBiaW5kaW5ncy9vYmpjL0RPTUV2ZW50cy5oOgorICAgICAgICAqIGJpbmRpbmdzL29iamMv RE9NRXZlbnRzLm1tOgorICAgICAgICAqIGJpbmRpbmdzL29iamMvUHVibGljRE9NSW50ZXJmYWNl cy5oOgorICAgICAgICAqIGRvbS9LZXlib2FyZEV2ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OktleWJvYXJkRXZlbnQ6OmdldE1vZGlmaWVyU3RhdGUpOgorICAgICAgICAqIGRvbS9LZXlib2Fy ZEV2ZW50Lmg6CisgICAgICAgICogZG9tL0tleWJvYXJkRXZlbnQuaWRsOgorCiAyMDA2LTEwLTE0 ICBEYXZpZCBIYXJyaXNvbiAgPGhhcnJpc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBHZW9mZi4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET01FdmVudHMuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL29iamMvRE9NRXZlbnRzLmgJKHJldmlzaW9uIDE3 MDU5KQorKysgV2ViQ29yZS9iaW5kaW5ncy9vYmpjL0RPTUV2ZW50cy5oCSh3b3JraW5nIGNvcHkp CkBAIC00MCw5ICs0MCw1IEBACiAjaW1wb3J0IDxXZWJDb3JlL0RPTVVJRXZlbnQuaD4KICNpbXBv cnQgPFdlYkNvcmUvRE9NV2hlZWxFdmVudC5oPgogCi1AaW50ZXJmYWNlIERPTUtleWJvYXJkRXZl bnQgKE5vblN0YW5kYXJkQWRkaXRpb25zKQotLSAoQk9PTClnZXRNb2RpZmllclN0YXRlOihOU1N0 cmluZyAqKWtleUlkZW50aWZpZXJBcmc7Ci1AZW5kCi0KIEBpbnRlcmZhY2UgRE9NTm9kZSAoRE9N RXZlbnRUYXJnZXQpIDxET01FdmVudFRhcmdldD4KIEBlbmQKSW5kZXg6IFdlYkNvcmUvYmluZGlu Z3Mvb2JqYy9ET01FdmVudHMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9vYmpj L0RPTUV2ZW50cy5tbQkocmV2aXNpb24gMTcwNTkpCisrKyBXZWJDb3JlL2JpbmRpbmdzL29iamMv RE9NRXZlbnRzLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMCw3ICszMCw2IEBACiAKICNpbXBvcnQg IkRPTUludGVybmFsLmgiCiAjaW1wb3J0ICJET01Qcml2YXRlLmgiCi0jaW1wb3J0ICJEb2N1bWVu dC5oIgogI2ltcG9ydCAiRXZlbnQuaCIKICNpbXBvcnQgIktleWJvYXJkRXZlbnQuaCIKICNpbXBv cnQgIk1vdXNlRXZlbnQuaCIKQEAgLTk4LDI1ICs5NywzIEBACiB9CiAKIEBlbmQKLQotCi0vLy0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQotLy8gRE9NS2V5Ym9hcmRFdmVudAotCi1A aW1wbGVtZW50YXRpb24gRE9NS2V5Ym9hcmRFdmVudCAoTm9uU3RhbmRhcmRBZGRpdGlvbnMpCi0K LS8vIEZJWE1FOiB0aGlzIHNob3VsZCBiZSBpbXBsZW1lbnRlZCBpbiB0aGUgaW1wbGVtZW50YXRp b24KLS0gKEJPT0wpZ2V0TW9kaWZpZXJTdGF0ZTooTlNTdHJpbmcgKilrZXlJZGVudGlmaWVyQXJn Ci17Ci0gICAgaWYgKFtrZXlJZGVudGlmaWVyQXJnIGlzRXF1YWxUb1N0cmluZzpAIkNvbnRyb2wi XSAmJiBbc2VsZiBjdHJsS2V5XSkKLSAgICAgICAgcmV0dXJuIFlFUzsKLSAgICBpZiAoW2tleUlk ZW50aWZpZXJBcmcgaXNFcXVhbFRvU3RyaW5nOkAiU2hpZnQiXSAmJiBbc2VsZiBzaGlmdEtleV0p Ci0gICAgICAgIHJldHVybiBZRVM7Ci0gICAgaWYgKFtrZXlJZGVudGlmaWVyQXJnIGlzRXF1YWxU b1N0cmluZzpAIkFsdCJdICYmIFtzZWxmIGFsdEtleV0pCi0gICAgICAgIHJldHVybiBZRVM7Ci0g ICAgaWYgKFtrZXlJZGVudGlmaWVyQXJnIGlzRXF1YWxUb1N0cmluZzpAIk1ldGEiXSAmJiBbc2Vs ZiBtZXRhS2V5XSkKLSAgICAgICAgcmV0dXJuIFlFUzsKLSAgICByZXR1cm4gTk87Ci19Ci0KLUBl bmQKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9QdWJsaWNET01JbnRlcmZhY2VzLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9vYmpjL1B1YmxpY0RPTUludGVyZmFjZXMuaAko cmV2aXNpb24gMTcwNTkpCisrKyBXZWJDb3JlL2JpbmRpbmdzL29iamMvUHVibGljRE9NSW50ZXJm YWNlcy5oCSh3b3JraW5nIGNvcHkpCkBAIC05MjYsNiArOTI2LDcgQEAKIEBwcm9wZXJ0eShyZWFk b25seSkgQk9PTCBtZXRhS2V5OwogQHByb3BlcnR5KHJlYWRvbmx5KSBpbnQga2V5Q29kZTsKIEBw cm9wZXJ0eShyZWFkb25seSkgaW50IGNoYXJDb2RlOworLSAoQk9PTClnZXRNb2RpZmllclN0YXRl OihOU1N0cmluZyAqKWtleUlkZW50aWZpZXJBcmc7CiBAZW5kCiAKIEBpbnRlcmZhY2UgRE9NTW91 c2VFdmVudCA6IERPTVVJRXZlbnQKSW5kZXg6IFdlYkNvcmUvZG9tL0tleWJvYXJkRXZlbnQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL0tleWJvYXJkRXZlbnQuY3BwCShyZXZpc2lvbiAx NzA1OSkKKysrIFdlYkNvcmUvZG9tL0tleWJvYXJkRXZlbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC04Miw2ICs4MiwxOSBAQCB2b2lkIEtleWJvYXJkRXZlbnQ6OmluaXRLZXlib2FyZEV2ZW50KGNv CiAgICAgbV9hbHRHcmFwaEtleSA9IGFsdEdyYXBoS2V5OwogfQogCitib29sIEtleWJvYXJkRXZl bnQ6OmdldE1vZGlmaWVyU3RhdGUoY29uc3QgU3RyaW5nJiBrZXlJZGVudGlmaWVyKSBjb25zdAor eworICAgIGlmIChrZXlJZGVudGlmaWVyID09ICJDb250cm9sIikKKyAgICAgICAgcmV0dXJuIGN0 cmxLZXkoKTsKKyAgICBpZiAoa2V5SWRlbnRpZmllciA9PSAiU2hpZnQiKQorICAgICAgICByZXR1 cm4gc2hpZnRLZXkoKTsKKyAgICBpZiAoa2V5SWRlbnRpZmllciA9PSAiQWx0IikKKyAgICAgICAg cmV0dXJuIGFsdEtleSgpOworICAgIGlmIChrZXlJZGVudGlmaWVyID09ICJNZXRhIikKKyAgICAg ICAgcmV0dXJuIG1ldGFLZXkoKTsKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIGludCBLZXlib2Fy ZEV2ZW50OjprZXlDb2RlKCkgY29uc3QKIHsKICAgICBpZiAoIW1fa2V5RXZlbnQpCkluZGV4OiBX ZWJDb3JlL2RvbS9LZXlib2FyZEV2ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vS2V5 Ym9hcmRFdmVudC5oCShyZXZpc2lvbiAxNzA1OSkKKysrIFdlYkNvcmUvZG9tL0tleWJvYXJkRXZl bnQuaAkod29ya2luZyBjb3B5KQpAQCAtNTUsNyArNTUsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgCiAgICAgICAgIFN0cmluZyBrZXlJZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9r ZXlJZGVudGlmaWVyOyB9CiAgICAgICAgIHVuc2lnbmVkIGtleUxvY2F0aW9uKCkgY29uc3QgeyBy ZXR1cm4gbV9rZXlMb2NhdGlvbjsgfQotICAgIAorCisgICAgICAgIGJvb2wgZ2V0TW9kaWZpZXJT dGF0ZShjb25zdCBTdHJpbmcmIGtleUlkZW50aWZpZXIpIGNvbnN0OworCiAgICAgICAgIGJvb2wg YWx0R3JhcGhLZXkoKSBjb25zdCB7IHJldHVybiBtX2FsdEdyYXBoS2V5OyB9CiAgICAgCiAgICAg ICAgIGNvbnN0IFBsYXRmb3JtS2V5Ym9hcmRFdmVudCoga2V5RXZlbnQoKSBjb25zdCB7IHJldHVy biBtX2tleUV2ZW50OyB9CkluZGV4OiBXZWJDb3JlL2RvbS9LZXlib2FyZEV2ZW50LmlkbAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9LZXlib2FyZEV2ZW50LmlkbAkocmV2aXNpb24gMTcwNTkp CisrKyBXZWJDb3JlL2RvbS9LZXlib2FyZEV2ZW50LmlkbAkod29ya2luZyBjb3B5KQpAQCAtMzks NyArMzksNyBAQCBtb2R1bGUgZXZlbnRzIHsKICAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIGJv b2xlYW4gICAgICAgICAgbWV0YUtleTsKICAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIGJvb2xl YW4gICAgICAgICAgYWx0R3JhcGhLZXk7CiAKLSNpZiAhZGVmaW5lZChMQU5HVUFHRV9KQVZBU0NS SVBUKSAmJiAhZGVmaW5lZChMQU5HVUFHRV9PQkpFQ1RJVkVfQykKKyNpZiAhZGVmaW5lZChMQU5H VUFHRV9KQVZBU0NSSVBUKQogICAgICAgICBib29sZWFuIGdldE1vZGlmaWVyU3RhdGUoaW4gRE9N U3RyaW5nIGtleUlkZW50aWZpZXJBcmcpOwogI2VuZGlmCiAK