92183 2012-07-24 17:31:34 -0700 [BlackBerry] Integrate certmgr with CredentialBackingStore 2012-07-25 19:17:20 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jonathan.dong.webkit jonathan.dong.webkit charles.wei joenotcharles mifenton rwlbuis staikos tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 677408 0 jonathan.dong.webkit 2012-07-24 17:31:34 -0700 RIM PR: 171991 We should use certmgr to save/retrieve password instead of saving it in sqlite database when certmgr is ready. 677427 1 154198 jonathan.dong.webkit 2012-07-24 17:44:08 -0700 Created attachment 154198 Patch 678761 2 154198 webkit.review.bot 2012-07-25 19:17:16 -0700 Comment on attachment 154198 Patch Clearing flags on attachment: 154198 Committed r123694: <http://trac.webkit.org/changeset/123694> 678762 3 webkit.review.bot 2012-07-25 19:17:20 -0700 All reviewed patches have been landed. Closing bug. 154198 2012-07-24 17:44:08 -0700 2012-07-25 19:17:16 -0700 Patch bug-92183-20120725084357.patch text/plain 10565 jonathan.dong.webkit U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTE0OTA4OWRjMDk1YmVk ZjlkZjY5YmRjMjNmZWU5NmZmMmFkNGM3Ny4uZGMzYmM4NjQxNzJhNzY4Njc2NWZkMzgxYzQ3Mzgw ZDRmMjlhYWQ4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTA3LTI0ICBKb25h dGhhbiBEb25nICA8am9uYXRoYW4uZG9uZ0B0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAg W0JsYWNrQmVycnldIEludGVncmF0ZSBjZXJ0bWdyIHdpdGggQ3JlZGVudGlhbEJhY2tpbmdTdG9y ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTIxODMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnRlZ3Jh dGVkIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpDZXJ0TWdyV3JhcHBlciB3aXRoCisgICAgICAgIENy ZWRlbnRpYWxCYWNraW5nU3RvcmUsIHdoZW4gY2VydG1nciBpcyByZWFkeSB3ZSBzYXZlCisgICAg ICAgIHRoZSBwYXNzd29yZCBpbiBjZXJ0bWdyIGFuZCByZXRyaWV2ZSBpdCBmcm9tIGNlcnRtZ3Iu CisKKyAgICAgICAgUklNIFBSOiAxNzE5OTEKKyAgICAgICAgSW50ZXJuYWxseSByZXZpZXdlZCBi eSBKb2UgTWFzb24gPGptYXNvbkByaW0uY29tPi4KKworICAgICAgICBObyBuZXcgdGVzdHMgc2lu Y2UgdGhlcmUncyBubyBmdW5jdGlvbmFsIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvYmxhY2tiZXJyeS9DcmVkZW50aWFsQmFja2luZ1N0b3JlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Omhhc2hDcmVkZW50aWFsSW5mbyk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAg KFdlYkNvcmU6OkNyZWRlbnRpYWxCYWNraW5nU3RvcmU6OkNyZWRlbnRpYWxCYWNraW5nU3RvcmUp OgorICAgICAgICAoV2ViQ29yZTo6Q3JlZGVudGlhbEJhY2tpbmdTdG9yZTo6b3Blbik6CisgICAg ICAgIChXZWJDb3JlOjpDcmVkZW50aWFsQmFja2luZ1N0b3JlOjphZGRMb2dpbik6CisgICAgICAg IChXZWJDb3JlOjpDcmVkZW50aWFsQmFja2luZ1N0b3JlOjp1cGRhdGVMb2dpbik6CisgICAgICAg IChXZWJDb3JlOjpDcmVkZW50aWFsQmFja2luZ1N0b3JlOjpnZXRMb2dpbik6CisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L0NyZWRlbnRpYWxCYWNraW5nU3RvcmUuaDoKKyAg ICAgICAgKENyZWRlbnRpYWxCYWNraW5nU3RvcmUpOgorCiAyMDEyLTA3LTI0ICBEYXZlIFR1ICA8 ZHR1QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIEFkZCB0aW1lIHNwZW50IHBh aW50aW5nIHRvIEdQVSBiZW5jaG1hcmtpbmcgcmVuZGVyaW5nU3RhdHMoKSBBUEkuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvQ3JlZGVudGlh bEJhY2tpbmdTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNr YmVycnkvQ3JlZGVudGlhbEJhY2tpbmdTdG9yZS5jcHAKaW5kZXggNDJhZDkxZmNkYzdmMjcxOTIz MGU0Nzg5ZWZhMTU1NTNkZjc1ZWIwMS4uY2UyMDNlYWU3NDdmYWYyOTUzNzFhNjNmYTgzODYxZTE0 YzIyNzc4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFj a2JlcnJ5L0NyZWRlbnRpYWxCYWNraW5nU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9DcmVkZW50aWFsQmFja2luZ1N0b3JlLmNwcApAQCAt MjksNiArMjksNyBAQAogI2luY2x1ZGUgIlNRTGl0ZVN0YXRlbWVudC5oIgogI2luY2x1ZGUgPEJs YWNrQmVycnlQbGF0Zm9ybUNsaWVudC5oPgogI2luY2x1ZGUgPEJsYWNrQmVycnlQbGF0Zm9ybUVu Y3J5cHRvci5oPgorI2luY2x1ZGUgPENlcnRNZ3JXcmFwcGVyLmg+CiAKICNkZWZpbmUgSEFORExF X1NRTF9FWEVDX0ZBSUxVUkUoc3RhdGVtZW50LCByZXR1cm5WYWx1ZSwgLi4uKSBcCiAgICAgaWYg KHN0YXRlbWVudCkgeyBcCkBAIC0zOCw2ICszOSwxNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKK3N0YXRpYyB1bnNpZ25lZCBoYXNoQ3JlZGVudGlhbEluZm8oY29uc3QgU3RyaW5nJiB1cmws IGNvbnN0IFByb3RlY3Rpb25TcGFjZSYgc3BhY2UsIGNvbnN0IFN0cmluZyYgdXNlcm5hbWUpCit7 CisgICAgU3RyaW5nIGhhc2hTdHJpbmcgPSBTdHJpbmc6OmZvcm1hdCgiJXNAJXNAJXNAJWRAJWRA JXNAJWQiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdXNlcm5hbWUu dXRmOCgpLmRhdGEoKSwgdXJsLnV0ZjgoKS5kYXRhKCksCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzcGFjZS5ob3N0KCkudXRmOCgpLmRhdGEoKSwgc3BhY2UucG9ydCgp LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGljX2Nhc3Q8aW50 PihzcGFjZS5zZXJ2ZXJUeXBlKCkpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc3BhY2UucmVhbG0oKS51dGY4KCkuZGF0YSgpLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc3RhdGljX2Nhc3Q8aW50PihzcGFjZS5hdXRoZW50aWNhdGlvblNj aGVtZSgpKSk7CisgICAgcmV0dXJuIFN0cmluZ0hhc2hlcjo6Y29tcHV0ZUhhc2goaGFzaFN0cmlu Zy5jaGFyYWN0ZXJzKCksIGhhc2hTdHJpbmcubGVuZ3RoKCkpOworfQorCiBDcmVkZW50aWFsQmFj a2luZ1N0b3JlJiBjcmVkZW50aWFsQmFja2luZ1N0b3JlKCkKIHsKICAgICBERUZJTkVfU1RBVElD X0xPQ0FMKENyZWRlbnRpYWxCYWNraW5nU3RvcmUsIGJhY2tpbmdTdG9yZSwgKCkpOwpAQCAtNTcs NiArNjksNyBAQCBDcmVkZW50aWFsQmFja2luZ1N0b3JlOjpDcmVkZW50aWFsQmFja2luZ1N0b3Jl KCkKICAgICAsIG1faGFzTmV2ZXJSZW1lbWJlclN0YXRlbWVudCgwKQogICAgICwgbV9nZXROZXZl clJlbWVtYmVyU3RhdGVtZW50KDApCiAgICAgLCBtX3JlbW92ZU5ldmVyUmVtZW1iZXJTdGF0ZW1l bnQoMCkKKyAgICAsIG1fdXNpbmdDZXJ0TWFuYWdlcihCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6Q2Vy dE1ncldyYXBwZXI6Omluc3RhbmNlKCktPmlzUmVhZHkoKSkKIHsKIH0KIApAQCAtMTI1LDExICsx MzgsMTEgQEAgYm9vbCBDcmVkZW50aWFsQmFja2luZ1N0b3JlOjpvcGVuKGNvbnN0IFN0cmluZyYg ZGJQYXRoKQogICAgIEhBTkRMRV9TUUxfRVhFQ19GQUlMVVJFKG1faGFzTG9naW5TdGF0ZW1lbnQt PnByZXBhcmUoKSAhPSBTUUxSZXN1bHRPaywKICAgICAgICAgZmFsc2UsICJGYWlsZWQgdG8gcHJl cGFyZSBoYXNMb2dpbiBzdGF0ZW1lbnQiKTsKIAotICAgIG1fZ2V0TG9naW5TdGF0ZW1lbnQgPSBu ZXcgU1FMaXRlU3RhdGVtZW50KG1fZGF0YWJhc2UsICJTRUxFQ1QgdXNlcm5hbWUsIHBhc3N3b3Jk IEZST00gbG9naW5zIFdIRVJFIGhvc3QgPSA/IEFORCBwb3J0ID0gPyBBTkQgc2VydmljZV90eXBl ID0gPyBBTkQgcmVhbG0gPSA/IEFORCBhdXRoX3NjaGVtZSA9ID8iKTsKKyAgICBtX2dldExvZ2lu U3RhdGVtZW50ID0gbmV3IFNRTGl0ZVN0YXRlbWVudChtX2RhdGFiYXNlLCAiU0VMRUNUIHVzZXJu YW1lLCBwYXNzd29yZCwgb3JpZ2luX3VybCBGUk9NIGxvZ2lucyBXSEVSRSBob3N0ID0gPyBBTkQg cG9ydCA9ID8gQU5EIHNlcnZpY2VfdHlwZSA9ID8gQU5EIHJlYWxtID0gPyBBTkQgYXV0aF9zY2hl bWUgPSA/Iik7CiAgICAgSEFORExFX1NRTF9FWEVDX0ZBSUxVUkUobV9nZXRMb2dpblN0YXRlbWVu dC0+cHJlcGFyZSgpICE9IFNRTFJlc3VsdE9rLAogICAgICAgICBmYWxzZSwgIkZhaWxlZCB0byBw cmVwYXJlIGdldExvZ2luIHN0YXRlbWVudCIpOwogCi0gICAgbV9nZXRMb2dpbkJ5VVJMU3RhdGVt ZW50ID0gbmV3IFNRTGl0ZVN0YXRlbWVudChtX2RhdGFiYXNlLCAiU0VMRUNUIHVzZXJuYW1lLCBw YXNzd29yZCBGUk9NIGxvZ2lucyBXSEVSRSBvcmlnaW5fdXJsID0gPyIpOworICAgIG1fZ2V0TG9n aW5CeVVSTFN0YXRlbWVudCA9IG5ldyBTUUxpdGVTdGF0ZW1lbnQobV9kYXRhYmFzZSwgIlNFTEVD VCB1c2VybmFtZSwgcGFzc3dvcmQsIGhvc3QsIHBvcnQsIHNlcnZpY2VfdHlwZSwgcmVhbG0sIGF1 dGhfc2NoZW1lIEZST00gbG9naW5zIFdIRVJFIG9yaWdpbl91cmwgPSA/Iik7CiAgICAgSEFORExF X1NRTF9FWEVDX0ZBSUxVUkUobV9nZXRMb2dpbkJ5VVJMU3RhdGVtZW50LT5wcmVwYXJlKCkgIT0g U1FMUmVzdWx0T2ssCiAgICAgICAgIGZhbHNlLCAiRmFpbGVkIHRvIHByZXBhcmUgZ2V0TG9naW5C eVVSTCBzdGF0ZW1lbnQiKTsKIApAQCAtMTcxLDE0ICsxODQsMTcgQEAgYm9vbCBDcmVkZW50aWFs QmFja2luZ1N0b3JlOjphZGRMb2dpbihjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFByb3RlY3Rpb25T cGFjZSYgcHIKICAgICBtX2FkZExvZ2luU3RhdGVtZW50LT5iaW5kVGV4dCg1LCBwcm90ZWN0aW9u U3BhY2UucmVhbG0oKSk7CiAgICAgbV9hZGRMb2dpblN0YXRlbWVudC0+YmluZEludCg2LCBzdGF0 aWNfY2FzdDxpbnQ+KHByb3RlY3Rpb25TcGFjZS5hdXRoZW50aWNhdGlvblNjaGVtZSgpKSk7CiAg ICAgbV9hZGRMb2dpblN0YXRlbWVudC0+YmluZFRleHQoNywgY3JlZGVudGlhbC51c2VyKCkpOwot ICAgIG1fYWRkTG9naW5TdGF0ZW1lbnQtPmJpbmRCbG9iKDgsIGVuY3J5cHRlZFN0cmluZyhjcmVk ZW50aWFsLnBhc3N3b3JkKCkpKTsKKyAgICBtX2FkZExvZ2luU3RhdGVtZW50LT5iaW5kQmxvYig4 LCBtX3VzaW5nQ2VydE1hbmFnZXIgPyAiIiA6IGVuY3J5cHRlZFN0cmluZyhjcmVkZW50aWFsLnBh c3N3b3JkKCkpKTsKIAogICAgIGludCByZXN1bHQgPSBtX2FkZExvZ2luU3RhdGVtZW50LT5zdGVw KCk7CiAgICAgbV9hZGRMb2dpblN0YXRlbWVudC0+cmVzZXQoKTsKICAgICBIQU5ETEVfU1FMX0VY RUNfRkFJTFVSRShyZXN1bHQgIT0gU1FMUmVzdWx0RG9uZSwgZmFsc2UsCiAgICAgICAgICJGYWls ZWQgdG8gYWRkIGxvZ2luIGluZm8gaW50byB0YWJsZSBsb2dpbnMgLSAlaSIsIHJlc3VsdCk7CiAK LSAgICByZXR1cm4gdHJ1ZTsKKyAgICBpZiAoIW1fdXNpbmdDZXJ0TWFuYWdlcikKKyAgICAgICAg cmV0dXJuIHRydWU7CisgICAgdW5zaWduZWQgaGFzaCA9IGhhc2hDcmVkZW50aWFsSW5mbyh1cmwu c3RyaW5nKCksIHByb3RlY3Rpb25TcGFjZSwgY3JlZGVudGlhbC51c2VyKCkpOworICAgIHJldHVy biBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6Q2VydE1ncldyYXBwZXI6Omluc3RhbmNlKCktPnNhdmVQ YXNzd29yZChoYXNoLCBlbmNyeXB0ZWRTdHJpbmcoY3JlZGVudGlhbC5wYXNzd29yZCgpKS5sYXRp bjEoKS5kYXRhKCkpOwogfQogCiBib29sIENyZWRlbnRpYWxCYWNraW5nU3RvcmU6OnVwZGF0ZUxv Z2luKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgUHJvdGVjdGlvblNwYWNlJiBwcm90ZWN0aW9uU3Bh Y2UsIGNvbnN0IENyZWRlbnRpYWwmIGNyZWRlbnRpYWwpCkBAIC0xOTAsNyArMjA2LDcgQEAgYm9v bCBDcmVkZW50aWFsQmFja2luZ1N0b3JlOjp1cGRhdGVMb2dpbihjb25zdCBLVVJMJiB1cmwsIGNv bnN0IFByb3RlY3Rpb25TcGFjZSYKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgbV91cGRh dGVMb2dpblN0YXRlbWVudC0+YmluZFRleHQoMSwgY3JlZGVudGlhbC51c2VyKCkpOwotICAgIG1f dXBkYXRlTG9naW5TdGF0ZW1lbnQtPmJpbmRCbG9iKDIsIGVuY3J5cHRlZFN0cmluZyhjcmVkZW50 aWFsLnBhc3N3b3JkKCkpKTsKKyAgICBtX3VwZGF0ZUxvZ2luU3RhdGVtZW50LT5iaW5kQmxvYigy LCBtX3VzaW5nQ2VydE1hbmFnZXIgPyAiIiA6IGVuY3J5cHRlZFN0cmluZyhjcmVkZW50aWFsLnBh c3N3b3JkKCkpKTsKICAgICBtX3VwZGF0ZUxvZ2luU3RhdGVtZW50LT5iaW5kVGV4dCgzLCB1cmwu c3RyaW5nKCkpOwogICAgIG1fdXBkYXRlTG9naW5TdGF0ZW1lbnQtPmJpbmRUZXh0KDQsIHByb3Rl Y3Rpb25TcGFjZS5ob3N0KCkpOwogICAgIG1fdXBkYXRlTG9naW5TdGF0ZW1lbnQtPmJpbmRJbnQo NSwgcHJvdGVjdGlvblNwYWNlLnBvcnQoKSk7CkBAIC0yMDMsNyArMjE5LDEwIEBAIGJvb2wgQ3Jl ZGVudGlhbEJhY2tpbmdTdG9yZTo6dXBkYXRlTG9naW4oY29uc3QgS1VSTCYgdXJsLCBjb25zdCBQ cm90ZWN0aW9uU3BhY2UmCiAgICAgSEFORExFX1NRTF9FWEVDX0ZBSUxVUkUocmVzdWx0ICE9IFNR TFJlc3VsdERvbmUsIGZhbHNlLAogICAgICAgICAiRmFpbGVkIHRvIHVwZGF0ZSBsb2dpbiBpbmZv IGluIHRhYmxlIGxvZ2lucyAtICVpIiwgcmVzdWx0KTsKIAotICAgIHJldHVybiB0cnVlOworICAg IGlmICghbV91c2luZ0NlcnRNYW5hZ2VyKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB1bnNp Z25lZCBoYXNoID0gaGFzaENyZWRlbnRpYWxJbmZvKHVybC5zdHJpbmcoKSwgcHJvdGVjdGlvblNw YWNlLCBjcmVkZW50aWFsLnVzZXIoKSk7CisgICAgcmV0dXJuIEJsYWNrQmVycnk6OlBsYXRmb3Jt OjpDZXJ0TWdyV3JhcHBlcjo6aW5zdGFuY2UoKS0+c2F2ZVBhc3N3b3JkKGhhc2gsIGVuY3J5cHRl ZFN0cmluZyhjcmVkZW50aWFsLnBhc3N3b3JkKCkpLmxhdGluMSgpLmRhdGEoKSk7CiB9CiAKIGJv b2wgQ3JlZGVudGlhbEJhY2tpbmdTdG9yZTo6aGFzTG9naW4oY29uc3QgS1VSTCYgdXJsLCBjb25z dCBQcm90ZWN0aW9uU3BhY2UmIHByb3RlY3Rpb25TcGFjZSkKQEAgLTI0OCwxMiArMjY3LDIwIEBA IENyZWRlbnRpYWwgQ3JlZGVudGlhbEJhY2tpbmdTdG9yZTo6Z2V0TG9naW4oY29uc3QgUHJvdGVj dGlvblNwYWNlJiBwcm90ZWN0aW9uU3BhCiAKICAgICBpbnQgcmVzdWx0ID0gbV9nZXRMb2dpblN0 YXRlbWVudC0+c3RlcCgpOwogICAgIFN0cmluZyB1c2VybmFtZSA9IG1fZ2V0TG9naW5TdGF0ZW1l bnQtPmdldENvbHVtblRleHQoMCk7Ci0gICAgU3RyaW5nIHBhc3N3b3JkID0gbV9nZXRMb2dpblN0 YXRlbWVudC0+Z2V0Q29sdW1uQmxvYkFzU3RyaW5nKDEpOworICAgIFN0cmluZyBwYXNzd29yZCA9 IG1fdXNpbmdDZXJ0TWFuYWdlciA/ICIiIDogbV9nZXRMb2dpblN0YXRlbWVudC0+Z2V0Q29sdW1u QmxvYkFzU3RyaW5nKDEpOworICAgIFN0cmluZyB1cmwgPSBtX2dldExvZ2luU3RhdGVtZW50LT5n ZXRDb2x1bW5UZXh0KDIpOwogICAgIG1fZ2V0TG9naW5TdGF0ZW1lbnQtPnJlc2V0KCk7CiAgICAg SEFORExFX1NRTF9FWEVDX0ZBSUxVUkUocmVzdWx0ICE9IFNRTFJlc3VsdFJvdywgQ3JlZGVudGlh bCgpLAogICAgICAgICAiRmFpbGVkIHRvIGV4ZWN1dGUgc2VsZWN0IGxvZ2luIGluZm8gZnJvbSB0 YWJsZSBsb2dpbnMgaW4gZ2V0TG9naW4gLSAlaSIsIHJlc3VsdCk7CiAKLSAgICByZXR1cm4gQ3Jl ZGVudGlhbCh1c2VybmFtZSwgZGVjcnlwdGVkU3RyaW5nKHBhc3N3b3JkKSwgQ3JlZGVudGlhbFBl cnNpc3RlbmNlUGVybWFuZW50KTsKKyAgICBpZiAoIW1fdXNpbmdDZXJ0TWFuYWdlcikKKyAgICAg ICAgcmV0dXJuIENyZWRlbnRpYWwodXNlcm5hbWUsIGRlY3J5cHRlZFN0cmluZyhwYXNzd29yZCks IENyZWRlbnRpYWxQZXJzaXN0ZW5jZVBlcm1hbmVudCk7CisKKyAgICB1bnNpZ25lZCBoYXNoID0g aGFzaENyZWRlbnRpYWxJbmZvKHVybCwgcHJvdGVjdGlvblNwYWNlLCB1c2VybmFtZSk7CisgICAg c3RkOjpzdHJpbmcgcGFzc3dvcmRCbG9iOworICAgIGlmICghQmxhY2tCZXJyeTo6UGxhdGZvcm06 OkNlcnRNZ3JXcmFwcGVyOjppbnN0YW5jZSgpLT5nZXRQYXNzd29yZChoYXNoLCBwYXNzd29yZEJs b2IpKQorICAgICAgICByZXR1cm4gQ3JlZGVudGlhbCgpOworICAgIHJldHVybiBDcmVkZW50aWFs KHVzZXJuYW1lLCBkZWNyeXB0ZWRTdHJpbmcocGFzc3dvcmRCbG9iLmNfc3RyKCkpLCBDcmVkZW50 aWFsUGVyc2lzdGVuY2VQZXJtYW5lbnQpOwogfQogCiBDcmVkZW50aWFsIENyZWRlbnRpYWxCYWNr aW5nU3RvcmU6OmdldExvZ2luKGNvbnN0IEtVUkwmIHVybCkKQEAgLTI2OCwxMiArMjk1LDI2IEBA IENyZWRlbnRpYWwgQ3JlZGVudGlhbEJhY2tpbmdTdG9yZTo6Z2V0TG9naW4oY29uc3QgS1VSTCYg dXJsKQogCiAgICAgaW50IHJlc3VsdCA9IG1fZ2V0TG9naW5CeVVSTFN0YXRlbWVudC0+c3RlcCgp OwogICAgIFN0cmluZyB1c2VybmFtZSA9IG1fZ2V0TG9naW5CeVVSTFN0YXRlbWVudC0+Z2V0Q29s dW1uVGV4dCgwKTsKLSAgICBTdHJpbmcgcGFzc3dvcmQgPSBtX2dldExvZ2luQnlVUkxTdGF0ZW1l bnQtPmdldENvbHVtbkJsb2JBc1N0cmluZygxKTsKKyAgICBTdHJpbmcgcGFzc3dvcmQgPSBtX3Vz aW5nQ2VydE1hbmFnZXIgPyAiIiA6IG1fZ2V0TG9naW5CeVVSTFN0YXRlbWVudC0+Z2V0Q29sdW1u QmxvYkFzU3RyaW5nKDEpOworICAgIFN0cmluZyBob3N0ID0gbV9nZXRMb2dpbkJ5VVJMU3RhdGVt ZW50LT5nZXRDb2x1bW5UZXh0KDIpOworICAgIGludCBwb3J0ID0gbV9nZXRMb2dpbkJ5VVJMU3Rh dGVtZW50LT5nZXRDb2x1bW5JbnQoMyk7CisgICAgaW50IHNlcnZpY2VUeXBlID0gbV9nZXRMb2dp bkJ5VVJMU3RhdGVtZW50LT5nZXRDb2x1bW5JbnQoNCk7CisgICAgU3RyaW5nIHJlYWxtID0gbV9n ZXRMb2dpbkJ5VVJMU3RhdGVtZW50LT5nZXRDb2x1bW5UZXh0KDUpOworICAgIGludCBhdXRoZW50 aWNhdGlvblNjaGVtZSA9IG1fZ2V0TG9naW5CeVVSTFN0YXRlbWVudC0+Z2V0Q29sdW1uSW50KDYp OwogICAgIG1fZ2V0TG9naW5CeVVSTFN0YXRlbWVudC0+cmVzZXQoKTsKICAgICBIQU5ETEVfU1FM X0VYRUNfRkFJTFVSRShyZXN1bHQgIT0gU1FMUmVzdWx0Um93LCBDcmVkZW50aWFsKCksCi0gICAg ICAgICJGYWlsZWQgdG8gZXhlY3V0ZSBzZWxlY3QgbG9naW4gaW5mbyBmcm9tIHRhYmxlIGxvZ2lu cyBpbiBnZXRMb2dpbiAtICVpIiwgcmVzdWx0KTsKKyAgICAgICAgIkZhaWxlZCB0byBleGVjdXRl IHNlbGVjdCBsb2dpbiBpbmZvIGZyb20gdGFibGUgbG9naW5zIGluIGdldExvZ2luQnlVUkwgLSAl aSIsIHJlc3VsdCk7CisKKyAgICBpZiAoIW1fdXNpbmdDZXJ0TWFuYWdlcikKKyAgICAgICAgcmV0 dXJuIENyZWRlbnRpYWwodXNlcm5hbWUsIGRlY3J5cHRlZFN0cmluZyhwYXNzd29yZCksIENyZWRl bnRpYWxQZXJzaXN0ZW5jZVBlcm1hbmVudCk7CiAKLSAgICByZXR1cm4gQ3JlZGVudGlhbCh1c2Vy bmFtZSwgZGVjcnlwdGVkU3RyaW5nKHBhc3N3b3JkKSwgQ3JlZGVudGlhbFBlcnNpc3RlbmNlUGVy bWFuZW50KTsKKyAgICBQcm90ZWN0aW9uU3BhY2UgcHJvdGVjdGlvblNwYWNlKGhvc3QsIHBvcnQs IHN0YXRpY19jYXN0PFByb3RlY3Rpb25TcGFjZVNlcnZlclR5cGU+KHNlcnZpY2VUeXBlKSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlYWxtLCBzdGF0aWNfY2FzdDxQcm90 ZWN0aW9uU3BhY2VBdXRoZW50aWNhdGlvblNjaGVtZT4oYXV0aGVudGljYXRpb25TY2hlbWUpKTsK KyAgICB1bnNpZ25lZCBoYXNoID0gaGFzaENyZWRlbnRpYWxJbmZvKHVybCwgcHJvdGVjdGlvblNw YWNlLCB1c2VybmFtZSk7CisgICAgc3RkOjpzdHJpbmcgcGFzc3dvcmRCbG9iOworICAgIGlmICgh QmxhY2tCZXJyeTo6UGxhdGZvcm06OkNlcnRNZ3JXcmFwcGVyOjppbnN0YW5jZSgpLT5nZXRQYXNz d29yZChoYXNoLCBwYXNzd29yZEJsb2IpKQorICAgICAgICByZXR1cm4gQ3JlZGVudGlhbCgpOwor ICAgIHJldHVybiBDcmVkZW50aWFsKHVzZXJuYW1lLCBkZWNyeXB0ZWRTdHJpbmcocGFzc3dvcmRC bG9iLmNfc3RyKCkpLCBDcmVkZW50aWFsUGVyc2lzdGVuY2VQZXJtYW5lbnQpOwogfQogCiBib29s IENyZWRlbnRpYWxCYWNraW5nU3RvcmU6OnJlbW92ZUxvZ2luKGNvbnN0IEtVUkwmIHVybCwgY29u c3QgUHJvdGVjdGlvblNwYWNlJiBwcm90ZWN0aW9uU3BhY2UpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvQ3JlZGVudGlhbEJhY2tpbmdTdG9y ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L0NyZWRlbnRp YWxCYWNraW5nU3RvcmUuaAppbmRleCA3Y2Q0OWUyMmNlNGFhYTRmZjFlN2ZmNWY1MGViMGEzM2Mz MTlkMmU4Li4xMmFmMTNjZjhhYjExYmI4ODVmYTU0MjZkYTlmODgzMmMyYzA3ZDE0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvQ3JlZGVudGlh bEJhY2tpbmdTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvYmxh Y2tiZXJyeS9DcmVkZW50aWFsQmFja2luZ1N0b3JlLmgKQEAgLTY0LDYgKzY0LDggQEAgcHJpdmF0 ZToKICAgICBTUUxpdGVTdGF0ZW1lbnQqIG1faGFzTmV2ZXJSZW1lbWJlclN0YXRlbWVudDsKICAg ICBTUUxpdGVTdGF0ZW1lbnQqIG1fZ2V0TmV2ZXJSZW1lbWJlclN0YXRlbWVudDsKICAgICBTUUxp dGVTdGF0ZW1lbnQqIG1fcmVtb3ZlTmV2ZXJSZW1lbWJlclN0YXRlbWVudDsKKworICAgIGJvb2wg bV91c2luZ0NlcnRNYW5hZ2VyOwogfTsKIAogQ3JlZGVudGlhbEJhY2tpbmdTdG9yZSYgY3JlZGVu dGlhbEJhY2tpbmdTdG9yZSgpOwo=