43013 2010-07-26 15:53:29 -0700 Add support for scrolling using the keyboard in WebKit2 2010-07-26 17:01:18 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned oldest_to_newest 256303 0 sam 2010-07-26 15:53:29 -0700 Add support for scrolling using the keyboard in WebKit2. 256312 1 62627 sam 2010-07-26 16:00:33 -0700 Created attachment 62627 Patch 256324 2 62630 sam 2010-07-26 16:29:47 -0700 Created attachment 62630 Part 2 256340 3 sam 2010-07-26 17:01:18 -0700 Patches landed in r64086 and r64091. 62627 2010-07-26 16:00:33 -0700 2010-07-26 16:02:13 -0700 Patch scrolling.diff text/plain 16924 sam SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDA4NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMDctMjYgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYXRjaCBm b3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzMDEzCisgICAgICAg IEFkZCBzdXBwb3J0IGZvciBzY3JvbGxpbmcgdXNpbmcgdGhlIGtleWJvYXJkIGluIFdlYktpdDIK KworICAgICAgICBBZGQgYSBuZXcgZXhwb3J0IGFuZCBtYWtlIFdpbmRvd3NLZXlib2FyZENvZGVz IHByaXZhdGUuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgKiBXZWJDb3Jl Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKIDIwMTAtMDctMjYgIENocmlzIEZsZWl6YWNo ICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxl ci4KSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5leHAuaW4KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9X ZWJDb3JlLmV4cC5pbgkocmV2aXNpb24gNjQwNjYpCisrKyBXZWJDb3JlL1dlYkNvcmUuZXhwLmlu CSh3b3JraW5nIGNvcHkpCkBAIC0yMTUsNiArMjE1LDcgQEAgX19aTjdXZWJDb3JlMTJFdmVudEhh bmRsZXIxNGN1cnJlbnROU0V2ZQogX19aTjdXZWJDb3JlMTJFdmVudEhhbmRsZXIxNHNjcm9sbE92 ZXJmbG93RU5TXzE1U2Nyb2xsRGlyZWN0aW9uRU5TXzE3U2Nyb2xsR3JhbnVsYXJpdHlFUE5TXzRO b2RlRQogX19aTjdXZWJDb3JlMTJFdmVudEhhbmRsZXIxNXNlbmRTY3JvbGxFdmVudEV2CiBfX1pO N1dlYkNvcmUxMkV2ZW50SGFuZGxlcjE2aGFuZGxlV2hlZWxFdmVudEVSTlNfMThQbGF0Zm9ybVdo ZWVsRXZlbnRFCitfX1pON1dlYkNvcmUxMkV2ZW50SGFuZGxlcjE3c2Nyb2xsUmVjdXJzaXZlbHlF TlNfMTVTY3JvbGxEaXJlY3Rpb25FTlNfMTdTY3JvbGxHcmFudWxhcml0eUVQTlNfNE5vZGVFCiBf X1pON1dlYkNvcmUxMkV2ZW50SGFuZGxlcjIwaGFuZGxlVGV4dElucHV0RXZlbnRFUktOU182U3Ry aW5nRVBOU181RXZlbnRFYmIKIF9fWk43V2ViQ29yZTEyRXZlbnRIYW5kbGVyMjBoaXRUZXN0UmVz dWx0QXRQb2ludEVSS05TXzhJbnRQb2ludEViYk5TXzE3SGl0VGVzdFNjcm9sbGJhcnNFagogX19a TjdXZWJDb3JlMTJFdmVudEhhbmRsZXIyMWhhbmRsZU1vdXNlUHJlc3NFdmVudEVSS05TXzE4UGxh dGZvcm1Nb3VzZUV2ZW50RQpJbmRleDogV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oJKHJldmlzaW9uIDY0MDY2KQorKysgV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9w cm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTUwOTUsNyArNTA5NSw3IEBACiAJCUUx QzhCRTVEMEU4QkQxNUEwMDY0Q0I3RCAvKiBKU1dvcmtlci5jcHAgaW4gU291cmNlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBFMUM4QkU1QzBFOEJEMTVBMDA2NENCN0QgLyog SlNXb3JrZXIuY3BwICovOyB9OwogCQlFMUNBNUNCQzBFOENEQ0FGMDBFOEVGOTAgLyogSlNXb3Jr ZXJDdXN0b20uY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gRTFDQTVDQkIwRThDRENBRjAwRThFRjkwIC8qIEpTV29ya2VyQ3VzdG9tLmNwcCAqLzsgfTsK IAkJRTFDQUE1QzYwRThCRDIzNjAwQTczRUNBIC8qIEpTV29ya2VyLmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBFMUNBQTVDNTBFOEJEMjM2MDBBNzNFQ0Eg LyogSlNXb3JrZXIuaCAqLzsgfTsKLQkJRTFFMUJGMDAxMTVGRjZGQjAwNkY1MkNBIC8qIFdpbmRv d3NLZXlib2FyZENvZGVzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSBFMUUxQkVGRjExNUZGNkZCMDA2RjUyQ0EgLyogV2luZG93c0tleWJvYXJkQ29kZXMu aCAqLzsgfTsKKwkJRTFFMUJGMDAxMTVGRjZGQjAwNkY1MkNBIC8qIFdpbmRvd3NLZXlib2FyZENv ZGVzLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBFMUUx QkVGRjExNUZGNkZCMDA2RjUyQ0EgLyogV2luZG93c0tleWJvYXJkQ29kZXMuaCAqLzsgc2V0dGlu Z3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlFMUU2RUVBNDBCNjI4REE4 MDA1RjJGNzAgLyogSlNIVE1MU2VsZWN0RWxlbWVudC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBFMUU2RUVBMzBCNjI4REE4MDA1RjJGNzAgLyogSlNI VE1MU2VsZWN0RWxlbWVudC5jcHAgKi87IH07CiAJCUUxRTZFRUE4MEI2MjhEQjMwMDVGMkY3MCAv KiBKU0hUTUxTZWxlY3RFbGVtZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSBFMUU2RUVBNzBCNjI4REIzMDA1RjJGNzAgLyogSlNIVE1MU2VsZWN0RWxl bWVudC5oICovOyB9OwogCQlFMUVCQkJENDBBQUM5Qjg3MDAxRkU4RTIgLyogQ1NTQ2hhcnNldFJ1 bGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gRTFF QkJCRDMwQUFDOUI4NzAwMUZFOEUyIC8qIENTU0NoYXJzZXRSdWxlLmNwcCAqLzsgfTsKSW5kZXg6 IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9nCShyZXZp c2lvbiA2NDA4NCkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMTggQEAKKzIwMTAtMDctMjYgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYXRjaCBmb3IgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzMDEzCisgICAgICAgIEFkZCBz dXBwb3J0IGZvciBzY3JvbGxpbmcgdXNpbmcgdGhlIGtleWJvYXJkIGluIFdlYktpdDIKKworICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 Z2V0U2Nyb2xsTWFwcGluZyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmtleUV2ZW50KToK KyAgICAgICAgU2Nyb2xsIHRoZSBwYWdlIGluIHJlc3BvbnNlIHRvIGtleURvd24uCisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW06CisgICAgICAgIFVzZSBXaW5kb3dzS2V5Ym9hcmRDb2Rl cy5oIGluc3RlYWQgb2YgcmVkZWZpbmluZyB0aGUgY29uc3RhbnRzLgorCiAyMDEwLTA3LTI2ICBB ZGEgQ2hhbiAgPGFkYWNoYW5AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBXaW5kb3dzIGJ1aWxk LgpJbmRleDogV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9uIDY0 MDY2KQorKysgV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTU3LDYgKzU3LDcgQEAKICNpbmNsdWRlIDxXZWJDb3JlL1JlbmRlclRyZWVBc1Rl eHQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlUmVxdWVzdC5oPgogI2luY2x1ZGUgPFdl YkNvcmUvU2V0dGluZ3MuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1dpbmRvd3NLZXlib2FyZENvZGVz Lmg+CiAjaW5jbHVkZSA8cnVudGltZS9KU0xvY2suaD4KICNpbmNsdWRlIDxydW50aW1lL0pTVmFs dWUuaD4KIApAQCAtMzQzLDYgKzM0NCw1MSBAQCB2b2lkIFdlYlBhZ2U6OndoZWVsRXZlbnQoY29u c3QgV2ViV2hlZWxFCiAgICAgbV9tYWluRnJhbWUtPmNvcmVGcmFtZSgpLT5ldmVudEhhbmRsZXIo KS0+aGFuZGxlV2hlZWxFdmVudChwbGF0Zm9ybVdoZWVsRXZlbnQpOwogfQogCitzdGF0aWMgYm9v bCBnZXRTY3JvbGxNYXBwaW5nKGNvbnN0IFdlYktleWJvYXJkRXZlbnQmIGV2ZW50LCBTY3JvbGxE aXJlY3Rpb24mIGRpcmVjdGlvbiwgU2Nyb2xsR3JhbnVsYXJpdHkmIGdyYW51bGFyaXR5KQorewor ICAgIGlmIChldmVudC50eXBlKCkgIT0gV2ViRXZlbnQ6OktleURvd24gJiYgZXZlbnQudHlwZSgp ICE9IFdlYkV2ZW50OjpSYXdLZXlEb3duKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBz d2l0Y2ggKGV2ZW50LndpbmRvd3NWaXJ0dWFsS2V5Q29kZSgpKSB7CisgICAgY2FzZSBWS19MRUZU OgorICAgICAgICBncmFudWxhcml0eSA9IFNjcm9sbEJ5TGluZTsKKyAgICAgICAgZGlyZWN0aW9u ID0gU2Nyb2xsTGVmdDsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBWS19SSUdIVDoKKyAgICAg ICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxCeUxpbmU7CisgICAgICAgIGRpcmVjdGlvbiA9IFNjcm9s bFJpZ2h0OworICAgICAgICBicmVhazsKKyAgICBjYXNlIFZLX1VQOgorICAgICAgICBncmFudWxh cml0eSA9IFNjcm9sbEJ5TGluZTsKKyAgICAgICAgZGlyZWN0aW9uID0gU2Nyb2xsVXA7CisgICAg ICAgIGJyZWFrOworICAgIGNhc2UgVktfRE9XTjoKKyAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3Jv bGxCeUxpbmU7CisgICAgICAgIGRpcmVjdGlvbiA9IFNjcm9sbERvd247CisgICAgICAgIGJyZWFr OworICAgIGNhc2UgVktfSE9NRToKKyAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxCeURvY3Vt ZW50OworICAgICAgICBkaXJlY3Rpb24gPSBTY3JvbGxVcDsKKyAgICAgICAgYnJlYWs7CisgICAg Y2FzZSBWS19FTkQ6CisgICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlEb2N1bWVudDsKKyAg ICAgICAgZGlyZWN0aW9uID0gU2Nyb2xsRG93bjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBW S19QUklPUjoKKyAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxCeVBhZ2U7CisgICAgICAgIGRp cmVjdGlvbiA9IFNjcm9sbFVwOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFZLX05FWFQ6Cisg ICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlQYWdlOworICAgICAgICBkaXJlY3Rpb24gPSBT Y3JvbGxEb3duOworICAgICAgICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgfQorCisgICAgcmV0dXJuIHRydWU7Cit9CisKIHZvaWQgV2ViUGFnZTo6a2V5 RXZlbnQoY29uc3QgV2ViS2V5Ym9hcmRFdmVudCYga2V5Ym9hcmRFdmVudCkKIHsKICAgICBDdXJy ZW50RXZlbnQgY3VycmVudEV2ZW50KGtleWJvYXJkRXZlbnQpOwpAQCAtMzUzLDcgKzM5OSwxNCBA QCB2b2lkIFdlYlBhZ2U6OmtleUV2ZW50KGNvbnN0IFdlYktleWJvYXJkCiAgICAgICAgIHJldHVy bjsKIAogICAgIFBsYXRmb3JtS2V5Ym9hcmRFdmVudCBwbGF0Zm9ybUtleWJvYXJkRXZlbnQgPSBw bGF0Zm9ybShrZXlib2FyZEV2ZW50KTsKLSAgICBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5m b2N1c2VkT3JNYWluRnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCktPmtleUV2ZW50KHBsYXRmb3JtS2V5 Ym9hcmRFdmVudCk7CisKKyAgICBGcmFtZSogZnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxl cigpLT5mb2N1c2VkT3JNYWluRnJhbWUoKTsKKyAgICBmcmFtZS0+ZXZlbnRIYW5kbGVyKCktPmtl eUV2ZW50KHBsYXRmb3JtS2V5Ym9hcmRFdmVudCk7CisKKyAgICBTY3JvbGxEaXJlY3Rpb24gZGly ZWN0aW9uOworICAgIFNjcm9sbEdyYW51bGFyaXR5IGdyYW51bGFyaXR5OworICAgIGlmIChnZXRT Y3JvbGxNYXBwaW5nKGtleWJvYXJkRXZlbnQsIGRpcmVjdGlvbiwgZ3JhbnVsYXJpdHkpKQorICAg ICAgICBmcmFtZS0+ZXZlbnRIYW5kbGVyKCktPnNjcm9sbFJlY3Vyc2l2ZWx5KGRpcmVjdGlvbiwg Z3JhbnVsYXJpdHkpOwogfQogCiB2b2lkIFdlYlBhZ2U6OnNldEFjdGl2ZShib29sIGlzQWN0aXZl KQpJbmRleDogV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0J KHJldmlzaW9uIDY0MDY2KQorKysgV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBh Z2VNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRlIDxXZWJD b3JlL0tleWJvYXJkRXZlbnQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1BhZ2UuaD4KICNpbmNsdWRl IDxXZWJDb3JlL1BsYXRmb3JtS2V5Ym9hcmRFdmVudC5oPgorI2luY2x1ZGUgPFdlYkNvcmUvV2lu ZG93c0tleWJvYXJkQ29kZXMuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTQ1 LDIyICs0Niw2IEBAIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBBbHRLZXkgICAgPSAxIDw8IDEKIHN0 YXRpYyBjb25zdCB1bnNpZ25lZCBTaGlmdEtleSAgPSAxIDw8IDI7CiBzdGF0aWMgY29uc3QgdW5z aWduZWQgTWV0YUtleSAgID0gMSA8PCAzOwogCi1zdGF0aWMgY29uc3QgdW5zaWduZWQgVktFWV9C QUNLICAgICAgICAgPSAweDA4Owotc3RhdGljIGNvbnN0IHVuc2lnbmVkIFZLRVlfVEFCICAgICAg ICAgID0gMHgwOTsKLXN0YXRpYyBjb25zdCB1bnNpZ25lZCBWS0VZX1JFVFVSTiAgICAgICA9IDB4 MEQ7Ci1zdGF0aWMgY29uc3QgdW5zaWduZWQgVktFWV9FU0NBUEUgICAgICAgPSAweDFCOwotc3Rh dGljIGNvbnN0IHVuc2lnbmVkIFZLRVlfUFJJT1IgICAgICAgID0gMHgyMTsKLXN0YXRpYyBjb25z dCB1bnNpZ25lZCBWS0VZX05FWFQgICAgICAgICA9IDB4MjI7Ci1zdGF0aWMgY29uc3QgdW5zaWdu ZWQgVktFWV9FTkQgICAgICAgICAgPSAweDIzOwotc3RhdGljIGNvbnN0IHVuc2lnbmVkIFZLRVlf SE9NRSAgICAgICAgID0gMHgyNDsKLXN0YXRpYyBjb25zdCB1bnNpZ25lZCBWS0VZX0xFRlQgICAg ICAgICA9IDB4MjU7Ci1zdGF0aWMgY29uc3QgdW5zaWduZWQgVktFWV9VUCAgICAgICAgICAgPSAw eDI2Owotc3RhdGljIGNvbnN0IHVuc2lnbmVkIFZLRVlfUklHSFQgICAgICAgID0gMHgyNzsKLXN0 YXRpYyBjb25zdCB1bnNpZ25lZCBWS0VZX0RPV04gICAgICAgICA9IDB4Mjg7Ci1zdGF0aWMgY29u c3QgdW5zaWduZWQgVktFWV9JTlNFUlQgICAgICAgPSAweDJEOwotc3RhdGljIGNvbnN0IHVuc2ln bmVkIFZLRVlfREVMRVRFICAgICAgID0gMHgyRTsKLXN0YXRpYyBjb25zdCB1bnNpZ25lZCBWS0VZ X09FTV9QRVJJT0QgICA9IDB4QkU7Ci0KIC8vIEtleXMgd2l0aCBzcGVjaWFsIG1lYW5pbmcuIFRo ZXNlIHdpbGwgYmUgZGVsZWdhdGVkIHRvIHRoZSBlZGl0b3IgdXNpbmcKIC8vIHRoZSBleGVjQ29t bWFuZCgpIG1ldGhvZAogc3RydWN0IEtleURvd25FbnRyeSB7CkBAIC03Niw2MyArNjEsNjMgQEAg c3RydWN0IEtleVByZXNzRW50cnkgewogfTsKIAogc3RhdGljIGNvbnN0IEtleURvd25FbnRyeSBr ZXlEb3duRW50cmllc1tdID0gewotICAgIHsgVktFWV9MRUZULCAgIDAsICAgICAgICAgICAgICAg ICAgICJNb3ZlTGVmdCIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sCi0g ICAgeyBWS0VZX0xFRlQsICAgU2hpZnRLZXksICAgICAgICAgICAgIk1vdmVMZWZ0QW5kTW9kaWZ5 U2VsZWN0aW9uIiAgICAgICAgICAgICAgICAgICAgfSwKLSAgICB7IFZLRVlfTEVGVCwgICBBbHRL ZXksICAgICAgICAgICAgICAiTW92ZVdvcmRMZWZ0IiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB9LAotICAgIHsgVktFWV9MRUZULCAgIEFsdEtleSB8IFNoaWZ0S2V5LCAgICJNb3Zl V29yZExlZnRBbmRNb2RpZnlTZWxlY3Rpb24iICAgICAgICAgICAgICAgIH0sCi0gICAgeyBWS0VZ X1JJR0hULCAgMCwgICAgICAgICAgICAgICAgICAgIk1vdmVSaWdodCIgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgfSwKLSAgICB7IFZLRVlfUklHSFQsICBTaGlmdEtleSwgICAg ICAgICAgICAiTW92ZVJpZ2h0QW5kTW9kaWZ5U2VsZWN0aW9uIiAgICAgICAgICAgICAgICAgICB9 LAotICAgIHsgVktFWV9SSUdIVCwgIEFsdEtleSwgICAgICAgICAgICAgICJNb3ZlV29yZFJpZ2h0 IiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sCi0gICAgeyBWS0VZX1JJR0hULCAg QWx0S2V5IHwgU2hpZnRLZXksICAgIk1vdmVXb3JkUmlnaHRBbmRNb2RpZnlTZWxlY3Rpb24iICAg ICAgICAgICAgICAgfSwKLSAgICB7IFZLRVlfVVAsICAgICAwLCAgICAgICAgICAgICAgICAgICAi TW92ZVVwIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9LAotICAgIHsg VktFWV9VUCwgICAgIFNoaWZ0S2V5LCAgICAgICAgICAgICJNb3ZlVXBBbmRNb2RpZnlTZWxlY3Rp b24iICAgICAgICAgICAgICAgICAgICAgIH0sCi0gICAgeyBWS0VZX1BSSU9SLCAgU2hpZnRLZXks ICAgICAgICAgICAgIk1vdmVQYWdlVXBBbmRNb2RpZnlTZWxlY3Rpb24iICAgICAgICAgICAgICAg ICAgfSwKLSAgICB7IFZLRVlfRE9XTiwgICAwLCAgICAgICAgICAgICAgICAgICAiTW92ZURvd24i ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9LAotICAgIHsgVktFWV9ET1dO LCAgIFNoaWZ0S2V5LCAgICAgICAgICAgICJNb3ZlRG93bkFuZE1vZGlmeVNlbGVjdGlvbiIgICAg ICAgICAgICAgICAgICAgIH0sCi0gICAgeyBWS0VZX05FWFQsICAgU2hpZnRLZXksICAgICAgICAg ICAgIk1vdmVQYWdlRG93bkFuZE1vZGlmeVNlbGVjdGlvbiIgICAgICAgICAgICAgICAgfSwKLSAg ICB7IFZLRVlfUFJJT1IsICAwLCAgICAgICAgICAgICAgICAgICAiTW92ZVBhZ2VVcCIgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9LAotICAgIHsgVktFWV9ORVhULCAgIDAsICAg ICAgICAgICAgICAgICAgICJNb3ZlUGFnZURvd24iICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIH0sCi0KLSAgICB7IFZLRVlfSE9NRSwgICAwLCAgICAgICAgICAgICAgICAgICAiTW92 ZVRvQmVnaW5uaW5nT2ZMaW5lIiAgICAgICAgICAgICAgICAgICAgICAgICB9LAotICAgIHsgVktF WV9IT01FLCAgIFNoaWZ0S2V5LCAgICAgICAgICAgICJNb3ZlVG9CZWdpbm5pbmdPZkxpbmVBbmRN b2RpZnlTZWxlY3Rpb24iICAgICAgIH0sCi0gICAgeyBWS0VZX0xFRlQsICAgTWV0YUtleSwgICAg ICAgICAgICAgIk1vdmVUb0JlZ2lubmluZ09mTGluZSIgICAgICAgICAgICAgICAgICAgICAgICAg fSwKLSAgICB7IFZLRVlfTEVGVCwgICBNZXRhS2V5IHwgU2hpZnRLZXksICAiTW92ZVRvQmVnaW5u aW5nT2ZMaW5lQW5kTW9kaWZ5U2VsZWN0aW9uIiAgICAgICB9LAotICAgIHsgVktFWV9VUCwgICAg IE1ldGFLZXksICAgICAgICAgICAgICJNb3ZlVG9CZWdpbm5pbmdPZkRvY3VtZW50IiAgICAgICAg ICAgICAgICAgICAgIH0sCi0gICAgeyBWS0VZX1VQLCAgICAgTWV0YUtleSB8IFNoaWZ0S2V5LCAg Ik1vdmVUb0JlZ2lubmluZ09mRG9jdW1lbnRBbmRNb2RpZnlTZWxlY3Rpb24iICAgfSwKLQotICAg IHsgVktFWV9FTkQsICAgIDAsICAgICAgICAgICAgICAgICAgICJNb3ZlVG9FbmRPZkxpbmUiICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sCi0gICAgeyBWS0VZX0VORCwgICAgU2hpZnRL ZXksICAgICAgICAgICAgIk1vdmVUb0VuZE9mTGluZUFuZE1vZGlmeVNlbGVjdGlvbiIgICAgICAg ICAgICAgfSwKLSAgICB7IFZLRVlfRE9XTiwgICBNZXRhS2V5LCAgICAgICAgICAgICAiTW92ZVRv RW5kT2ZEb2N1bWVudCIgICAgICAgICAgICAgICAgICAgICAgICAgICB9LAotICAgIHsgVktFWV9E T1dOLCAgIE1ldGFLZXkgfCBTaGlmdEtleSwgICJNb3ZlVG9FbmRPZkRvY3VtZW50QW5kTW9kaWZ5 U2VsZWN0aW9uIiAgICAgICAgIH0sCi0gICAgeyBWS0VZX1JJR0hULCAgTWV0YUtleSwgICAgICAg ICAgICAgIk1vdmVUb0VuZE9mTGluZSIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSwK LSAgICB7IFZLRVlfUklHSFQsICBNZXRhS2V5IHwgU2hpZnRLZXksICAiTW92ZVRvRW5kT2ZMaW5l QW5kTW9kaWZ5U2VsZWN0aW9uIiAgICAgICAgICAgICB9LAotCi0gICAgeyBWS0VZX0JBQ0ssICAg MCwgICAgICAgICAgICAgICAgICAgIkRlbGV0ZUJhY2t3YXJkIiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgfSwKLSAgICB7IFZLRVlfQkFDSywgICBTaGlmdEtleSwgICAgICAgICAgICAi RGVsZXRlQmFja3dhcmQiICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9LAotICAgIHsg VktFWV9ERUxFVEUsIDAsICAgICAgICAgICAgICAgICAgICJEZWxldGVGb3J3YXJkIiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIH0sCi0gICAgeyBWS0VZX0JBQ0ssICAgQWx0S2V5LCAg ICAgICAgICAgICAgIkRlbGV0ZVdvcmRCYWNrd2FyZCIgICAgICAgICAgICAgICAgICAgICAgICAg ICAgfSwKLSAgICB7IFZLRVlfREVMRVRFLCBBbHRLZXksICAgICAgICAgICAgICAiRGVsZXRlV29y ZEZvcndhcmQiICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9LAorICAgIHsgVktfTEVGVCwg ICAgIDAsICAgICAgICAgICAgICAgICAgICJNb3ZlTGVmdCIgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIH0sCisgICAgeyBWS19MRUZULCAgICAgU2hpZnRLZXksICAgICAgICAg ICAgIk1vdmVMZWZ0QW5kTW9kaWZ5U2VsZWN0aW9uIiAgICAgICAgICAgICAgICAgICAgfSwKKyAg ICB7IFZLX0xFRlQsICAgICBBbHRLZXksICAgICAgICAgICAgICAiTW92ZVdvcmRMZWZ0IiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9LAorICAgIHsgVktfTEVGVCwgICAgIEFsdEtl eSB8IFNoaWZ0S2V5LCAgICJNb3ZlV29yZExlZnRBbmRNb2RpZnlTZWxlY3Rpb24iICAgICAgICAg ICAgICAgIH0sCisgICAgeyBWS19SSUdIVCwgICAgMCwgICAgICAgICAgICAgICAgICAgIk1vdmVS aWdodCIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSwKKyAgICB7IFZLX1JJ R0hULCAgICBTaGlmdEtleSwgICAgICAgICAgICAiTW92ZVJpZ2h0QW5kTW9kaWZ5U2VsZWN0aW9u IiAgICAgICAgICAgICAgICAgICB9LAorICAgIHsgVktfUklHSFQsICAgIEFsdEtleSwgICAgICAg ICAgICAgICJNb3ZlV29yZFJpZ2h0IiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0s CisgICAgeyBWS19SSUdIVCwgICAgQWx0S2V5IHwgU2hpZnRLZXksICAgIk1vdmVXb3JkUmlnaHRB bmRNb2RpZnlTZWxlY3Rpb24iICAgICAgICAgICAgICAgfSwKKyAgICB7IFZLX1VQLCAgICAgICAw LCAgICAgICAgICAgICAgICAgICAiTW92ZVVwIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB9LAorICAgIHsgVktfVVAsICAgICAgIFNoaWZ0S2V5LCAgICAgICAgICAgICJN b3ZlVXBBbmRNb2RpZnlTZWxlY3Rpb24iICAgICAgICAgICAgICAgICAgICAgIH0sCisgICAgeyBW S19QUklPUiwgICAgU2hpZnRLZXksICAgICAgICAgICAgIk1vdmVQYWdlVXBBbmRNb2RpZnlTZWxl Y3Rpb24iICAgICAgICAgICAgICAgICAgfSwKKyAgICB7IFZLX0RPV04sICAgICAwLCAgICAgICAg ICAgICAgICAgICAiTW92ZURvd24iICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB9LAorICAgIHsgVktfRE9XTiwgICAgIFNoaWZ0S2V5LCAgICAgICAgICAgICJNb3ZlRG93bkFu ZE1vZGlmeVNlbGVjdGlvbiIgICAgICAgICAgICAgICAgICAgIH0sCisgICAgeyBWS19ORVhULCAg ICAgU2hpZnRLZXksICAgICAgICAgICAgIk1vdmVQYWdlRG93bkFuZE1vZGlmeVNlbGVjdGlvbiIg ICAgICAgICAgICAgICAgfSwKKyAgICB7IFZLX1BSSU9SLCAgICAwLCAgICAgICAgICAgICAgICAg ICAiTW92ZVBhZ2VVcCIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9LAorICAg IHsgVktfTkVYVCwgICAgIDAsICAgICAgICAgICAgICAgICAgICJNb3ZlUGFnZURvd24iICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sCisKKyAgICB7IFZLX0hPTUUsICAgICAwLCAg ICAgICAgICAgICAgICAgICAiTW92ZVRvQmVnaW5uaW5nT2ZMaW5lIiAgICAgICAgICAgICAgICAg ICAgICAgICB9LAorICAgIHsgVktfSE9NRSwgICAgIFNoaWZ0S2V5LCAgICAgICAgICAgICJNb3Zl VG9CZWdpbm5pbmdPZkxpbmVBbmRNb2RpZnlTZWxlY3Rpb24iICAgICAgIH0sCisgICAgeyBWS19M RUZULCAgICAgTWV0YUtleSwgICAgICAgICAgICAgIk1vdmVUb0JlZ2lubmluZ09mTGluZSIgICAg ICAgICAgICAgICAgICAgICAgICAgfSwKKyAgICB7IFZLX0xFRlQsICAgICBNZXRhS2V5IHwgU2hp ZnRLZXksICAiTW92ZVRvQmVnaW5uaW5nT2ZMaW5lQW5kTW9kaWZ5U2VsZWN0aW9uIiAgICAgICB9 LAorICAgIHsgVktfVVAsICAgICAgIE1ldGFLZXksICAgICAgICAgICAgICJNb3ZlVG9CZWdpbm5p bmdPZkRvY3VtZW50IiAgICAgICAgICAgICAgICAgICAgIH0sCisgICAgeyBWS19VUCwgICAgICAg TWV0YUtleSB8IFNoaWZ0S2V5LCAgIk1vdmVUb0JlZ2lubmluZ09mRG9jdW1lbnRBbmRNb2RpZnlT ZWxlY3Rpb24iICAgfSwKKworICAgIHsgVktfRU5ELCAgICAgIDAsICAgICAgICAgICAgICAgICAg ICJNb3ZlVG9FbmRPZkxpbmUiICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sCisgICAg eyBWS19FTkQsICAgICAgU2hpZnRLZXksICAgICAgICAgICAgIk1vdmVUb0VuZE9mTGluZUFuZE1v ZGlmeVNlbGVjdGlvbiIgICAgICAgICAgICAgfSwKKyAgICB7IFZLX0RPV04sICAgICBNZXRhS2V5 LCAgICAgICAgICAgICAiTW92ZVRvRW5kT2ZEb2N1bWVudCIgICAgICAgICAgICAgICAgICAgICAg ICAgICB9LAorICAgIHsgVktfRE9XTiwgICAgIE1ldGFLZXkgfCBTaGlmdEtleSwgICJNb3ZlVG9F bmRPZkRvY3VtZW50QW5kTW9kaWZ5U2VsZWN0aW9uIiAgICAgICAgIH0sCisgICAgeyBWS19SSUdI VCwgICAgTWV0YUtleSwgICAgICAgICAgICAgIk1vdmVUb0VuZE9mTGluZSIgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfSwKKyAgICB7IFZLX1JJR0hULCAgICBNZXRhS2V5IHwgU2hpZnRL ZXksICAiTW92ZVRvRW5kT2ZMaW5lQW5kTW9kaWZ5U2VsZWN0aW9uIiAgICAgICAgICAgICB9LAor CisgICAgeyBWS19CQUNLLCAgICAgMCwgICAgICAgICAgICAgICAgICAgIkRlbGV0ZUJhY2t3YXJk IiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSwKKyAgICB7IFZLX0JBQ0ssICAgICBT aGlmdEtleSwgICAgICAgICAgICAiRGVsZXRlQmFja3dhcmQiICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB9LAorICAgIHsgVktfREVMRVRFLCAgIDAsICAgICAgICAgICAgICAgICAgICJE ZWxldGVGb3J3YXJkIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sCisgICAgeyBW S19CQUNLLCAgICAgQWx0S2V5LCAgICAgICAgICAgICAgIkRlbGV0ZVdvcmRCYWNrd2FyZCIgICAg ICAgICAgICAgICAgICAgICAgICAgICAgfSwKKyAgICB7IFZLX0RFTEVURSwgICBBbHRLZXksICAg ICAgICAgICAgICAiRGVsZXRlV29yZEZvcndhcmQiICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB9LAogCiAgICAgeyAnQicsICAgICAgICAgQ3RybEtleSwgICAgICAgICAgICAgIlRvZ2dsZUJv bGQiICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSwKICAgICB7ICdJJywgICAg ICAgICBDdHJsS2V5LCAgICAgICAgICAgICAiVG9nZ2xlSXRhbGljIiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB9LAogCi0gICAgeyBWS0VZX0VTQ0FQRSwgMCwgICAgICAgICAgICAg ICAgICAgIkNhbmNlbCIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSwK LSAgICB7IFZLRVlfT0VNX1BFUklPRCwgQ3RybEtleSwgICAgICAgICAiQ2FuY2VsIiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9LAotICAgIHsgVktFWV9UQUIsICAgIDAs ICAgICAgICAgICAgICAgICAgICJJbnNlcnRUYWIiICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIH0sCi0gICAgeyBWS0VZX1RBQiwgICAgU2hpZnRLZXksICAgICAgICAgICAgIklu c2VydEJhY2t0YWIiICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSwKLSAgICB7IFZL RVlfUkVUVVJOLCAwLCAgICAgICAgICAgICAgICAgICAiSW5zZXJ0TmV3bGluZSIgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB9LAotICAgIHsgVktFWV9SRVRVUk4sIEN0cmxLZXksICAg ICAgICAgICAgICJJbnNlcnROZXdsaW5lIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IH0sCi0gICAgeyBWS0VZX1JFVFVSTiwgQWx0S2V5LCAgICAgICAgICAgICAgIkluc2VydE5ld2xp bmUiICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSwKLSAgICB7IFZLRVlfUkVUVVJO LCBBbHRLZXkgfCBTaGlmdEtleSwgICAiSW5zZXJ0TmV3bGluZSIgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB9LAotICAgIHsgVktFWV9SRVRVUk4sIFNoaWZ0S2V5LCAgICAgICAgICAg ICJJbnNlcnRMaW5lQnJlYWsiICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sCisgICAg eyBWS19FU0NBUEUsICAgMCwgICAgICAgICAgICAgICAgICAgIkNhbmNlbCIgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgfSwKKyAgICB7IFZLX09FTV9QRVJJT0QsIEN0cmxL ZXksICAgICAgICAgIkNhbmNlbCIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB9LAorICAgIHsgVktfVEFCLCAgICAgIDAsICAgICAgICAgICAgICAgICAgICJJbnNlcnRU YWIiICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sCisgICAgeyBWS19UQUIs ICAgICAgU2hpZnRLZXksICAgICAgICAgICAgIkluc2VydEJhY2t0YWIiICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfSwKKyAgICB7IFZLX1JFVFVSTiwgICAwLCAgICAgICAgICAgICAg ICAgICAiSW5zZXJ0TmV3bGluZSIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9LAor ICAgIHsgVktfUkVUVVJOLCAgIEN0cmxLZXksICAgICAgICAgICAgICJJbnNlcnROZXdsaW5lIiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sCisgICAgeyBWS19SRVRVUk4sICAgQWx0 S2V5LCAgICAgICAgICAgICAgIkluc2VydE5ld2xpbmUiICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgfSwKKyAgICB7IFZLX1JFVFVSTiwgICBBbHRLZXkgfCBTaGlmdEtleSwgICAiSW5z ZXJ0TmV3bGluZSIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9LAorICAgIHsgVktf UkVUVVJOLCAgIFNoaWZ0S2V5LCAgICAgICAgICAgICJJbnNlcnRMaW5lQnJlYWsiICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIH0sCiAKICAgICB7ICdDJywgICAgICAgICBNZXRhS2V5LCAg ICAgICAgICAgICAiQ29weSIgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB9LAogICAgIHsgJ1YnLCAgICAgICAgIE1ldGFLZXksICAgICAgICAgICAgICJQYXN0ZSIgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sCiAgICAgeyAnWCcsICAgICAg ICAgTWV0YUtleSwgICAgICAgICAgICAgIkN1dCIgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgfSwKICAgICB7ICdBJywgICAgICAgICBNZXRhS2V5LCAgICAgICAgICAg ICAiU2VsZWN0QWxsIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9LAotICAg IHsgVktFWV9JTlNFUlQsIEN0cmxLZXksICAgICAgICAgICAgICJDb3B5IiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0sCi0gICAgeyBWS0VZX0lOU0VSVCwgU2hpZnRL ZXksICAgICAgICAgICAgIlBhc3RlIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgfSwKLSAgICB7IFZLRVlfREVMRVRFLCBTaGlmdEtleSwgICAgICAgICAgICAiQ3V0IiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9LAorICAgIHsgVktfSU5T RVJULCAgIEN0cmxLZXksICAgICAgICAgICAgICJDb3B5IiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIH0sCisgICAgeyBWS19JTlNFUlQsICAgU2hpZnRLZXksICAgICAg ICAgICAgIlBhc3RlIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSwK KyAgICB7IFZLX0RFTEVURSwgICBTaGlmdEtleSwgICAgICAgICAgICAiQ3V0IiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB9LAogICAgIHsgJ1onLCAgICAgICAgIE1l dGFLZXksICAgICAgICAgICAgICJVbmRvIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIH0sCiAgICAgeyAnWicsICAgICAgICAgTWV0YUtleSB8IFNoaWZ0S2V5LCAgIlJl ZG8iICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfSwKIH07Cg== 62630 2010-07-26 16:29:47 -0700 2010-07-26 16:58:21 -0700 Part 2 part2.diff text/plain 5733 sam SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDA4NykKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTAtMDctMjYgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYXJ0IDIg b2YgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQzMDEzCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS84MTUyNDM0PgorICAgICAgICBBZGQgc3VwcG9ydCBmb3Igc2Nyb2xs aW5nIHVzaW5nIHRoZSBrZXlib2FyZCBpbiBXZWJLaXQyCisKKyAgICAgICAgQWRkIHN1cHBvcnQg Zm9yIHNjcm9sbGluZyB3aXRoIHRoZSBzcGFjZSBiYXIgYW5kIGVuc3VyZSB0aGF0IHdlIGRvbid0 IHNjcm9sbAorICAgICAgICBpZiBXZWJDb3JlIGlzIGhhbmRsaW5nIHRoZSBldmVudCBpbiBhbm90 aGVyIHdheS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZTo6a2V5RXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpnZXRT Y3JvbGxNYXBwaW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cGVyZm9ybURlZmF1bHRC ZWhhdmlvckZvcktleUV2ZW50KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oOgorCiAyMDEwLTA3LTI2ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQW5kZXJzIENhcmxzc29uLgpJbmRleDogV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAJKHJldmlzaW9uIDY0MDg2KQorKysgV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0NCw1MCArMzQ0LDYgQEAg dm9pZCBXZWJQYWdlOjp3aGVlbEV2ZW50KGNvbnN0IFdlYldoZWVsRQogICAgIG1fbWFpbkZyYW1l LT5jb3JlRnJhbWUoKS0+ZXZlbnRIYW5kbGVyKCktPmhhbmRsZVdoZWVsRXZlbnQocGxhdGZvcm1X aGVlbEV2ZW50KTsKIH0KIAotc3RhdGljIGJvb2wgZ2V0U2Nyb2xsTWFwcGluZyhjb25zdCBXZWJL ZXlib2FyZEV2ZW50JiBldmVudCwgU2Nyb2xsRGlyZWN0aW9uJiBkaXJlY3Rpb24sIFNjcm9sbEdy YW51bGFyaXR5JiBncmFudWxhcml0eSkKLXsKLSAgICBpZiAoZXZlbnQudHlwZSgpICE9IFdlYkV2 ZW50OjpLZXlEb3duICYmIGV2ZW50LnR5cGUoKSAhPSBXZWJFdmVudDo6UmF3S2V5RG93bikKLSAg ICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgc3dpdGNoIChldmVudC53aW5kb3dzVmlydHVhbEtl eUNvZGUoKSkgewotICAgIGNhc2UgVktfTEVGVDoKLSAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3Jv bGxCeUxpbmU7Ci0gICAgICAgIGRpcmVjdGlvbiA9IFNjcm9sbExlZnQ7Ci0gICAgICAgIGJyZWFr OwotICAgIGNhc2UgVktfUklHSFQ6Ci0gICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlMaW5l OwotICAgICAgICBkaXJlY3Rpb24gPSBTY3JvbGxSaWdodDsKLSAgICAgICAgYnJlYWs7Ci0gICAg Y2FzZSBWS19VUDoKLSAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxCeUxpbmU7Ci0gICAgICAg IGRpcmVjdGlvbiA9IFNjcm9sbFVwOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIFZLX0RPV046 Ci0gICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlMaW5lOwotICAgICAgICBkaXJlY3Rpb24g PSBTY3JvbGxEb3duOwotICAgICAgICBicmVhazsKLSAgICBjYXNlIFZLX0hPTUU6Ci0gICAgICAg IGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlEb2N1bWVudDsKLSAgICAgICAgZGlyZWN0aW9uID0gU2Ny b2xsVXA7Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgVktfRU5EOgotICAgICAgICBncmFudWxh cml0eSA9IFNjcm9sbEJ5RG9jdW1lbnQ7Ci0gICAgICAgIGRpcmVjdGlvbiA9IFNjcm9sbERvd247 Ci0gICAgICAgIGJyZWFrOwotICAgIGNhc2UgVktfUFJJT1I6Ci0gICAgICAgIGdyYW51bGFyaXR5 ID0gU2Nyb2xsQnlQYWdlOwotICAgICAgICBkaXJlY3Rpb24gPSBTY3JvbGxVcDsKLSAgICAgICAg YnJlYWs7Ci0gICAgY2FzZSBWS19ORVhUOgotICAgICAgICBncmFudWxhcml0eSA9IFNjcm9sbEJ5 UGFnZTsKLSAgICAgICAgZGlyZWN0aW9uID0gU2Nyb2xsRG93bjsKLSAgICAgICAgYnJlYWs7Ci0g ICAgZGVmYXVsdDoKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KLQotICAgIHJldHVybiB0 cnVlOwotfQogCiB2b2lkIFdlYlBhZ2U6OmtleUV2ZW50KGNvbnN0IFdlYktleWJvYXJkRXZlbnQm IGtleWJvYXJkRXZlbnQpCiB7CkBAIC0zOTksMTQgKzM1NSwxMCBAQCB2b2lkIFdlYlBhZ2U6Omtl eUV2ZW50KGNvbnN0IFdlYktleWJvYXJkCiAgICAgICAgIHJldHVybjsKIAogICAgIFBsYXRmb3Jt S2V5Ym9hcmRFdmVudCBwbGF0Zm9ybUtleWJvYXJkRXZlbnQgPSBwbGF0Zm9ybShrZXlib2FyZEV2 ZW50KTsKKyAgICBpZiAobV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZy YW1lKCktPmV2ZW50SGFuZGxlcigpLT5rZXlFdmVudChwbGF0Zm9ybUtleWJvYXJkRXZlbnQpKQor ICAgICAgICByZXR1cm47CiAKLSAgICBGcmFtZSogZnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJv bGxlcigpLT5mb2N1c2VkT3JNYWluRnJhbWUoKTsKLSAgICBmcmFtZS0+ZXZlbnRIYW5kbGVyKCkt PmtleUV2ZW50KHBsYXRmb3JtS2V5Ym9hcmRFdmVudCk7Ci0KLSAgICBTY3JvbGxEaXJlY3Rpb24g ZGlyZWN0aW9uOwotICAgIFNjcm9sbEdyYW51bGFyaXR5IGdyYW51bGFyaXR5OwotICAgIGlmIChn ZXRTY3JvbGxNYXBwaW5nKGtleWJvYXJkRXZlbnQsIGRpcmVjdGlvbiwgZ3JhbnVsYXJpdHkpKQot ICAgICAgICBmcmFtZS0+ZXZlbnRIYW5kbGVyKCktPnNjcm9sbFJlY3Vyc2l2ZWx5KGRpcmVjdGlv biwgZ3JhbnVsYXJpdHkpOworICAgIHBlcmZvcm1EZWZhdWx0QmVoYXZpb3JGb3JLZXlFdmVudChr ZXlib2FyZEV2ZW50KTsKIH0KIAogdm9pZCBXZWJQYWdlOjpzZXRBY3RpdmUoYm9vbCBpc0FjdGl2 ZSkKQEAgLTQ5OCw2ICs0NTAsNjMgQEAgYm9vbCBXZWJQYWdlOjpoYW5kbGVFZGl0aW5nS2V5Ym9h cmRFdmVudAogICAgIHJldHVybiBmcmFtZS0+ZWRpdG9yKCktPmluc2VydFRleHQoZXZ0LT5rZXlF dmVudCgpLT50ZXh0KCksIGV2dCk7CiB9CiAKK3N0YXRpYyBib29sIGdldFNjcm9sbE1hcHBpbmco Y29uc3QgV2ViS2V5Ym9hcmRFdmVudCYgZXZlbnQsIFNjcm9sbERpcmVjdGlvbiYgZGlyZWN0aW9u LCBTY3JvbGxHcmFudWxhcml0eSYgZ3JhbnVsYXJpdHkpCit7CisgICAgaWYgKGV2ZW50LnR5cGUo KSAhPSBXZWJFdmVudDo6S2V5RG93biAmJiBldmVudC50eXBlKCkgIT0gV2ViRXZlbnQ6OlJhd0tl eURvd24pCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHN3aXRjaCAoZXZlbnQud2luZG93 c1ZpcnR1YWxLZXlDb2RlKCkpIHsKKyAgICBjYXNlIFZLX1NQQUNFOgorICAgICAgICBncmFudWxh cml0eSA9IFNjcm9sbEJ5UGFnZTsKKyAgICAgICAgZGlyZWN0aW9uID0gZXZlbnQuc2hpZnRLZXko KSA/IFNjcm9sbFVwIDogU2Nyb2xsRG93bjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBWS19M RUZUOgorICAgICAgICBncmFudWxhcml0eSA9IFNjcm9sbEJ5TGluZTsKKyAgICAgICAgZGlyZWN0 aW9uID0gU2Nyb2xsTGVmdDsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBWS19SSUdIVDoKKyAg ICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxCeUxpbmU7CisgICAgICAgIGRpcmVjdGlvbiA9IFNj cm9sbFJpZ2h0OworICAgICAgICBicmVhazsKKyAgICBjYXNlIFZLX1VQOgorICAgICAgICBncmFu dWxhcml0eSA9IFNjcm9sbEJ5TGluZTsKKyAgICAgICAgZGlyZWN0aW9uID0gU2Nyb2xsVXA7Cisg ICAgICAgIGJyZWFrOworICAgIGNhc2UgVktfRE9XTjoKKyAgICAgICAgZ3JhbnVsYXJpdHkgPSBT Y3JvbGxCeUxpbmU7CisgICAgICAgIGRpcmVjdGlvbiA9IFNjcm9sbERvd247CisgICAgICAgIGJy ZWFrOworICAgIGNhc2UgVktfSE9NRToKKyAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxCeURv Y3VtZW50OworICAgICAgICBkaXJlY3Rpb24gPSBTY3JvbGxVcDsKKyAgICAgICAgYnJlYWs7Cisg ICAgY2FzZSBWS19FTkQ6CisgICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlEb2N1bWVudDsK KyAgICAgICAgZGlyZWN0aW9uID0gU2Nyb2xsRG93bjsKKyAgICAgICAgYnJlYWs7CisgICAgY2Fz ZSBWS19QUklPUjoKKyAgICAgICAgZ3JhbnVsYXJpdHkgPSBTY3JvbGxCeVBhZ2U7CisgICAgICAg IGRpcmVjdGlvbiA9IFNjcm9sbFVwOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFZLX05FWFQ6 CisgICAgICAgIGdyYW51bGFyaXR5ID0gU2Nyb2xsQnlQYWdlOworICAgICAgICBkaXJlY3Rpb24g PSBTY3JvbGxEb3duOworICAgICAgICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICByZXR1 cm4gZmFsc2U7CisgICAgfQorCisgICAgcmV0dXJuIHRydWU7Cit9CisKK3ZvaWQgV2ViUGFnZTo6 cGVyZm9ybURlZmF1bHRCZWhhdmlvckZvcktleUV2ZW50KGNvbnN0IFdlYktleWJvYXJkRXZlbnQm IGtleWJvYXJkRXZlbnQpCit7CisgICAgU2Nyb2xsRGlyZWN0aW9uIGRpcmVjdGlvbjsKKyAgICBT Y3JvbGxHcmFudWxhcml0eSBncmFudWxhcml0eTsKKyAgICBpZiAoZ2V0U2Nyb2xsTWFwcGluZyhr ZXlib2FyZEV2ZW50LCBkaXJlY3Rpb24sIGdyYW51bGFyaXR5KSkKKyAgICAgICAgbV9wYWdlLT5m b2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZyYW1lKCktPmV2ZW50SGFuZGxlcigpLT5z Y3JvbGxSZWN1cnNpdmVseShkaXJlY3Rpb24sIGdyYW51bGFyaXR5KTsKK30KKwogdm9pZCBXZWJQ YWdlOjpkaWRSZWNlaXZlTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBD b3JlSVBDOjpNZXNzYWdlSUQgbWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXImIGFy Z3VtZW50cykKIHsKICAgICBpZiAobWVzc2FnZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFzc0Ry YXdpbmdBcmVhPigpKSB7CkluZGV4OiBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShy ZXZpc2lvbiA2NDA2NikKKysrIFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAko d29ya2luZyBjb3B5KQpAQCAtMTE3LDYgKzExNyw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIHBs YXRmb3JtSW5pdGlhbGl6ZSgpOwogICAgIHN0YXRpYyBjb25zdCBjaGFyKiBpbnRlcnByZXRLZXlF dmVudChjb25zdCBXZWJDb3JlOjpLZXlib2FyZEV2ZW50Kik7CisgICAgdm9pZCBwZXJmb3JtRGVm YXVsdEJlaGF2aW9yRm9yS2V5RXZlbnQoY29uc3QgV2ViS2V5Ym9hcmRFdmVudCYpOwogCiAgICAg Ly8gQWN0aW9ucwogICAgIHZvaWQgdHJ5Q2xvc2UoKTsK