141767 2015-02-18 13:44:51 -0800 Rename LocalizedStringsMac.cpp to LocalizedStringsCocoa.mm 2015-02-18 14:26:03 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1070214 0 andersca 2015-02-18 13:44:51 -0800 Rename LocalizedStringsMac.cpp to LocalizedStringsCocoa.mm 1070216 1 246844 andersca 2015-02-18 13:48:09 -0800 Created attachment 246844 Patch 1070231 2 andersca 2015-02-18 14:26:03 -0800 Committed r180297: <http://trac.webkit.org/changeset/180297> 246844 2015-02-18 13:48:09 -0800 2015-02-18 14:04:27 -0800 Patch bug-141767-20150218134802.patch text/plain 13931 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwMjY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjllOGJlOWY5YTdmZDA1 MzlhZjI3NjE2MzcwMDU0MTJjMTA0NzAyZi4uZTU5N2Q4YmRmOTliMmFiM2U0N2ZkNTBmYWFiNjAx ZDU2MzQwNzQwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE1LTAyLTE4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIExvY2Fs aXplZFN0cmluZ3NNYWMuY3BwIHRvIExvY2FsaXplZFN0cmluZ3NDb2NvYS5tbQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxNzY3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxzbywgbW92ZSBpdCB0byBw bGF0Zm9ybS9jb2NvYSBpbnN0ZWFkIG9mIHBsYXRmb3JtL21hYy4KKworICAgICAgICAqIFdlYkNv cmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBwbGF0Zm9ybS9jb2NvYS9M b2NhbGl6ZWRTdHJpbmdzQ29jb2EubW06IFJlbmFtZWQgZnJvbSBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9tYWMvTG9jYWxpemVkU3RyaW5nc01hYy5jcHAuCisKIDIwMTUtMDItMTcgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgQVBJIGZvciBjbGVh cmluZyBpbi1tZW1vcnkgY2FjaGVzIHRvIFdLV2Vic2l0ZURhdGFTdG9yZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IGZiMDNhODE4 ODg4Yjc0NDlmZDBjYWUyZmU2MzI4NDQ1YzE2MGM3NzMuLjQ3ZWIxYThmNjI0NTQ1NDExZDhhMzY4 YTRiOTZjZmZjYjhlYzJlNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNv ZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTY4OCw2ICs2ODgsNyBAQAogCQkxQTM3NjM2QjFBMkU2 OEJCMDA5QTdFRTIgLyogU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyLmNwcCBpbiBTb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBMzc2MzY5MUEyRTY4QkIwMDlBN0VF MiAvKiBTdG9yYWdlTmFtZXNwYWNlUHJvdmlkZXIuY3BwICovOyB9OwogCQkxQTM3NjM2QzFBMkU2 OEJCMDA5QTdFRTIgLyogU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyLmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQTM3NjM2QTFBMkU2OEJCMDA5QTdFRTIg LyogU3RvcmFnZU5hbWVzcGFjZVByb3ZpZGVyLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMg PSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJMUEzRkY5QzMxNTI2NTM1OTAwMjI4OEExIC8qIFJlbmRl ck5hbWVkRmxvd1RocmVhZC5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSBCQzg1RjIzRTE1MTkxODczMDBCQzE3QkUgLyogUmVuZGVyTmFtZWRGbG93VGhy ZWFkLmNwcCAqLzsgfTsKKwkJMUE0ODMyQjMxQTk1M0JBNjAwOEI0REZFIC8qIExvY2FsaXplZFN0 cmluZ3NDb2NvYS5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJl ZiA9IDFBNDgzMkIyMUE5NTNCQTYwMDhCNERGRSAvKiBMb2NhbGl6ZWRTdHJpbmdzQ29jb2EubW0g Ki87IH07CiAJCTFBNDk0QkZBMEExMjJGNDQwMEZEQUZDMSAvKiBKU0hUTUxFbGVtZW50LmNwcCBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNDk0QkY4MEEx MjJGNDQwMEZEQUZDMSAvKiBKU0hUTUxFbGVtZW50LmNwcCAqLzsgfTsKIAkJMUE0OTRCRkIwQTEy MkY0NDAwRkRBRkMxIC8qIEpTSFRNTEVsZW1lbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNDk0QkY5MEExMjJGNDQwMEZEQUZDMSAvKiBKU0hUTUxF bGVtZW50LmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsK IAkJMUE0OTRFMzQwQTEyMzU4QjAwRkRBRkMxIC8qIEpTSFRNTERvY3VtZW50LmNwcCBpbiBTb3Vy Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNDk0RTMyMEExMjM1OEEw MEZEQUZDMSAvKiBKU0hUTUxEb2N1bWVudC5jcHAgKi87IH07CkBAIC01MDk2LDcgKzUwOTcsNiBA QAogCQlCQzIzRUU5MjBEQUVEMkJDMDA5RkRDOTEgLyogQ1NTSW1hZ2VHZW5lcmF0b3JWYWx1ZS5o IGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQkMyM0VFOTEw REFFRDJCQzAwOUZEQzkxIC8qIENTU0ltYWdlR2VuZXJhdG9yVmFsdWUuaCAqLzsgc2V0dGluZ3Mg PSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlCQzIzRjBEQjBEQUZGNEE0MDA5 RkRDOTEgLyogR2VuZXJhdGVkSW1hZ2UuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IEJDMjNGMERBMERBRkY0QTQwMDlGREM5MSAvKiBHZW5lcmF0ZWRJbWFn ZS5oICovOyB9OwogCQlCQzI0NDFDNDBFOEI2NUQwMDA1NTMyMEYgLyogU2Nyb2xsVmlldy5jcHAg aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBCQzI0NDFDMzBF OEI2NUQwMDA1NTMyMEYgLyogU2Nyb2xsVmlldy5jcHAgKi87IH07Ci0JCUJDMjVCNTJBMTMxQzZE MzkwMDE4MEUxMCAvKiBMb2NhbGl6ZWRTdHJpbmdzTWFjLmNwcCBpbiBTb3VyY2VzICovID0ge2lz YSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEJDMjVCNTI4MTMxQzZEMzkwMDE4MEUxMCAvKiBM b2NhbGl6ZWRTdHJpbmdzTWFjLmNwcCAqLzsgfTsKIAkJQkMyNzRCMkYxNDBFQkVCMjAwRUFERkE2 IC8qIENTU0JvcmRlckltYWdlU2xpY2VWYWx1ZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gQkMyNzRCMkUxNDBFQkVCMjAwRUFERkE2IC8qIENTU0JvcmRl ckltYWdlU2xpY2VWYWx1ZS5oICovOyB9OwogCQlCQzI3NEIzMTE0MEVCRUQ4MDBFQURGQTYgLyog Q1NTQm9yZGVySW1hZ2VTbGljZVZhbHVlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IEJDMjc0QjMwMTQwRUJFRDgwMEVBREZBNiAvKiBDU1NCb3JkZXJJ bWFnZVNsaWNlVmFsdWUuY3BwICovOyB9OwogCQlCQzI3NUI3OTExQzVEMUMzMDBDOTIwNkMgLyog SlNXZWJLaXRQb2ludEN1c3RvbS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSBCQzI3NUI3ODExQzVEMUMzMDBDOTIwNkMgLyogSlNXZWJLaXRQb2ludEN1 c3RvbS5jcHAgKi87IH07CkBAIC03NjgyLDYgKzc2ODIsNyBAQAogCQkxQTM1ODZERTE1MjY0QzQ1 MDAyMkE2NTkgLyogUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkLmggKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmMuaDsgcGF0aCA9IFJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQkxQTM3NjM2OTFBMkU2OEJCMDA5QTdFRTIgLyogU3RvcmFn ZU5hbWVzcGFjZVByb3ZpZGVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0 aCA9IFN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CiAJCTFBMzc2MzZBMUEyRTY4QkIwMDlBN0VFMiAvKiBTdG9yYWdlTmFtZXNwYWNlUHJvdmlk ZXIuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gU3RvcmFnZU5hbWVzcGFjZVBy b3ZpZGVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTFBNDgzMkIyMUE5NTNCQTYw MDhCNERGRSAvKiBMb2NhbGl6ZWRTdHJpbmdzQ29jb2EubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5vYmpjcHA7IHBhdGggPSBMb2NhbGl6ZWRTdHJpbmdzQ29jb2EubW07IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTFBNDk0QkJCMEExMjJEQ0QwMEZEQUZDMSAvKiBIVE1MRWxlbWVu dC5pZGwgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSB0ZXh0OyBwYXRoID0gSFRNTEVsZW1lbnQuaWRsOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQkxQTQ5NEJGODBBMTIyRjQ0MDBGREFGQzEgLyogSlNIVE1MRWxl bWVudC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSlNIVE1MRWxl bWVudC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBNDk0QkY5MEExMjJGNDQw MEZEQUZDMSAvKiBKU0hUTUxFbGVtZW50LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBh dGggPSBKU0hUTUxFbGVtZW50Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0xMjUw MCw3ICsxMjUwMSw2IEBACiAJCUJDMjNFRTkxMERBRUQyQkMwMDlGREM5MSAvKiBDU1NJbWFnZUdl bmVyYXRvclZhbHVlLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5n ID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IENTU0ltYWdl R2VuZXJhdG9yVmFsdWUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQkMyM0YwREEw REFGRjRBNDAwOUZEQzkxIC8qIEdlbmVyYXRlZEltYWdlLmggKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IEdlbmVyYXRlZEltYWdlLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCUJDMjQ0MUMzMEU4QjY1RDAwMDU1MzIwRiAvKiBTY3JvbGxWaWV3LmNwcCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFNjcm9sbFZpZXcuY3BwOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwotCQlCQzI1QjUyODEzMUM2RDM5MDAxODBFMTAgLyogTG9jYWxpemVkU3Ry aW5nc01hYy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBMb2NhbGl6 ZWRTdHJpbmdzTWFjLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQkMyNzRCMkUx NDBFQkVCMjAwRUFERkE2IC8qIENTU0JvcmRlckltYWdlU2xpY2VWYWx1ZS5oICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0g c291cmNlY29kZS5jLmg7IHBhdGggPSBDU1NCb3JkZXJJbWFnZVNsaWNlVmFsdWUuaDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQkMyNzRCMzAxNDBFQkVEODAwRUFERkE2IC8qIENTU0Jv cmRlckltYWdlU2xpY2VWYWx1ZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh dGggPSBDU1NCb3JkZXJJbWFnZVNsaWNlVmFsdWUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQlCQzI3NUI3ODExQzVEMUMzMDBDOTIwNkMgLyogSlNXZWJLaXRQb2ludEN1c3RvbS5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBKU1dlYktpdFBvaW50Q3Vz dG9tLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTE2NTI5LDcgKzE2NTI5LDYg QEAKIAkJCQk5MzUyMDg0NDA5QkQ0M0I5MDBGMjAzOEQgLyogTGFuZ3VhZ2UubW0gKi8sCiAJCQkJ MDZFODFFRDYwQUI1RDVFOTAwQzg3ODM3IC8qIExvY2FsQ3VycmVudEdyYXBoaWNzQ29udGV4dC5o ICovLAogCQkJCTA2RTgxRUVCMEFCNURBOTcwMEM4NzgzNyAvKiBMb2NhbEN1cnJlbnRHcmFwaGlj c0NvbnRleHQubW0gKi8sCi0JCQkJQkMyNUI1MjgxMzFDNkQzOTAwMTgwRTEwIC8qIExvY2FsaXpl ZFN0cmluZ3NNYWMuY3BwICovLAogCQkJCTE0MDI2NDVEMEFGREMxOUIwMDU5MTlFMiAvKiBMb2dn aW5nTWFjLm1tICovLAogCQkJCUJDNzcyQzVEMEM0RUIzNDQwMDgzMjg1RiAvKiBNSU1FVHlwZVJl Z2lzdHJ5TWFjLm1tICovLAogCQkJCTkzNTAwRjMxMTNGREUzQkUwMDk5RUMyNCAvKiBOU1Njcm9s bGVySW1wRGV0YWlscy5oICovLApAQCAtMTg2NDgsNiArMTg2NDcsNyBAQAogCQkJY2hpbGRyZW4g PSAoCiAJCQkJNUQ4QzREQkQxNDI4MjIyQzAwMjZDRTcyIC8qIERpc3BsYXlTbGVlcERpc2FibGVy Q29jb2EuY3BwICovLAogCQkJCTVEOEM0REJFMTQyODIyMkMwMDI2Q0U3MiAvKiBEaXNwbGF5U2xl ZXBEaXNhYmxlckNvY29hLmggKi8sCisJCQkJMUE0ODMyQjIxQTk1M0JBNjAwOEI0REZFIC8qIExv Y2FsaXplZFN0cmluZ3NDb2NvYS5tbSAqLywKIAkJCQlBNUM5NzRDRjExNDg1RkYxMDA2NkYyQUIg LyogS2V5RXZlbnRDb2NvYS5oICovLAogCQkJCUE1Qzk3NEQwMTE0ODVGRjEwMDY2RjJBQiAvKiBL ZXlFdmVudENvY29hLm1tICovLAogCQkJCTFBMDQwOUYyMUE0MzY3NUMwMDlFNDdGMyAvKiBNYWNo U2VuZFJpZ2h0LmNwcCAqLywKQEAgLTI4OTU3LDcgKzI4OTU3LDYgQEAKIAkJCQk3NjMzQTcyNzEz RDhCMzNBMDA4NTAxQjYgLyogTG9jYWxlVG9TY3JpcHRNYXBwaW5nRGVmYXVsdC5jcHAgaW4gU291 cmNlcyAqLywKIAkJCQlBNTE2RThCODEzNkUwNERCMDA3NkMzQzAgLyogTG9jYWxpemVkRGF0ZUNh Y2hlLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJQzA0NkUxQUMxMjA4QTlGRTAwQkEyQ0Y3IC8qIExv Y2FsaXplZFN0cmluZ3MuY3BwIGluIFNvdXJjZXMgKi8sCi0JCQkJQkMyNUI1MkExMzFDNkQzOTAw MTgwRTEwIC8qIExvY2FsaXplZFN0cmluZ3NNYWMuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQkNF MUM0MUMwRDk4Mjk4MTAwM0IwMkYyIC8qIExvY2F0aW9uLmNwcCBpbiBTb3VyY2VzICovLAogCQkJ CUE4MjM5RTAwMDlCM0NGOEEwMEI2MDY0MSAvKiBMb2dnaW5nLmNwcCBpbiBTb3VyY2VzICovLAog CQkJCTE0MDI2NDVFMEFGREMxOUIwMDU5MTlFMiAvKiBMb2dnaW5nTWFjLm1tIGluIFNvdXJjZXMg Ki8sCkBAIC0yODk3Miw2ICsyODk3MSw3IEBACiAJCQkJMDVEOTEzQ0VFQUIyQTYwNTM0MjE4QUNG IC8qIE1hdGhNTE1lbmNsb3NlRWxlbWVudC5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlGQUJFNzJG RTEwNTlDMjExMDBEOTk5REQgLyogTWF0aE1MTmFtZXMuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJ RkVENDgzOTBDRUQ2NkMzMjU1RjcyQzU5IC8qIE1hdGhNTFNlbGVjdEVsZW1lbnQuY3BwIGluIFNv dXJjZXMgKi8sCisJCQkJMUE0ODMyQjMxQTk1M0JBNjAwOEI0REZFIC8qIExvY2FsaXplZFN0cmlu Z3NDb2NvYS5tbSBpbiBTb3VyY2VzICovLAogCQkJCUZBNjU0QTZCMTEwOEFCRUQwMDI2MTVFMCAv KiBNYXRoTUxUZXh0RWxlbWVudC5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk0OUQ1REMyQjBGNDIz QTczMDA4RjIwRkQgLyogTWF0cml4M0RUcmFuc2Zvcm1PcGVyYXRpb24uY3BwIGluIFNvdXJjZXMg Ki8sCiAJCQkJNDlFOTExQzYwRUY4NkQ0NzAwOUQwQ0FGIC8qIE1hdHJpeFRyYW5zZm9ybU9wZXJh dGlvbi5jcHAgaW4gU291cmNlcyAqLywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2NvY29hL0xvY2FsaXplZFN0cmluZ3NDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2NvY29hL0xvY2FsaXplZFN0cmluZ3NDb2NvYS5tbQpuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hZDMzNDMwYThh MzhmODY0ZWJmNTQwZjAwYzhjZDkwNjA0Yzg2MGM3Ci0tLSAvZGV2L251bGwKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvTG9jYWxpemVkU3RyaW5nc0NvY29hLm1tCkBAIC0wLDAg KzEsNTkgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTEsIDIwMTIgQXBwbGUgSW5jLiBBbGwg cmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUg cGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUg bWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRo ZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMg YW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBi aW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIg aW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlk ZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklE RUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBB TlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4g Tk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFC TEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExB UlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsg TE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJ T04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhF UiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBO RUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhF IFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVk ZSAiTG9jYWxpemVkU3RyaW5ncy5oIgorCisjaW5jbHVkZSA8Q29yZUZvdW5kYXRpb24vQ0ZCdW5k bGUuaD4KKyNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgorI2luY2x1ZGUgPHd0Zi9NYWluVGhy ZWFkLmg+CisjaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1dU RlN0cmluZy5oPgorCituYW1lc3BhY2UgV2ViQ29yZSB7CisKK1N0cmluZyBsb2NhbGl6ZWRTdHJp bmcoY29uc3QgY2hhcioga2V5KQoreworICAgIHN0YXRpYyBDRkJ1bmRsZVJlZiBidW5kbGUgPSBD RkJ1bmRsZUdldEJ1bmRsZVdpdGhJZGVudGlmaWVyKENGU1RSKCJjb20uYXBwbGUuV2ViQ29yZSIp KTsKKworI2lmICFQTEFURk9STShJT1MpCisgICAgLy8gQ2FuIGJlIGNhbGxlZCBvbiBhIGRpc3Bh dGNoIHF1ZXVlIHdoZW4gaW5pdGlhbGl6aW5nIHN0cmluZ3Mgb24gaU9TLgorICAgIC8vIFNlZSBM b2FkV2ViTG9jYWxpemVkU3RyaW5ncyBhbmQgPHJkYXI6Ly9wcm9ibGVtLzc5MDI0NzM+LgorICAg IEFTU0VSVChpc01haW5UaHJlYWQoKSk7CisjZW5kaWYKKworICAgIFJldGFpblB0cjxDRlN0cmlu Z1JlZj4ga2V5U3RyaW5nID0gYWRvcHRDRihDRlN0cmluZ0NyZWF0ZVdpdGhDU3RyaW5nTm9Db3B5 KDAsIGtleSwga0NGU3RyaW5nRW5jb2RpbmdVVEY4LCBrQ0ZBbGxvY2F0b3JOdWxsKSk7CisgICAg Q0ZTdHJpbmdSZWYgbm90Rm91bmQgPSBDRlNUUigibG9jYWxpemVkIHN0cmluZyBub3QgZm91bmQi KTsKKyAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IHJlc3VsdDsKKyAgICBpZiAoYnVuZGxlKSB7 CisgICAgICAgIHJlc3VsdCA9IGFkb3B0Q0YoQ0ZCdW5kbGVDb3B5TG9jYWxpemVkU3RyaW5nKGJ1 bmRsZSwga2V5U3RyaW5nLmdldCgpLCBub3RGb3VuZCwgMCkpOworICAgICAgICBBU1NFUlRfV0lU SF9NRVNTQUdFKHJlc3VsdC5nZXQoKSAhPSBub3RGb3VuZCwgImNvdWxkIG5vdCBmaW5kIGxvY2Fs aXphYmxlIHN0cmluZyAlcyBpbiBidW5kbGUiLCBrZXkpOworICAgIH0gZWxzZQorICAgICAgICBy ZXN1bHQgPSBub3RGb3VuZDsKKworICAgIHJldHVybiBTdHJpbmcocmVzdWx0LmdldCgpKTsKK30K KworfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWFjL0xvY2FsaXplZFN0cmluZ3NNYWMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWFjL0xvY2FsaXplZFN0cmluZ3NNYWMuY3BwCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NApp bmRleCBhZDMzNDMwYThhMzhmODY0ZWJmNTQwZjAwYzhjZDkwNjA0Yzg2MGM3Li4wMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9Mb2NhbGl6ZWRTdHJpbmdzTWFjLmNwcAorKysgL2Rldi9udWxsCkBAIC0xLDU5ICsw LDAgQEAKLS8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMTEsIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgotICoKLSAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0 OgotICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBh Ym92ZSBjb3B5cmlnaHQKLSAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5h cnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2Us IHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4g dGhlCi0gKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQg d2l0aCB0aGUgZGlzdHJpYnV0aW9uLgotICoKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQg QlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKLSAqIEFORCBBTlkg RVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLAotICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJ VE5FU1MgRk9SIEEgUEFSVElDVUxBUgotICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8g RVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCi0gKiBCRSBMSUFCTEUg Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlks IE9SCi0gKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVE IFRPLCBQUk9DVVJFTUVOVCBPRgotICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9T UyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCi0gKiBJTlRFUlJVUFRJT04p IEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ TgotICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdM SUdFTkNFIE9SIE9USEVSV0lTRSkKLSAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVT RSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKLSAqIFRIRSBQT1NTSUJJTElU WSBPRiBTVUNIIERBTUFHRS4KLSAqLwotCi0jaW5jbHVkZSAiY29uZmlnLmgiCi0jaW5jbHVkZSAi TG9jYWxpemVkU3RyaW5ncy5oIgotCi0jaW5jbHVkZSA8Q29yZUZvdW5kYXRpb24vQ0ZCdW5kbGUu aD4KLSNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgotI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFk Lmg+Ci0jaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgotI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0 cmluZy5oPgotCi1uYW1lc3BhY2UgV2ViQ29yZSB7Ci0KLVN0cmluZyBsb2NhbGl6ZWRTdHJpbmco Y29uc3QgY2hhcioga2V5KQotewotICAgIHN0YXRpYyBDRkJ1bmRsZVJlZiBidW5kbGUgPSBDRkJ1 bmRsZUdldEJ1bmRsZVdpdGhJZGVudGlmaWVyKENGU1RSKCJjb20uYXBwbGUuV2ViQ29yZSIpKTsK LQotI2lmICFQTEFURk9STShJT1MpCi0gICAgLy8gQ2FuIGJlIGNhbGxlZCBvbiBhIGRpc3BhdGNo IHF1ZXVlIHdoZW4gaW5pdGlhbGl6aW5nIHN0cmluZ3Mgb24gaU9TLgotICAgIC8vIFNlZSBMb2Fk V2ViTG9jYWxpemVkU3RyaW5ncyBhbmQgPHJkYXI6Ly9wcm9ibGVtLzc5MDI0NzM+LgotICAgIEFT U0VSVChpc01haW5UaHJlYWQoKSk7Ci0jZW5kaWYKLQotICAgIFJldGFpblB0cjxDRlN0cmluZ1Jl Zj4ga2V5U3RyaW5nID0gYWRvcHRDRihDRlN0cmluZ0NyZWF0ZVdpdGhDU3RyaW5nTm9Db3B5KDAs IGtleSwga0NGU3RyaW5nRW5jb2RpbmdVVEY4LCBrQ0ZBbGxvY2F0b3JOdWxsKSk7Ci0gICAgQ0ZT dHJpbmdSZWYgbm90Rm91bmQgPSBDRlNUUigibG9jYWxpemVkIHN0cmluZyBub3QgZm91bmQiKTsK LSAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IHJlc3VsdDsKLSAgICBpZiAoYnVuZGxlKSB7Ci0g ICAgICAgIHJlc3VsdCA9IGFkb3B0Q0YoQ0ZCdW5kbGVDb3B5TG9jYWxpemVkU3RyaW5nKGJ1bmRs ZSwga2V5U3RyaW5nLmdldCgpLCBub3RGb3VuZCwgMCkpOwotICAgICAgICBBU1NFUlRfV0lUSF9N RVNTQUdFKHJlc3VsdC5nZXQoKSAhPSBub3RGb3VuZCwgImNvdWxkIG5vdCBmaW5kIGxvY2FsaXph YmxlIHN0cmluZyAlcyBpbiBidW5kbGUiLCBrZXkpOwotICAgIH0gZWxzZQotICAgICAgICByZXN1 bHQgPSBub3RGb3VuZDsKLQotICAgIHJldHVybiBTdHJpbmcocmVzdWx0LmdldCgpKTsKLX0KLQot fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=