132586 2014-05-05 16:03:00 -0700 Add SPI to provide the WebCrypto master key 2014-05-05 16:10:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1006771 0 andersca 2014-05-05 16:03:00 -0700 Add SPI to provide the WebCrypto master key 1006772 1 230865 andersca 2014-05-05 16:04:25 -0700 Created attachment 230865 Patch 1006774 2 andersca 2014-05-05 16:10:25 -0700 Committed r168324: <http://trac.webkit.org/changeset/168324> 230865 2014-05-05 16:04:25 -0700 2014-05-05 16:08:43 -0700 Patch bug-132586-20140505230403.patch text/plain 9479 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTY4MzA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzcwOTA2NThhOWQyYzk1 MjY0MGVmNGUwOWQxYzA5OTczMWE4M2FhZi4uNmJlNWExODQyZjllMjc0MDI5NWUyYTAyMmIxYzc5 NWYzNTdjZTAwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTA1LTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIFNQSSB0byBw cm92aWRlIHRoZSBXZWJDcnlwdG8gbWFzdGVyIGtleQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMyNTg2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8x NjA5MTQ2MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQVBJTG9hZGVyQ2xpZW50Lmg6CisgICAgICAgIChBUEk6OkxvYWRl ckNsaWVudDo6d2ViQ3J5cHRvTWFzdGVyS2V5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0Mv V0tQYWdlLmNwcDoKKyAgICAgICAgKFdLUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW06CisgICAgICAgIChXZWJLaXQ6Ok5hdmln YXRpb25TdGF0ZTo6c2V0TmF2aWdhdGlvbkRlbGVnYXRlKToKKyAgICAgICAgKFdlYktpdDo6TmF2 aWdhdGlvblN0YXRlOjpMb2FkZXJDbGllbnQ6OndlYkNyeXB0b01hc3RlcktleSk6CisgICAgICAg ICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6d3JhcENyeXB0b0tleSk6CisKIDIwMTQtMDUtMDUgIFRpbSBIb3J0b24gIDx0aW1vdGh5 X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIGEgbGF5ZXIgZGVsZWdhdGUgaW5zdGVh ZCBvZiB3ZWJfZGlzYWJsZUFsbEFjdGlvbnMgd2hlcmV2ZXIgcG9zc2libGUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJTG9hZGVyQ2xpZW50LmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSUxvYWRlckNsaWVudC5oCmluZGV4IDNiOTdiMzg3N2Iw YTljZjcwYWMyOTkzNzZlOTY0Mjg2MGJjZmJiNzEuLmJhN2MwODQzMzJhOWZmYjE4Y2ZkZTk5ZmU5 ZTFjOWUwM2Y3ZjNiYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv QVBJTG9hZGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElM b2FkZXJDbGllbnQuaApAQCAtMjYsNiArMjYsNyBAQAogI2lmbmRlZiBBUElMb2FkZXJDbGllbnRf aAogI2RlZmluZSBBUElMb2FkZXJDbGllbnRfaAogCisjaW5jbHVkZSAiQVBJRGF0YS5oIgogI2lu Y2x1ZGUgIlBsdWdpbk1vZHVsZUluZm8uaCIKICNpbmNsdWRlICJTYW1lRG9jdW1lbnROYXZpZ2F0 aW9uVHlwZS5oIgogI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVMb2FkZXJUeXBlcy5oPgpAQCAtOTEs NiArOTIsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZUJhY2tGb3J3YXJk TGlzdChXZWJLaXQ6OldlYlBhZ2VQcm94eSosIFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0SXRl bSosIFZlY3RvcjxSZWZQdHI8V2ViS2l0OjpXZWJCYWNrRm9yd2FyZExpc3RJdGVtPj4pIHsgfQog ICAgIHZpcnR1YWwgdm9pZCB3aWxsR29Ub0JhY2tGb3J3YXJkTGlzdEl0ZW0oV2ViS2l0OjpXZWJQ YWdlUHJveHkqLCBXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qLCBBUEk6Ok9iamVjdCop IHsgfQogCisgICAgdmlydHVhbCBQYXNzUmVmUHRyPERhdGE+IHdlYkNyeXB0b01hc3RlcktleShX ZWJLaXQ6OldlYlBhZ2VQcm94eSYpIHsgcmV0dXJuIG51bGxwdHI7IH0KKwogI2lmIEVOQUJMRShO RVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgIHZpcnR1YWwgV2ViS2l0OjpQbHVnaW5Nb2R1bGVMb2Fk UG9saWN5IHBsdWdpbkxvYWRQb2xpY3koV2ViS2l0OjpXZWJQYWdlUHJveHkqLCBXZWJLaXQ6OlBs dWdpbk1vZHVsZUxvYWRQb2xpY3kgY3VycmVudFBsdWdpbkxvYWRQb2xpY3ksIFdlYktpdDo6SW1t dXRhYmxlRGljdGlvbmFyeSosIFdURjo6U3RyaW5nJiAvKiB1bmF2YWlsYWJpbGl0eURlc2NyaXB0 aW9uICovKSB7IHJldHVybiBjdXJyZW50UGx1Z2luTG9hZFBvbGljeTsgfQogICAgIHZpcnR1YWwg dm9pZCBkaWRGYWlsVG9Jbml0aWFsaXplUGx1Z2luKFdlYktpdDo6V2ViUGFnZVByb3h5KiwgV2Vi S2l0OjpJbW11dGFibGVEaWN0aW9uYXJ5KikgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQy9XS1BhZ2UuY3BwCmluZGV4IGNhZDQwYjQ1ZTZjMTFjOWE2M2YxNjljNjkwYjAzMDkwODhm OTU3OWMuLmI2NTVmMmExYjMwOTkwNjQzOThjYmQyNzZmMWJlYTNkN2RjZTRhMjMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCkBAIC00Myw2ICs0Myw3IEBACiAj aW5jbHVkZSAiV0tQYWdlUG9saWN5Q2xpZW50SW50ZXJuYWwuaCIKICNpbmNsdWRlICJXS1BsdWdp bkluZm9ybWF0aW9uLmgiCiAjaW5jbHVkZSAiV2ViQmFja0ZvcndhcmRMaXN0LmgiCisjaW5jbHVk ZSAiV2ViQ29udGV4dC5oIgogI2luY2x1ZGUgIldlYkZvcm1DbGllbnQuaCIKICNpbmNsdWRlICJX ZWJQYWdlTWVzc2FnZXMuaCIKICNpbmNsdWRlICJXZWJQYWdlUHJveHkuaCIKQEAgLTk3Myw2ICs5 NzQsMTEgQEAgdm9pZCBXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50KFdLUGFnZVJlZiBwYWdlUmVm LCBjb25zdCBXS1BhZ2VMb2FkZXJDbGllbnRCYXNlKgogICAgICAgICAgICAgICAgIG1fY2xpZW50 LndpbGxHb1RvQmFja0ZvcndhcmRMaXN0SXRlbSh0b0FQSShwYWdlKSwgdG9BUEkoaXRlbSksIHRv QVBJKHVzZXJEYXRhKSwgbV9jbGllbnQuYmFzZS5jbGllbnRJbmZvKTsKICAgICAgICAgfQogCisg ICAgICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxBUEk6OkRhdGE+IHdlYkNyeXB0b01hc3RlcktleShX ZWJQYWdlUHJveHkmIHBhZ2UpIG92ZXJyaWRlCisgICAgICAgIHsKKyAgICAgICAgICAgIHJldHVy biBwYWdlLnByb2Nlc3MoKS5jb250ZXh0KCkuY2xpZW50KCkuY29weVdlYkNyeXB0b01hc3Rlcktl eSgmcGFnZS5wcm9jZXNzKCkuY29udGV4dCgpKTsKKyAgICAgICAgfQorCiAjaWYgRU5BQkxFKE5F VFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRGYWlsVG9Jbml0aWFs aXplUGx1Z2luKFdlYlBhZ2VQcm94eSogcGFnZSwgSW1tdXRhYmxlRGljdGlvbmFyeSogcGx1Z2lu SW5mb3JtYXRpb24pIG92ZXJyaWRlCiAgICAgICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmggYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLTmF2aWdhdGlvbkRlbGVnYXRlUHJp dmF0ZS5oCmluZGV4IDI4NTdmM2MyODFkOWU4YzBkY2VlZjkwZjIxMTA4MTc4OTk2ZjY3ZjcuLmNj MjFjOGIzM2NjZTA2NjVmM2VhNzdlMzQyODM5NzA4NTEwZDFlN2IgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRl LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25E ZWxlZ2F0ZVByaXZhdGUuaApAQCAtNDUsNiArNDUsOCBAQCBzdGF0aWMgY29uc3QgV0tOYXZpZ2F0 aW9uUmVzcG9uc2VQb2xpY3kgX1dLTmF2aWdhdGlvblJlc3BvbnNlUG9saWN5QmVjb21lRG93bmxv YQogCiAtICh2b2lkKV93ZWJWaWV3V2ViUHJvY2Vzc0RpZENyYXNoOihXS1dlYlZpZXcgKil3ZWJW aWV3OwogCistIChOU0RhdGEgKilfd2ViQ3J5cHRvTWFzdGVyS2V5Rm9yV2ViVmlldzooV0tXZWJW aWV3ICopd2ViVmlldzsKKwogI2lmIFRBUkdFVF9PU19JUEhPTkUKIC0gKHZvaWQpX3dlYlZpZXc6 KFdLV2ViVmlldyAqKXdlYlZpZXcgZGlkU3RhcnRMb2FkRm9yUXVpY2tMb29rRG9jdW1lbnRJbk1h aW5GcmFtZVdpdGhGaWxlTmFtZTooTlNTdHJpbmcgKilmaWxlTmFtZSB1dGk6KE5TU3RyaW5nICop dXRpOwogLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWRGaW5pc2hMb2Fk Rm9yUXVpY2tMb29rRG9jdW1lbnRJbk1haW5GcmFtZTooTlNEYXRhICopZG9jdW1lbnREYXRhOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0 ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oCmlu ZGV4IDQ4MjRjOTRmZTEyMGE1ZmE2MmM5MzkyYTBjODEyMjA1NzEzY2IwNDMuLjkyNGU4NWNhNDJk YzBjOWFmMWM2ZjI1MmU1MTU5OWE2MDM0MTM1NjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmgKQEAgLTEwMyw2ICsxMDMsNyBAQCBwcml2 YXRlOgogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxl bmdlSW5GcmFtZShXZWJLaXQ6OldlYlBhZ2VQcm94eSosIFdlYktpdDo6V2ViRnJhbWVQcm94eSos IFdlYktpdDo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2VQcm94eSopIG92ZXJyaWRlOwogICAgICAg ICB2aXJ0dWFsIHZvaWQgcHJvY2Vzc0RpZENyYXNoKFdlYktpdDo6V2ViUGFnZVByb3h5Kikgb3Zl cnJpZGU7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRDaGFuZ2VCYWNrRm9yd2FyZExpc3QoV2Vi S2l0OjpXZWJQYWdlUHJveHkqLCBXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW0qIGFkZGVk SXRlbSwgVmVjdG9yPFJlZlB0cjxXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW0+PiByZW1v dmVkSXRlbXMpIG92ZXJyaWRlOworICAgICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8QVBJOjpEYXRh PiB3ZWJDcnlwdG9NYXN0ZXJLZXkoV2ViS2l0OjpXZWJQYWdlUHJveHkmKSBvdmVycmlkZTsKICNp ZiBVU0UoUVVJQ0tfTE9PSykKICAgICAgICAgdmlydHVhbCB2b2lkIGRpZFN0YXJ0TG9hZEZvclF1 aWNrTG9va0RvY3VtZW50SW5NYWluRnJhbWUoY29uc3QgV1RGOjpTdHJpbmcmIGZpbGVOYW1lLCBj b25zdCBXVEY6OlN0cmluZyYgdXRpKSBvdmVycmlkZTsKICAgICAgICAgdmlydHVhbCB2b2lkIGRp ZEZpbmlzaExvYWRGb3JRdWlja0xvb2tEb2N1bWVudEluTWFpbkZyYW1lKGNvbnN0IFdlYktpdDo6 UXVpY2tMb29rRG9jdW1lbnREYXRhJikgb3ZlcnJpZGU7CkBAIC0xNDIsNiArMTQzLDcgQEAgcHJp dmF0ZToKICAgICAgICAgYm9vbCB3ZWJWaWV3Q2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rp b25TcGFjZSA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld0RpZFJlY2VpdmVBdXRoZW50aWNhdGlv bkNoYWxsZW5nZSA6IDE7CiAgICAgICAgIGJvb2wgd2ViVmlld1dlYlByb2Nlc3NEaWRDcmFzaCA6 IDE7CisgICAgICAgIGJvb2wgd2ViQ3J5cHRvTWFzdGVyS2V5Rm9yV2ViVmlldyA6IDE7CiAjaWYg VVNFKFFVSUNLX0xPT0spCiAgICAgICAgIGJvb2wgd2ViVmlld0RpZFN0YXJ0TG9hZEZvclF1aWNr TG9va0RvY3VtZW50SW5NYWluRnJhbWUgOiAxOwogICAgICAgICBib29sIHdlYlZpZXdEaWRGaW5p c2hMb2FkRm9yUXVpY2tMb29rRG9jdW1lbnRJbk1haW5GcmFtZSA6IDE7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQppbmRleCBhNjE2ZTQ4 ZDNkNzgzZDYyZjdlMmZkOWJmOWU5ZGI1YjE1MGZiYzkzLi44MTVmNmFlMmZjYjZjNTA1Y2YzZjJm MWMzMzY3NzMxY2ZkNWQ0ZmRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Q29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9D b2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KQEAgLTEyNyw2ICsxMjcsNyBAQCB2b2lkIE5hdmlnYXRp b25TdGF0ZTo6c2V0TmF2aWdhdGlvbkRlbGVnYXRlKGlkIDxXS05hdmlnYXRpb25EZWxlZ2F0ZT4g ZGVsZWdhdGUpCiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdDYW5BdXRo ZW50aWNhdGVBZ2FpbnN0UHJvdGVjdGlvblNwYWNlID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxl Y3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6Y2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25T cGFjZTopXTsKICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RpZFJlY2Vp dmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKF93ZWJWaWV3OmRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTopXTsK ICAgICBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld1dlYlByb2Nlc3NEaWRDcmFz aCA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3V2ViUHJv Y2Vzc0RpZENyYXNoOildOworICAgIG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJDcnlw dG9NYXN0ZXJLZXlGb3JXZWJWaWV3ID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2Vs ZWN0b3IoX3dlYkNyeXB0b01hc3RlcktleUZvcldlYlZpZXc6KV07CiAjaWYgVVNFKFFVSUNLX0xP T0spCiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRTdGFydExvYWRG b3JRdWlja0xvb2tEb2N1bWVudEluTWFpbkZyYW1lID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxl Y3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6ZGlkU3RhcnRMb2FkRm9yUXVpY2tMb29rRG9jdW1lbnRJ bk1haW5GcmFtZVdpdGhGaWxlTmFtZTp1dGk6KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVN ZXRob2RzLndlYlZpZXdEaWRGaW5pc2hMb2FkRm9yUXVpY2tMb29rRG9jdW1lbnRJbk1haW5GcmFt ZSA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmRpZEZp bmlzaExvYWRGb3JRdWlja0xvb2tEb2N1bWVudEluTWFpbkZyYW1lOildOwpAQCAtNTc1LDYgKzU3 NiwyMiBAQCB2b2lkIE5hdmlnYXRpb25TdGF0ZTo6TG9hZGVyQ2xpZW50OjpkaWRDaGFuZ2VCYWNr Rm9yd2FyZExpc3QoV2ViS2l0OjpXZWJQYWdlUHJveAogICAgIFtbTlNOb3RpZmljYXRpb25DZW50 ZXIgZGVmYXVsdENlbnRlcl0gcG9zdE5vdGlmaWNhdGlvbk5hbWU6X1dLQmFja0ZvcndhcmRMaXN0 RGlkQ2hhbmdlTm90aWZpY2F0aW9uIG9iamVjdDp3cmFwcGVyKG1fbmF2aWdhdGlvblN0YXRlLm1f d2ViVmlldy0+X3BhZ2UtPmJhY2tGb3J3YXJkTGlzdCgpKV07CiB9CiAKK1Bhc3NSZWZQdHI8QVBJ OjpEYXRhPiBOYXZpZ2F0aW9uU3RhdGU6OkxvYWRlckNsaWVudDo6d2ViQ3J5cHRvTWFzdGVyS2V5 KFdlYktpdDo6V2ViUGFnZVByb3h5JikKK3sKKyAgICBpZiAoIW1fbmF2aWdhdGlvblN0YXRlLm1f bmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJDcnlwdG9NYXN0ZXJLZXlGb3JXZWJWaWV3KQor ICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIGF1dG8gbmF2aWdhdGlvbkRlbGVnYXRlID0g bV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCk7CisgICAgaWYgKCFu YXZpZ2F0aW9uRGVsZWdhdGUpCisgICAgICAgIHJldHVybiBudWxscHRyOworCisgICAgUmV0YWlu UHRyPE5TRGF0YT4gZGF0YSA9IFtzdGF0aWNfY2FzdDxpZCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGVQ cml2YXRlPj4obmF2aWdhdGlvbkRlbGVnYXRlLmdldCgpKSBfd2ViQ3J5cHRvTWFzdGVyS2V5Rm9y V2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5tX3dlYlZpZXddOworCisgICAgcmV0dXJuIEFQSTo6 RGF0YTo6Y3JlYXRlV2l0aG91dENvcHlpbmcoKGNvbnN0IHVuc2lnbmVkIGNoYXIqKVtkYXRhIGJ5 dGVzXSwgW2RhdGEgbGVuZ3RoXSwgW10gKHVuc2lnbmVkIGNoYXIqLCBjb25zdCB2b2lkKiBkYXRh KSB7CisgICAgICAgIFsoTlNEYXRhICopZGF0YSByZWxlYXNlXTsKKyAgICB9LCBkYXRhLmxlYWtS ZWYoKSk7Cit9CisKICNpZiBVU0UoUVVJQ0tfTE9PSykKIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpM b2FkZXJDbGllbnQ6OmRpZFN0YXJ0TG9hZEZvclF1aWNrTG9va0RvY3VtZW50SW5NYWluRnJhbWUo Y29uc3QgU3RyaW5nJiBmaWxlTmFtZSwgY29uc3QgU3RyaW5nJiB1dGkpCiB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDQ2NWRlZjNlYWNkZjk1ZTkyOTZi YjkyNTNjMTViMDEyZjgyMTVkMTMuLjg4NTI4OThkZDE0YjI3MGQ2ZDgyMzQ2YTlkZDRmYmJkMmRk NzU0NTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC00 ODE4LDggKzQ4MTgsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2V0U2Nyb2xsUGlubmluZ0JlaGF2 aW9yKFNjcm9sbFBpbm5pbmdCZWhhdmlvciBwaW5uaW5nKQogdm9pZCBXZWJQYWdlUHJveHk6Ondy YXBDcnlwdG9LZXkoY29uc3QgVmVjdG9yPHVpbnQ4X3Q+JiBrZXksIGJvb2wmIHN1Y2NlZWRlZCwg VmVjdG9yPHVpbnQ4X3Q+JiB3cmFwcGVkS2V5KQogewogICAgIFZlY3Rvcjx1aW50OF90PiBtYXN0 ZXJLZXk7Ci0gICAgUmVmUHRyPEFQSTo6RGF0YT4ga2V5RGF0YSA9IG1fcHJvY2Vzcy0+Y29udGV4 dCgpLmNsaWVudCgpLmNvcHlXZWJDcnlwdG9NYXN0ZXJLZXkoJm1fcHJvY2Vzcy0+Y29udGV4dCgp KTsKLSAgICBpZiAoa2V5RGF0YSkKKworICAgIGlmIChSZWZQdHI8QVBJOjpEYXRhPiBrZXlEYXRh ID0gbV9sb2FkZXJDbGllbnQtPndlYkNyeXB0b01hc3RlcktleSgqdGhpcykpCiAgICAgICAgIG1h c3RlcktleSA9IGtleURhdGEtPmRhdGFSZWZlcmVuY2UoKS52ZWN0b3IoKTsKICAgICBlbHNlIGlm ICghZ2V0RGVmYXVsdFdlYkNyeXB0b01hc3RlcktleShtYXN0ZXJLZXkpKSB7CiAgICAgICAgIHN1 Y2NlZWRlZCA9IGZhbHNlOwo=