96457 2012-09-11 18:44:30 -0700 [BlackBerry] Use own instance of CertMgrWrapper in BlackBerry CredentialBackingStore. 2012-09-12 08:21:27 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 liachen webkit-unassigned joenotcharles jonathan.dong.webkit mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 717807 0 liachen 2012-09-11 18:44:30 -0700 In BlackBerry platform CertMgrWrapper is no longer a singleton, every user of it need to create its own instance. 717814 1 163495 liachen 2012-09-11 18:57:17 -0700 Created attachment 163495 patch for 96547 717817 2 liachen 2012-09-11 19:03:12 -0700 +Yong, Rob, Joe, Jonathan. 718376 3 163495 webkit.review.bot 2012-09-12 08:21:23 -0700 Comment on attachment 163495 patch for 96547 Clearing flags on attachment: 163495 Committed r128312: <http://trac.webkit.org/changeset/128312> 718378 4 webkit.review.bot 2012-09-12 08:21:27 -0700 All reviewed patches have been landed. Closing bug. 163495 2012-09-11 18:57:17 -0700 2012-09-12 08:21:23 -0700 patch for 96547 96547.patch text/plain 9405 liachen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1ZmY0ZTEwLi5mMDBmM2ZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTItMDktMTEgIExpYW5naHVpIENoZW4gIDxsaWFjaGVuQHJpbS5jb20+CisKKyAgICAg ICAgW0JsYWNrQmVycnldIFVzZSBvd24gaW5zdGFuY2Ugb2YgQ2VydE1ncldyYXBwZXIgaW4gQmxh Y2tCZXJyeSBDcmVkZW50aWFsQmFja2luZ1N0b3JlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY0NTcKKyAgICAgICAgSW50ZXJuYWwgUFI6IDIwNTc2 OQorCisgICAgICAgIEludGVybmFsbHkgcmV2aWV3ZWQgYnkgR2VvcmdlIFN0YWlrb3MsIEpvbmF0 aGFuIERvbmcuCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IENlcnRNZ3JXcmFwcGVyIGluIEJsYWNrQmVycnkgcGxhdGZvcm0gbGF5ZXIgaGFzIGJlZW4gY2hh bmdlZCBmcm9tCisgICAgICAgIHNpbmdsZXRvbiB0byBub3JtYWwgY2xhc3MsIGV2ZXJ5IHVzZXIg b2YgaXQgbmVlZCB0byBjcmVhdGUgaXRzIG93bgorICAgICAgICBpbnN0YW5jZSBub3cuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIGZvciBwbGF0Zm9ybSBzcGVjaWZpYyBpbnRlcmZhY2UgY2hhbmdl LgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9ibGFja2JlcnJ5L0NyZWRlbnRpYWxCYWNr aW5nU3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q3JlZGVudGlhbEJhY2tpbmdTdG9yZTo6 Q3JlZGVudGlhbEJhY2tpbmdTdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpDcmVkZW50aWFsQmFj a2luZ1N0b3JlOjp+Q3JlZGVudGlhbEJhY2tpbmdTdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpD cmVkZW50aWFsQmFja2luZ1N0b3JlOjphZGRMb2dpbik6CisgICAgICAgIChXZWJDb3JlOjpDcmVk ZW50aWFsQmFja2luZ1N0b3JlOjp1cGRhdGVMb2dpbik6CisgICAgICAgIChXZWJDb3JlOjpDcmVk ZW50aWFsQmFja2luZ1N0b3JlOjpnZXRMb2dpbik6CisgICAgICAgIChXZWJDb3JlOjpDcmVkZW50 aWFsQmFja2luZ1N0b3JlOjpjZXJ0TWdyV3JhcHBlcik6CisgICAgICAgIChXZWJDb3JlKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvQ3JlZGVudGlhbEJhY2tpbmdTdG9y ZS5oOgorICAgICAgICAoUGxhdGZvcm0pOgorICAgICAgICAoQ3JlZGVudGlhbEJhY2tpbmdTdG9y ZSk6CisKIDIwMTItMDktMTEgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAK ICAgICAgICAgQnVpbGQgZml4ZWQgZm9yIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0 LzEyODI0MwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9ibGFj a2JlcnJ5L0NyZWRlbnRpYWxCYWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9ibGFja2JlcnJ5L0NyZWRlbnRpYWxCYWNraW5nU3RvcmUuY3BwCmluZGV4IDE4 N2QyMzguLjBkM2VjNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvYmxhY2tiZXJyeS9DcmVkZW50aWFsQmFja2luZ1N0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNrYmVycnkvQ3JlZGVudGlhbEJhY2tpbmdTdG9yZS5j cHAKQEAgLTY5LDEyICs2OSwxNCBAQCBDcmVkZW50aWFsQmFja2luZ1N0b3JlOjpDcmVkZW50aWFs QmFja2luZ1N0b3JlKCkKICAgICAsIG1faGFzTmV2ZXJSZW1lbWJlclN0YXRlbWVudCgwKQogICAg ICwgbV9nZXROZXZlclJlbWVtYmVyU3RhdGVtZW50KDApCiAgICAgLCBtX3JlbW92ZU5ldmVyUmVt ZW1iZXJTdGF0ZW1lbnQoMCkKLSAgICAsIG1fdXNpbmdDZXJ0TWFuYWdlcihCbGFja0JlcnJ5OjpQ bGF0Zm9ybTo6Q2VydE1ncldyYXBwZXI6Omluc3RhbmNlKCktPmlzUmVhZHkoKSkKKyAgICAsIG1f Y2VydE1ncldyYXBwZXIoMCkKIHsKIH0KIAogQ3JlZGVudGlhbEJhY2tpbmdTdG9yZTo6fkNyZWRl bnRpYWxCYWNraW5nU3RvcmUoKQogeworICAgIGRlbGV0ZSBtX2NlcnRNZ3JXcmFwcGVyOworICAg IG1fY2VydE1ncldyYXBwZXIgPSAwOwogICAgIGRlbGV0ZSBtX2FkZExvZ2luU3RhdGVtZW50Owog ICAgIG1fYWRkTG9naW5TdGF0ZW1lbnQgPSAwOwogICAgIGRlbGV0ZSBtX3VwZGF0ZUxvZ2luU3Rh dGVtZW50OwpAQCAtMTg0LDE3ICsxODYsMTcgQEAgYm9vbCBDcmVkZW50aWFsQmFja2luZ1N0b3Jl OjphZGRMb2dpbihjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFByb3RlY3Rpb25TcGFjZSYgcHIKICAg ICBtX2FkZExvZ2luU3RhdGVtZW50LT5iaW5kVGV4dCg1LCBwcm90ZWN0aW9uU3BhY2UucmVhbG0o KSk7CiAgICAgbV9hZGRMb2dpblN0YXRlbWVudC0+YmluZEludCg2LCBzdGF0aWNfY2FzdDxpbnQ+ KHByb3RlY3Rpb25TcGFjZS5hdXRoZW50aWNhdGlvblNjaGVtZSgpKSk7CiAgICAgbV9hZGRMb2dp blN0YXRlbWVudC0+YmluZFRleHQoNywgY3JlZGVudGlhbC51c2VyKCkpOwotICAgIG1fYWRkTG9n aW5TdGF0ZW1lbnQtPmJpbmRCbG9iKDgsIG1fdXNpbmdDZXJ0TWFuYWdlciA/ICIiIDogZW5jcnlw dGVkU3RyaW5nKGNyZWRlbnRpYWwucGFzc3dvcmQoKSkpOworICAgIG1fYWRkTG9naW5TdGF0ZW1l bnQtPmJpbmRCbG9iKDgsIGNlcnRNZ3JXcmFwcGVyKCktPmlzUmVhZHkoKSA/ICIiIDogZW5jcnlw dGVkU3RyaW5nKGNyZWRlbnRpYWwucGFzc3dvcmQoKSkpOwogCiAgICAgaW50IHJlc3VsdCA9IG1f YWRkTG9naW5TdGF0ZW1lbnQtPnN0ZXAoKTsKICAgICBtX2FkZExvZ2luU3RhdGVtZW50LT5yZXNl dCgpOwogICAgIEhBTkRMRV9TUUxfRVhFQ19GQUlMVVJFKHJlc3VsdCAhPSBTUUxSZXN1bHREb25l LCBmYWxzZSwKICAgICAgICAgIkZhaWxlZCB0byBhZGQgbG9naW4gaW5mbyBpbnRvIHRhYmxlIGxv Z2lucyAtICVpIiwgcmVzdWx0KTsKIAotICAgIGlmICghbV91c2luZ0NlcnRNYW5hZ2VyKQorICAg IGlmICghY2VydE1ncldyYXBwZXIoKS0+aXNSZWFkeSgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsK ICAgICB1bnNpZ25lZCBoYXNoID0gaGFzaENyZWRlbnRpYWxJbmZvKHVybC5zdHJpbmcoKSwgcHJv dGVjdGlvblNwYWNlLCBjcmVkZW50aWFsLnVzZXIoKSk7Ci0gICAgcmV0dXJuIEJsYWNrQmVycnk6 OlBsYXRmb3JtOjpDZXJ0TWdyV3JhcHBlcjo6aW5zdGFuY2UoKS0+c2F2ZVBhc3N3b3JkKGhhc2gs IGVuY3J5cHRlZFN0cmluZyhjcmVkZW50aWFsLnBhc3N3b3JkKCkpLmxhdGluMSgpLmRhdGEoKSk7 CisgICAgcmV0dXJuIGNlcnRNZ3JXcmFwcGVyKCktPnNhdmVQYXNzd29yZChoYXNoLCBlbmNyeXB0 ZWRTdHJpbmcoY3JlZGVudGlhbC5wYXNzd29yZCgpKS5sYXRpbjEoKS5kYXRhKCkpOwogfQogCiBi b29sIENyZWRlbnRpYWxCYWNraW5nU3RvcmU6OnVwZGF0ZUxvZ2luKGNvbnN0IEtVUkwmIHVybCwg Y29uc3QgUHJvdGVjdGlvblNwYWNlJiBwcm90ZWN0aW9uU3BhY2UsIGNvbnN0IENyZWRlbnRpYWwm IGNyZWRlbnRpYWwpCkBAIC0yMDYsNyArMjA4LDcgQEAgYm9vbCBDcmVkZW50aWFsQmFja2luZ1N0 b3JlOjp1cGRhdGVMb2dpbihjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFByb3RlY3Rpb25TcGFjZSYK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgbV91cGRhdGVMb2dpblN0YXRlbWVudC0+Ymlu ZFRleHQoMSwgY3JlZGVudGlhbC51c2VyKCkpOwotICAgIG1fdXBkYXRlTG9naW5TdGF0ZW1lbnQt PmJpbmRCbG9iKDIsIG1fdXNpbmdDZXJ0TWFuYWdlciA/ICIiIDogZW5jcnlwdGVkU3RyaW5nKGNy ZWRlbnRpYWwucGFzc3dvcmQoKSkpOworICAgIG1fdXBkYXRlTG9naW5TdGF0ZW1lbnQtPmJpbmRC bG9iKDIsIGNlcnRNZ3JXcmFwcGVyKCktPmlzUmVhZHkoKSA/ICIiIDogZW5jcnlwdGVkU3RyaW5n KGNyZWRlbnRpYWwucGFzc3dvcmQoKSkpOwogICAgIG1fdXBkYXRlTG9naW5TdGF0ZW1lbnQtPmJp bmRUZXh0KDMsIHVybC5zdHJpbmcoKSk7CiAgICAgbV91cGRhdGVMb2dpblN0YXRlbWVudC0+Ymlu ZFRleHQoNCwgcHJvdGVjdGlvblNwYWNlLmhvc3QoKSk7CiAgICAgbV91cGRhdGVMb2dpblN0YXRl bWVudC0+YmluZEludCg1LCBwcm90ZWN0aW9uU3BhY2UucG9ydCgpKTsKQEAgLTIxOSwxMCArMjIx LDEwIEBAIGJvb2wgQ3JlZGVudGlhbEJhY2tpbmdTdG9yZTo6dXBkYXRlTG9naW4oY29uc3QgS1VS TCYgdXJsLCBjb25zdCBQcm90ZWN0aW9uU3BhY2UmCiAgICAgSEFORExFX1NRTF9FWEVDX0ZBSUxV UkUocmVzdWx0ICE9IFNRTFJlc3VsdERvbmUsIGZhbHNlLAogICAgICAgICAiRmFpbGVkIHRvIHVw ZGF0ZSBsb2dpbiBpbmZvIGluIHRhYmxlIGxvZ2lucyAtICVpIiwgcmVzdWx0KTsKIAotICAgIGlm ICghbV91c2luZ0NlcnRNYW5hZ2VyKQorICAgIGlmICghY2VydE1ncldyYXBwZXIoKS0+aXNSZWFk eSgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB1bnNpZ25lZCBoYXNoID0gaGFzaENyZWRl bnRpYWxJbmZvKHVybC5zdHJpbmcoKSwgcHJvdGVjdGlvblNwYWNlLCBjcmVkZW50aWFsLnVzZXIo KSk7Ci0gICAgcmV0dXJuIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpDZXJ0TWdyV3JhcHBlcjo6aW5z dGFuY2UoKS0+c2F2ZVBhc3N3b3JkKGhhc2gsIGVuY3J5cHRlZFN0cmluZyhjcmVkZW50aWFsLnBh c3N3b3JkKCkpLmxhdGluMSgpLmRhdGEoKSk7CisgICAgcmV0dXJuIGNlcnRNZ3JXcmFwcGVyKCkt PnNhdmVQYXNzd29yZChoYXNoLCBlbmNyeXB0ZWRTdHJpbmcoY3JlZGVudGlhbC5wYXNzd29yZCgp KS5sYXRpbjEoKS5kYXRhKCkpOwogfQogCiBib29sIENyZWRlbnRpYWxCYWNraW5nU3RvcmU6Omhh c0xvZ2luKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgUHJvdGVjdGlvblNwYWNlJiBwcm90ZWN0aW9u U3BhY2UpCkBAIC0yNjcsMTggKzI2OSwxOCBAQCBDcmVkZW50aWFsIENyZWRlbnRpYWxCYWNraW5n U3RvcmU6OmdldExvZ2luKGNvbnN0IFByb3RlY3Rpb25TcGFjZSYgcHJvdGVjdGlvblNwYQogCiAg ICAgaW50IHJlc3VsdCA9IG1fZ2V0TG9naW5TdGF0ZW1lbnQtPnN0ZXAoKTsKICAgICBTdHJpbmcg dXNlcm5hbWUgPSBtX2dldExvZ2luU3RhdGVtZW50LT5nZXRDb2x1bW5UZXh0KDApOwotICAgIFN0 cmluZyBwYXNzd29yZCA9IG1fdXNpbmdDZXJ0TWFuYWdlciA/ICIiIDogbV9nZXRMb2dpblN0YXRl bWVudC0+Z2V0Q29sdW1uQmxvYkFzU3RyaW5nKDEpOworICAgIFN0cmluZyBwYXNzd29yZCA9IGNl cnRNZ3JXcmFwcGVyKCktPmlzUmVhZHkoKSA/ICIiIDogbV9nZXRMb2dpblN0YXRlbWVudC0+Z2V0 Q29sdW1uQmxvYkFzU3RyaW5nKDEpOwogICAgIFN0cmluZyB1cmwgPSBtX2dldExvZ2luU3RhdGVt ZW50LT5nZXRDb2x1bW5UZXh0KDIpOwogICAgIG1fZ2V0TG9naW5TdGF0ZW1lbnQtPnJlc2V0KCk7 CiAgICAgSEFORExFX1NRTF9FWEVDX0ZBSUxVUkUocmVzdWx0ICE9IFNRTFJlc3VsdFJvdywgQ3Jl ZGVudGlhbCgpLAogICAgICAgICAiRmFpbGVkIHRvIGV4ZWN1dGUgc2VsZWN0IGxvZ2luIGluZm8g ZnJvbSB0YWJsZSBsb2dpbnMgaW4gZ2V0TG9naW4gLSAlaSIsIHJlc3VsdCk7CiAKLSAgICBpZiAo IW1fdXNpbmdDZXJ0TWFuYWdlcikKKyAgICBpZiAoIWNlcnRNZ3JXcmFwcGVyKCktPmlzUmVhZHko KSkKICAgICAgICAgcmV0dXJuIENyZWRlbnRpYWwodXNlcm5hbWUsIGRlY3J5cHRlZFN0cmluZyhw YXNzd29yZCksIENyZWRlbnRpYWxQZXJzaXN0ZW5jZVBlcm1hbmVudCk7CiAKICAgICB1bnNpZ25l ZCBoYXNoID0gaGFzaENyZWRlbnRpYWxJbmZvKHVybCwgcHJvdGVjdGlvblNwYWNlLCB1c2VybmFt ZSk7CiAgICAgc3RkOjpzdHJpbmcgcGFzc3dvcmRCbG9iOwotICAgIGlmICghQmxhY2tCZXJyeTo6 UGxhdGZvcm06OkNlcnRNZ3JXcmFwcGVyOjppbnN0YW5jZSgpLT5nZXRQYXNzd29yZChoYXNoLCBw YXNzd29yZEJsb2IpKQorICAgIGlmICghY2VydE1ncldyYXBwZXIoKS0+Z2V0UGFzc3dvcmQoaGFz aCwgcGFzc3dvcmRCbG9iKSkKICAgICAgICAgcmV0dXJuIENyZWRlbnRpYWwoKTsKICAgICByZXR1 cm4gQ3JlZGVudGlhbCh1c2VybmFtZSwgZGVjcnlwdGVkU3RyaW5nKHBhc3N3b3JkQmxvYi5jX3N0 cigpKSwgQ3JlZGVudGlhbFBlcnNpc3RlbmNlUGVybWFuZW50KTsKIH0KQEAgLTI5NSw3ICsyOTcs NyBAQCBDcmVkZW50aWFsIENyZWRlbnRpYWxCYWNraW5nU3RvcmU6OmdldExvZ2luKGNvbnN0IEtV UkwmIHVybCkKIAogICAgIGludCByZXN1bHQgPSBtX2dldExvZ2luQnlVUkxTdGF0ZW1lbnQtPnN0 ZXAoKTsKICAgICBTdHJpbmcgdXNlcm5hbWUgPSBtX2dldExvZ2luQnlVUkxTdGF0ZW1lbnQtPmdl dENvbHVtblRleHQoMCk7Ci0gICAgU3RyaW5nIHBhc3N3b3JkID0gbV91c2luZ0NlcnRNYW5hZ2Vy ID8gIiIgOiBtX2dldExvZ2luQnlVUkxTdGF0ZW1lbnQtPmdldENvbHVtbkJsb2JBc1N0cmluZygx KTsKKyAgICBTdHJpbmcgcGFzc3dvcmQgPSBjZXJ0TWdyV3JhcHBlcigpLT5pc1JlYWR5KCkgPyAi IiA6IG1fZ2V0TG9naW5CeVVSTFN0YXRlbWVudC0+Z2V0Q29sdW1uQmxvYkFzU3RyaW5nKDEpOwog ICAgIFN0cmluZyBob3N0ID0gbV9nZXRMb2dpbkJ5VVJMU3RhdGVtZW50LT5nZXRDb2x1bW5UZXh0 KDIpOwogICAgIGludCBwb3J0ID0gbV9nZXRMb2dpbkJ5VVJMU3RhdGVtZW50LT5nZXRDb2x1bW5J bnQoMyk7CiAgICAgaW50IHNlcnZpY2VUeXBlID0gbV9nZXRMb2dpbkJ5VVJMU3RhdGVtZW50LT5n ZXRDb2x1bW5JbnQoNCk7CkBAIC0zMDUsMTQgKzMwNywxNCBAQCBDcmVkZW50aWFsIENyZWRlbnRp YWxCYWNraW5nU3RvcmU6OmdldExvZ2luKGNvbnN0IEtVUkwmIHVybCkKICAgICBIQU5ETEVfU1FM X0VYRUNfRkFJTFVSRShyZXN1bHQgIT0gU1FMUmVzdWx0Um93LCBDcmVkZW50aWFsKCksCiAgICAg ICAgICJGYWlsZWQgdG8gZXhlY3V0ZSBzZWxlY3QgbG9naW4gaW5mbyBmcm9tIHRhYmxlIGxvZ2lu cyBpbiBnZXRMb2dpbkJ5VVJMIC0gJWkiLCByZXN1bHQpOwogCi0gICAgaWYgKCFtX3VzaW5nQ2Vy dE1hbmFnZXIpCisgICAgaWYgKCFjZXJ0TWdyV3JhcHBlcigpLT5pc1JlYWR5KCkpCiAgICAgICAg IHJldHVybiBDcmVkZW50aWFsKHVzZXJuYW1lLCBkZWNyeXB0ZWRTdHJpbmcocGFzc3dvcmQpLCBD cmVkZW50aWFsUGVyc2lzdGVuY2VQZXJtYW5lbnQpOwogCiAgICAgUHJvdGVjdGlvblNwYWNlIHBy b3RlY3Rpb25TcGFjZShob3N0LCBwb3J0LCBzdGF0aWNfY2FzdDxQcm90ZWN0aW9uU3BhY2VTZXJ2 ZXJUeXBlPihzZXJ2aWNlVHlwZSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICByZWFsbSwgc3RhdGljX2Nhc3Q8UHJvdGVjdGlvblNwYWNlQXV0aGVudGljYXRpb25TY2hlbWU+ KGF1dGhlbnRpY2F0aW9uU2NoZW1lKSk7CiAgICAgdW5zaWduZWQgaGFzaCA9IGhhc2hDcmVkZW50 aWFsSW5mbyh1cmwsIHByb3RlY3Rpb25TcGFjZSwgdXNlcm5hbWUpOwogICAgIHN0ZDo6c3RyaW5n IHBhc3N3b3JkQmxvYjsKLSAgICBpZiAoIUJsYWNrQmVycnk6OlBsYXRmb3JtOjpDZXJ0TWdyV3Jh cHBlcjo6aW5zdGFuY2UoKS0+Z2V0UGFzc3dvcmQoaGFzaCwgcGFzc3dvcmRCbG9iKSkKKyAgICBp ZiAoIWNlcnRNZ3JXcmFwcGVyKCktPmdldFBhc3N3b3JkKGhhc2gsIHBhc3N3b3JkQmxvYikpCiAg ICAgICAgIHJldHVybiBDcmVkZW50aWFsKCk7CiAgICAgcmV0dXJuIENyZWRlbnRpYWwodXNlcm5h bWUsIGRlY3J5cHRlZFN0cmluZyhwYXNzd29yZEJsb2IuY19zdHIoKSksIENyZWRlbnRpYWxQZXJz aXN0ZW5jZVBlcm1hbmVudCk7CiB9CkBAIC00NjksNiArNDcxLDE1IEBAIFN0cmluZyBDcmVkZW50 aWFsQmFja2luZ1N0b3JlOjpkZWNyeXB0ZWRTdHJpbmcoY29uc3QgU3RyaW5nJiBjaXBoZXJUZXh0 KSBjb25zdAogICAgIHJldHVybiBTdHJpbmcocGxhaW5UZXh0LmNfc3RyKCkpOwogfQogCitCbGFj a0JlcnJ5OjpQbGF0Zm9ybTo6Q2VydE1ncldyYXBwZXIqIENyZWRlbnRpYWxCYWNraW5nU3RvcmU6 OmNlcnRNZ3JXcmFwcGVyKCkKK3sKKyAgICBpZiAoIW1fY2VydE1ncldyYXBwZXIpCisgICAgICAg IG1fY2VydE1ncldyYXBwZXIgPSBuZXcgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkNlcnRNZ3JXcmFw cGVyKCk7CisKKyAgICByZXR1cm4gbV9jZXJ0TWdyV3JhcHBlcjsKK30KKworCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCiAKICNlbmRpZiAvLyBFTkFCTEUoQkxBQ0tCRVJSWV9DUkVERU5USUFMX1BF UlNJU1QpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2JsYWNr YmVycnkvQ3JlZGVudGlhbEJhY2tpbmdTdG9yZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9ibGFja2JlcnJ5L0NyZWRlbnRpYWxCYWNraW5nU3RvcmUuaAppbmRleCAxMmFmMTNj Li40NzFhMDY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Js YWNrYmVycnkvQ3JlZGVudGlhbEJhY2tpbmdTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvYmxhY2tiZXJyeS9DcmVkZW50aWFsQmFja2luZ1N0b3JlLmgKQEAgLTI0 LDYgKzI0LDEyIEBACiAjaW5jbHVkZSAiQ3JlZGVudGlhbC5oIgogI2luY2x1ZGUgIlNRTGl0ZURh dGFiYXNlLmgiCiAKK25hbWVzcGFjZSBCbGFja0JlcnJ5IHsKK25hbWVzcGFjZSBQbGF0Zm9ybSB7 CitjbGFzcyBDZXJ0TWdyV3JhcHBlcjsKK30KK30KKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBj bGFzcyBLVVJMOwpAQCAtNTMsNiArNTksOCBAQCBwcml2YXRlOgogICAgIFN0cmluZyBlbmNyeXB0 ZWRTdHJpbmcoY29uc3QgU3RyaW5nJiBwbGFpblRleHQpIGNvbnN0OwogICAgIFN0cmluZyBkZWNy eXB0ZWRTdHJpbmcoY29uc3QgU3RyaW5nJiBjaXBoZXJUZXh0KSBjb25zdDsKIAorICAgIEJsYWNr QmVycnk6OlBsYXRmb3JtOjpDZXJ0TWdyV3JhcHBlciogY2VydE1ncldyYXBwZXIoKTsKKwogICAg IFNRTGl0ZURhdGFiYXNlIG1fZGF0YWJhc2U7CiAgICAgU1FMaXRlU3RhdGVtZW50KiBtX2FkZExv Z2luU3RhdGVtZW50OwogICAgIFNRTGl0ZVN0YXRlbWVudCogbV91cGRhdGVMb2dpblN0YXRlbWVu dDsKQEAgLTY1LDcgKzczLDcgQEAgcHJpdmF0ZToKICAgICBTUUxpdGVTdGF0ZW1lbnQqIG1fZ2V0 TmV2ZXJSZW1lbWJlclN0YXRlbWVudDsKICAgICBTUUxpdGVTdGF0ZW1lbnQqIG1fcmVtb3ZlTmV2 ZXJSZW1lbWJlclN0YXRlbWVudDsKIAotICAgIGJvb2wgbV91c2luZ0NlcnRNYW5hZ2VyOworICAg IEJsYWNrQmVycnk6OlBsYXRmb3JtOjpDZXJ0TWdyV3JhcHBlciogbV9jZXJ0TWdyV3JhcHBlcjsK IH07CiAKIENyZWRlbnRpYWxCYWNraW5nU3RvcmUmIGNyZWRlbnRpYWxCYWNraW5nU3RvcmUoKTsK