187604 2018-07-12 09:36:19 -0700 [Mac] Run Unlock Keychain more reliably 2018-07-12 10:03:26 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap bfulgham mitz webkit-bug-importer oldest_to_newest 1441526 0 ap 2018-07-12 09:36:19 -0700 The WebKit project has an Unlock Keychain phase for WebContent, but it's needed in other targets too. In fact, the build currently fails unless one already has the keychain unlocked, or unlocks it manually during build. 1441528 1 344849 ap 2018-07-12 09:41:25 -0700 Created attachment 344849 proposed fix 1441537 2 ap 2018-07-12 10:01:17 -0700 Committed http://trac.webkit.org/r233770 1441539 3 webkit-bug-importer 2018-07-12 10:03:26 -0700 <rdar://problem/42125831> 344849 2018-07-12 09:41:25 -0700 2018-07-12 09:55:43 -0700 proposed fix UnlockKeychain.txt text/plain 14463 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzM3NjkpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA3LTEyICBBbGV4ZXkgUHJv c2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIFJ1biBVbmxvY2sgS2V5 Y2hhaW4gbW9yZSByZWxpYWJseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTg3NjA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgTW92ZSB1bmxvY2tpbmcgdG8gYSBzZXBhcmF0ZSB0YXJnZXQsIGFuZCBtYWtl IGl0IGEgZGVwZW5kZW5jeSBmb3IgYWxsIHRhcmdldHMgdGhhdAorICAgICAgICBwcm9kdWNlIGJp bmFyaWVzLgorICAgICAgICAKKyAgICAgICAgVGhpcyBpcyBtb3JlIHRoYW4gc3RyaWN0bHkgcmVx dWlyZWQgdG8gZml4IHRoZSBidWlsZCwgYnV0IHRoaXMgd2F5LCB3ZSB3b24ndCBuZWVkCisgICAg ICAgIHRvIHJlbWVtYmVyIGFib3V0IGtleWNoYWluIHdoZW4gcHJvamVjdCBzdHJ1Y3R1cmUgY2hh bmdlcy4gQW5vdGhlciBjb25zaWRlcmF0aW9uIHRoYXQKKyAgICAgICAgd2Fzbid0IGluaXRpYWxs eSBhcHBhcmVudCB0byBtZSBpcyB0aGF0IGlzIHNob3VsZCBiZSBwb3NzaWJsZSB0byBidWlsZCBh bnkgdGFyZ2V0LAorICAgICAgICBub3QganVzdCAiQWxsIiwgc28gcHJvamVjdHMgYXJlbid0IG5l Y2Vzc2FyaWx5IGJ1aWx0IGluIHRoZSBzYW1lIG9yZGVyIGV2ZW4gbm93LgorCisgICAgICAgICog V2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6IAorCiAyMDE4LTA3LTEyICBQZXIgQXJu ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgY29tcGlsZSBndWFy ZCBmb3IgZW5hYmxpbmcgTlNSdW5Mb29wIGluIHRoZSBXZWJDb250ZW50IHByb2Nlc3MuCkluZGV4 OiBTb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJl dmlzaW9uIDIzMzczMikKKysrIFNvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTQ4LDYgKzQ4LDE3IEBACiAJCQluYW1lID0gIkRl cml2ZWQgU291cmNlcyI7CiAJCQlwcm9kdWN0TmFtZSA9ICJEZXJpdmVkIFNvdXJjZXMiOwogCQl9 OworCQlFMUFDMkUyNzIwRjdCOTRDMDBCMDg5N0QgLyogVW5sb2NrIEtleWNoYWluICovID0gewor CQkJaXNhID0gUEJYQWdncmVnYXRlVGFyZ2V0OworCQkJYnVpbGRDb25maWd1cmF0aW9uTGlzdCA9 IEUxQUMyRTJCMjBGN0I5NEMwMEIwODk3RCAvKiBCdWlsZCBjb25maWd1cmF0aW9uIGxpc3QgZm9y IFBCWEFnZ3JlZ2F0ZVRhcmdldCAiVW5sb2NrIEtleWNoYWluIiAqLzsKKwkJCWJ1aWxkUGhhc2Vz ID0gKAorCQkJCUUxQUMyRTJDMjBGN0I5NTgwMEIwODk3RCAvKiBVbmxvY2sgS2V5Y2hhaW4gKi8s CisJCQkpOworCQkJZGVwZW5kZW5jaWVzID0gKAorCQkJKTsKKwkJCW5hbWUgPSAiVW5sb2NrIEtl eWNoYWluIjsKKwkJCXByb2R1Y3ROYW1lID0gIlVubG9jayBrZXljaGFpbiI7CisJCX07CiAvKiBF bmQgUEJYQWdncmVnYXRlVGFyZ2V0IHNlY3Rpb24gKi8KIAogLyogQmVnaW4gUEJYQnVpbGRGaWxl IHNlY3Rpb24gKi8KQEAgLTIzMTAsNiArMjMyMSw2OSBAQAogCQkJcmVtb3RlR2xvYmFsSURTdHJp bmcgPSBCQzNERTQ2NTE1QTkxNzYzMDA4RDI2RkM7CiAJCQlyZW1vdGVJbmZvID0gV2ViS2l0MlNl cnZpY2U7CiAJCX07CisJCUUxQUMyRTJEMjBGN0I5ODgwMEIwODk3RCAvKiBQQlhDb250YWluZXJJ dGVtUHJveHkgKi8gPSB7CisJCQlpc2EgPSBQQlhDb250YWluZXJJdGVtUHJveHk7CisJCQljb250 YWluZXJQb3J0YWwgPSAwODY3RDY5MEZFODQwMjhGQzAyQUFDMDcgLyogUHJvamVjdCBvYmplY3Qg Ki87CisJCQlwcm94eVR5cGUgPSAxOworCQkJcmVtb3RlR2xvYmFsSURTdHJpbmcgPSBFMUFDMkUy NzIwRjdCOTRDMDBCMDg5N0Q7CisJCQlyZW1vdGVJbmZvID0gIlVubG9jayBLZXljaGFpbiI7CisJ CX07CisJCUUxQUMyRTJGMjBGN0I5OEUwMEIwODk3RCAvKiBQQlhDb250YWluZXJJdGVtUHJveHkg Ki8gPSB7CisJCQlpc2EgPSBQQlhDb250YWluZXJJdGVtUHJveHk7CisJCQljb250YWluZXJQb3J0 YWwgPSAwODY3RDY5MEZFODQwMjhGQzAyQUFDMDcgLyogUHJvamVjdCBvYmplY3QgKi87CisJCQlw cm94eVR5cGUgPSAxOworCQkJcmVtb3RlR2xvYmFsSURTdHJpbmcgPSBFMUFDMkUyNzIwRjdCOTRD MDBCMDg5N0Q7CisJCQlyZW1vdGVJbmZvID0gIlVubG9jayBLZXljaGFpbiI7CisJCX07CisJCUUx QUMyRTMxMjBGN0I5OUIwMEIwODk3RCAvKiBQQlhDb250YWluZXJJdGVtUHJveHkgKi8gPSB7CisJ CQlpc2EgPSBQQlhDb250YWluZXJJdGVtUHJveHk7CisJCQljb250YWluZXJQb3J0YWwgPSAwODY3 RDY5MEZFODQwMjhGQzAyQUFDMDcgLyogUHJvamVjdCBvYmplY3QgKi87CisJCQlwcm94eVR5cGUg PSAxOworCQkJcmVtb3RlR2xvYmFsSURTdHJpbmcgPSBFMUFDMkUyNzIwRjdCOTRDMDBCMDg5N0Q7 CisJCQlyZW1vdGVJbmZvID0gIlVubG9jayBLZXljaGFpbiI7CisJCX07CisJCUUxQUMyRTMzMjBG N0I5OUUwMEIwODk3RCAvKiBQQlhDb250YWluZXJJdGVtUHJveHkgKi8gPSB7CisJCQlpc2EgPSBQ QlhDb250YWluZXJJdGVtUHJveHk7CisJCQljb250YWluZXJQb3J0YWwgPSAwODY3RDY5MEZFODQw MjhGQzAyQUFDMDcgLyogUHJvamVjdCBvYmplY3QgKi87CisJCQlwcm94eVR5cGUgPSAxOworCQkJ cmVtb3RlR2xvYmFsSURTdHJpbmcgPSBFMUFDMkUyNzIwRjdCOTRDMDBCMDg5N0Q7CisJCQlyZW1v dGVJbmZvID0gIlVubG9jayBLZXljaGFpbiI7CisJCX07CisJCUUxQUMyRTM1MjBGN0I5QTEwMEIw ODk3RCAvKiBQQlhDb250YWluZXJJdGVtUHJveHkgKi8gPSB7CisJCQlpc2EgPSBQQlhDb250YWlu ZXJJdGVtUHJveHk7CisJCQljb250YWluZXJQb3J0YWwgPSAwODY3RDY5MEZFODQwMjhGQzAyQUFD MDcgLyogUHJvamVjdCBvYmplY3QgKi87CisJCQlwcm94eVR5cGUgPSAxOworCQkJcmVtb3RlR2xv YmFsSURTdHJpbmcgPSBFMUFDMkUyNzIwRjdCOTRDMDBCMDg5N0Q7CisJCQlyZW1vdGVJbmZvID0g IlVubG9jayBLZXljaGFpbiI7CisJCX07CisJCUUxQUMyRTM3MjBGN0I5QTMwMEIwODk3RCAvKiBQ QlhDb250YWluZXJJdGVtUHJveHkgKi8gPSB7CisJCQlpc2EgPSBQQlhDb250YWluZXJJdGVtUHJv eHk7CisJCQljb250YWluZXJQb3J0YWwgPSAwODY3RDY5MEZFODQwMjhGQzAyQUFDMDcgLyogUHJv amVjdCBvYmplY3QgKi87CisJCQlwcm94eVR5cGUgPSAxOworCQkJcmVtb3RlR2xvYmFsSURTdHJp bmcgPSBFMUFDMkUyNzIwRjdCOTRDMDBCMDg5N0Q7CisJCQlyZW1vdGVJbmZvID0gIlVubG9jayBL ZXljaGFpbiI7CisJCX07CisJCUUxQUMyRTM5MjBGN0I5QTcwMEIwODk3RCAvKiBQQlhDb250YWlu ZXJJdGVtUHJveHkgKi8gPSB7CisJCQlpc2EgPSBQQlhDb250YWluZXJJdGVtUHJveHk7CisJCQlj b250YWluZXJQb3J0YWwgPSAwODY3RDY5MEZFODQwMjhGQzAyQUFDMDcgLyogUHJvamVjdCBvYmpl Y3QgKi87CisJCQlwcm94eVR5cGUgPSAxOworCQkJcmVtb3RlR2xvYmFsSURTdHJpbmcgPSBFMUFD MkUyNzIwRjdCOTRDMDBCMDg5N0Q7CisJCQlyZW1vdGVJbmZvID0gIlVubG9jayBLZXljaGFpbiI7 CisJCX07CisJCUUxQUMyRTNCMjBGN0I5QUEwMEIwODk3RCAvKiBQQlhDb250YWluZXJJdGVtUHJv eHkgKi8gPSB7CisJCQlpc2EgPSBQQlhDb250YWluZXJJdGVtUHJveHk7CisJCQljb250YWluZXJQ b3J0YWwgPSAwODY3RDY5MEZFODQwMjhGQzAyQUFDMDcgLyogUHJvamVjdCBvYmplY3QgKi87CisJ CQlwcm94eVR5cGUgPSAxOworCQkJcmVtb3RlR2xvYmFsSURTdHJpbmcgPSBFMUFDMkUyNzIwRjdC OTRDMDBCMDg5N0Q7CisJCQlyZW1vdGVJbmZvID0gIlVubG9jayBLZXljaGFpbiI7CisJCX07CisJ CUUxQUMyRTNEMjBGN0I5QzAwMEIwODk3RCAvKiBQQlhDb250YWluZXJJdGVtUHJveHkgKi8gPSB7 CisJCQlpc2EgPSBQQlhDb250YWluZXJJdGVtUHJveHk7CisJCQljb250YWluZXJQb3J0YWwgPSAw ODY3RDY5MEZFODQwMjhGQzAyQUFDMDcgLyogUHJvamVjdCBvYmplY3QgKi87CisJCQlwcm94eVR5 cGUgPSAxOworCQkJcmVtb3RlR2xvYmFsSURTdHJpbmcgPSBFMUFDMkUyNzIwRjdCOTRDMDBCMDg5 N0Q7CisJCQlyZW1vdGVJbmZvID0gIlVubG9jayBLZXljaGFpbiI7CisJCX07CiAvKiBFbmQgUEJY Q29udGFpbmVySXRlbVByb3h5IHNlY3Rpb24gKi8KIAogLyogQmVnaW4gUEJYQ29weUZpbGVzQnVp bGRQaGFzZSBzZWN0aW9uICovCkBAIC05OTExLDYgKzk5ODUsNyBAQAogCQkJYnVpbGRSdWxlcyA9 ICgKIAkJCSk7CiAJCQlkZXBlbmRlbmNpZXMgPSAoCisJCQkJRTFBQzJFMkUyMEY3Qjk4ODAwQjA4 OTdEIC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8sCiAJCQkpOwogCQkJbmFtZSA9IFBsdWdpblBy b2Nlc3NTaGltOwogCQkJcHJvZHVjdE5hbWUgPSBQbHVnaW5Qcm9jZXNzU2hpbTsKQEAgLTk5MjUs MTIgKzEwMDAwLDEyIEBACiAJCQkJMzcyRUJCM0IyMDE3RTY0MzAwMDg1MDY0IC8qIFNvdXJjZXMg Ki8sCiAJCQkJMzcyRUJCM0QyMDE3RTY0MzAwMDg1MDY0IC8qIEZyYW1ld29ya3MgKi8sCiAJCQkJ MzcyRUJCNDAyMDE3RTY0MzAwMDg1MDY0IC8qIFJlc291cmNlcyAqLywKLQkJCQk3QTM1RjI0RjIw QkRBRjhCMDAzOTU4RUMgLyogVW5sb2NrIGtleWNoYWluICovLAogCQkJCTdBRkNCRDU1MjBCODkx N0QwMEY1NUM5QyAvKiBQcm9jZXNzIFdlYkNvbnRlbnQgZW50aXRsZW1lbnRzICovLAogCQkJKTsK IAkJCWJ1aWxkUnVsZXMgPSAoCiAJCQkpOwogCQkJZGVwZW5kZW5jaWVzID0gKAorCQkJCUUxQUMy RTM0MjBGN0I5OUUwMEIwODk3RCAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICovLAogCQkJCTM3MkVC QjM5MjAxN0U2NDMwMDA4NTA2NCAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICovLAogCQkJKTsKIAkJ CW5hbWUgPSBXZWJDb250ZW50LkRldmVsb3BtZW50OwpAQCAtOTk0OSw2ICsxMDAyNCw3IEBACiAJ CQlidWlsZFJ1bGVzID0gKAogCQkJKTsKIAkJCWRlcGVuZGVuY2llcyA9ICgKKwkJCQlFMUFDMkUz MDIwRjdCOThFMDBCMDg5N0QgLyogUEJYVGFyZ2V0RGVwZW5kZW5jeSAqLywKIAkJCSk7CiAJCQlu YW1lID0gU2VjSXRlbVNoaW07CiAJCQlwcm9kdWN0TmFtZSA9IFBsdWdpblByb2Nlc3NTaGltOwpA QCAtOTk2Niw2ICsxMDA0Miw3IEBACiAJCQlidWlsZFJ1bGVzID0gKAogCQkJKTsKIAkJCWRlcGVu ZGVuY2llcyA9ICgKKwkJCQlFMUFDMkUzQzIwRjdCOUFBMDBCMDg5N0QgLyogUEJYVGFyZ2V0RGVw ZW5kZW5jeSAqLywKIAkJCQkzNzVFMDYyNzE5MUVBOENDMDA0RTNDQUYgLyogUEJYVGFyZ2V0RGVw ZW5kZW5jeSAqLywKIAkJCSk7CiAJCQluYW1lID0gRGF0YWJhc2VzOwpAQCAtMTAwMDMsNiArMTAw ODAsNyBAQAogCQkJYnVpbGRSdWxlcyA9ICgKIAkJCSk7CiAJCQlkZXBlbmRlbmNpZXMgPSAoCisJ CQkJRTFBQzJFM0UyMEY3QjlDMDAwQjA4OTdEIC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8sCiAJ CQkJMzdGNzQwNzkxMjcyMUY3NDAwOTM4NjlCIC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8sCiAJ CQkJMzdCMUQwMTQxQzFFNDIxMTAwRDY3RkU5IC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8sCiAJ CQkJMzdCMUQwMTYxQzFFNDIxMTAwRDY3RkU5IC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8sCkBA IC0xMDAyMSwxMiArMTAwOTksMTIgQEAKIAkJCQlCQzNERTQ2MjE1QTkxNzYzMDA4RDI2RkMgLyog U291cmNlcyAqLywKIAkJCQlCQ0RDMzA4RDE1RkRCOTlBMDA2QjY2OTUgLyogRnJhbWV3b3JrcyAq LywKIAkJCQlCQzNERTQ2NDE1QTkxNzYzMDA4RDI2RkMgLyogUmVzb3VyY2VzICovLAotCQkJCTdB MzVGMjRFMjBCREFFNDAwMDM5NThFQyAvKiBVbmxvY2sga2V5Y2hhaW4gKi8sCiAJCQkJN0FGQ0JE NTQyMEI4OTExRDAwRjU1QzlDIC8qIFByb2Nlc3MgV2ViQ29udGVudCBlbnRpdGxlbWVudHMgKi8s CiAJCQkpOwogCQkJYnVpbGRSdWxlcyA9ICgKIAkJCSk7CiAJCQlkZXBlbmRlbmNpZXMgPSAoCisJ CQkJRTFBQzJFMzIyMEY3Qjk5QjAwQjA4OTdEIC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8sCiAJ CQkJMzc1RTA2MzMxOTFFQTkwOTAwNEUzQ0FGIC8qIFBCWFRhcmdldERlcGVuZGVuY3kgKi8sCiAJ CQkpOwogCQkJbmFtZSA9IFdlYkNvbnRlbnQ7CkBAIC0xMDA0NSw2ICsxMDEyMyw3IEBACiAJCQli dWlsZFJ1bGVzID0gKAogCQkJKTsKIAkJCWRlcGVuZGVuY2llcyA9ICgKKwkJCQlFMUFDMkUzNjIw RjdCOUExMDBCMDg5N0QgLyogUEJYVGFyZ2V0RGVwZW5kZW5jeSAqLywKIAkJCQkzNzVFMDYzMTE5 MUVBOTA0MDA0RTNDQUYgLyogUEJYVGFyZ2V0RGVwZW5kZW5jeSAqLywKIAkJCSk7CiAJCQluYW1l ID0gTmV0d29ya2luZzsKQEAgLTEwMDYzLDYgKzEwMTQyLDcgQEAKIAkJCWJ1aWxkUnVsZXMgPSAo CiAJCQkpOwogCQkJZGVwZW5kZW5jaWVzID0gKAorCQkJCUUxQUMyRTM4MjBGN0I5QTMwMEIwODk3 RCAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICovLAogCQkJCTM3NUUwNjNGMTkxRUFBMzMwMDRFM0NB RiAvKiBQQlhUYXJnZXREZXBlbmRlbmN5ICovLAogCQkJKTsKIAkJCW5hbWUgPSBQbHVnaW4uMzI7 CkBAIC0xMDA4MSw2ICsxMDE2MSw3IEBACiAJCQlidWlsZFJ1bGVzID0gKAogCQkJKTsKIAkJCWRl cGVuZGVuY2llcyA9ICgKKwkJCQlFMUFDMkUzQTIwRjdCOUE3MDBCMDg5N0QgLyogUEJYVGFyZ2V0 RGVwZW5kZW5jeSAqLywKIAkJCQkzNzVFMDYyQjE5MUVBOEQ0MDA0RTNDQUYgLyogUEJYVGFyZ2V0 RGVwZW5kZW5jeSAqLywKIAkJCSk7CiAJCQluYW1lID0gUGx1Z2luLjY0OwpAQCAtMTAwOTYsNiAr MTAxNzcsMTIgQEAKIAkJCWF0dHJpYnV0ZXMgPSB7CiAJCQkJTGFzdFN3aWZ0VXBkYXRlQ2hlY2sg PSAwNzAwOwogCQkJCUxhc3RVcGdyYWRlQ2hlY2sgPSAwNzAwOworCQkJCVRhcmdldEF0dHJpYnV0 ZXMgPSB7CisJCQkJCUUxQUMyRTI3MjBGN0I5NEMwMEIwODk3RCA9IHsKKwkJCQkJCUNyZWF0ZWRP blRvb2xzVmVyc2lvbiA9IDkuMzsKKwkJCQkJCVByb3Zpc2lvbmluZ1N0eWxlID0gQXV0b21hdGlj OworCQkJCQl9OworCQkJCX07CiAJCQl9OwogCQkJYnVpbGRDb25maWd1cmF0aW9uTGlzdCA9IDFE RUI5MUIxMDg3MzNEQTUwMDEwRTlDRCAvKiBCdWlsZCBjb25maWd1cmF0aW9uIGxpc3QgZm9yIFBC WFByb2plY3QgIldlYktpdCIgKi87CiAJCQljb21wYXRpYmlsaXR5VmVyc2lvbiA9ICJYY29kZSAz LjIiOwpAQCAtMTAxMjUsNiArMTAyMTIsNyBAQAogCQkJCUJDODI4NDFFMTZCNEZERjYwMEEyNzhG RSAvKiBQbHVnaW4uNjQgKi8sCiAJCQkJNTFGN0RDM0YxODBDQzkzNjAwMjEyQ0EzIC8qIERhdGFi YXNlcyAqLywKIAkJCQlBN0FBREExMDE5Mzk1Q0E5MDAzRUExQzcgLyogU2FuZGJveCBQcm9maWxl cyAqLywKKwkJCQlFMUFDMkUyNzIwRjdCOTRDMDBCMDg5N0QgLyogVW5sb2NrIEtleWNoYWluICov LAogCQkJKTsKIAkJfTsKIC8qIEVuZCBQQlhQcm9qZWN0IHNlY3Rpb24gKi8KQEAgLTEwNDA1LDM0 ICsxMDQ5Myw2IEBACiAJCQlzaGVsbFBhdGggPSAvYmluL3NoOwogCQkJc2hlbGxTY3JpcHQgPSAi aWYgWyBcIiR7QUNUSU9OfVwiID0gXCJpbnN0YWxsaGRyc1wiIF0gfHwgWyBcIiR7QUNUSU9OfVwi ID0gXCJpbnN0YWxsYXBpXCIgXTsgdGhlblxuICAgIGV4aXQgMDtcbmZpXG5cbmlmIFsgLWYgLi4v Li4vVG9vbHMvU2NyaXB0cy9jaGVjay1mb3ItaW5hcHByb3ByaWF0ZS1maWxlcy1pbi1mcmFtZXdv cmsgXTsgdGhlblxuICAgIC4uLy4uL1Rvb2xzL1NjcmlwdHMvY2hlY2stZm9yLWluYXBwcm9wcmlh dGUtZmlsZXMtaW4tZnJhbWV3b3JrIHx8IGV4aXQgJD9cbmZpXG4iOwogCQl9OwotCQk3QTM1RjI0 RTIwQkRBRTQwMDAzOTU4RUMgLyogVW5sb2NrIGtleWNoYWluICovID0gewotCQkJaXNhID0gUEJY U2hlbGxTY3JpcHRCdWlsZFBoYXNlOwotCQkJYnVpbGRBY3Rpb25NYXNrID0gMjE0NzQ4MzY0NzsK LQkJCWZpbGVzID0gKAotCQkJKTsKLQkJCWlucHV0UGF0aHMgPSAoCi0JCQkpOwotCQkJbmFtZSA9 ICJVbmxvY2sga2V5Y2hhaW4iOwotCQkJb3V0cHV0UGF0aHMgPSAoCi0JCQkpOwotCQkJcnVuT25s eUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7Ci0JCQlzaGVsbFBhdGggPSAvYmluL3No OwotCQkJc2hlbGxTY3JpcHQgPSAiVU5MT0NLX1NDUklQVF9QQVRIPVwiJHtTUkNST09UfS8uLi8u Li8uLi9JbnRlcm5hbC9Ub29scy9TY3JpcHRzL3VubG9jay1zYWZhcmktZW5naW5lZXJpbmcta2V5 Y2hhaW4taWYtbmVlZGVkXCJcblxuW1sgLXggXCIke1VOTE9DS19TQ1JJUFRfUEFUSH1cIiBdXSAm JiBleGVjIFwiJHtVTkxPQ0tfU0NSSVBUX1BBVEh9XCJcblxuZXhpdCAwXG4iOwotCQl9OwotCQk3 QTM1RjI0RjIwQkRBRjhCMDAzOTU4RUMgLyogVW5sb2NrIGtleWNoYWluICovID0gewotCQkJaXNh ID0gUEJYU2hlbGxTY3JpcHRCdWlsZFBoYXNlOwotCQkJYnVpbGRBY3Rpb25NYXNrID0gMjE0NzQ4 MzY0NzsKLQkJCWZpbGVzID0gKAotCQkJKTsKLQkJCWlucHV0UGF0aHMgPSAoCi0JCQkpOwotCQkJ bmFtZSA9ICJVbmxvY2sga2V5Y2hhaW4iOwotCQkJb3V0cHV0UGF0aHMgPSAoCi0JCQkpOwotCQkJ cnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7Ci0JCQlzaGVsbFBhdGggPSAv YmluL3NoOwotCQkJc2hlbGxTY3JpcHQgPSAiVU5MT0NLX1NDUklQVF9QQVRIPVwiJHtTUkNST09U fS8uLi8uLi8uLi9JbnRlcm5hbC9Ub29scy9TY3JpcHRzL3VubG9jay1zYWZhcmktZW5naW5lZXJp bmcta2V5Y2hhaW4taWYtbmVlZGVkXCJcblxuW1sgLXggXCIke1VOTE9DS19TQ1JJUFRfUEFUSH1c IiBdXSAmJiBleGVjIFwiJHtVTkxPQ0tfU0NSSVBUX1BBVEh9XCJcblxuZXhpdCAwXG4iOwotCQl9 OwogCQk3QTM1RjI1MDIwQkRCN0NDMDAzOTU4RUMgLyogUmVtb3ZlIHN0YWxlIGVudGl0bGVtZW50 IGZpbGUgKi8gPSB7CiAJCQlpc2EgPSBQQlhTaGVsbFNjcmlwdEJ1aWxkUGhhc2U7CiAJCQlidWls ZEFjdGlvbk1hc2sgPSAyMTQ3NDgzNjQ3OwpAQCAtMTA1ODEsNiArMTA2NDEsMjAgQEAKIAkJCXNo ZWxsUGF0aCA9IC9iaW4vc2g7CiAJCQlzaGVsbFNjcmlwdCA9ICJta2RpciAtcCBcIiR7QlVJTFRf UFJPRFVDVFNfRElSfS9EZXJpdmVkU291cmNlcy9XZWJLaXQyXCJcbmNkIFwiJHtCVUlMVF9QUk9E VUNUU19ESVJ9L0Rlcml2ZWRTb3VyY2VzL1dlYktpdDJcIlxuXG5leHBvcnQgV2ViS2l0Mj1cIiR7 U1JDUk9PVH1cIlxuXG4vYmluL2xuIC1zZmggXCIke0pBVkFTQ1JJUFRDT1JFX1BSSVZBVEVfSEVB REVSU19ESVJ9XCIgSmF2YVNjcmlwdENvcmVQcml2YXRlSGVhZGVyc1xuZXhwb3J0IEphdmFTY3Jp cHRDb3JlX1NDUklQVFNfRElSPVwiSmF2YVNjcmlwdENvcmVQcml2YXRlSGVhZGVyc1wiXG5cbmlm IFsgISAkQ0MgXTsgdGhlblxuICAgIGV4cG9ydCBDQz1cImB4Y3J1biAtZmluZCBjbGFuZ2BcIlxu ZmlcblxuTUFLRUZJTEVfSU5DTFVERV9GTEFHUz0kKGVjaG8gXCIke1dFQktJVEFERElUSU9OU19I RUFERVJfU0VBUkNIX1BBVEhTfVwiIHwgcGVybCAtZSAncHJpbnQgXCItSVwiIC4gam9pbihcIiAt SVwiLCBzcGxpdChcIiBcIiwgPD4pKTsnKVxuXG5pZiBbIFwiJHtBQ1RJT059XCIgPSBcImJ1aWxk XCIgLW8gXCIke0FDVElPTn1cIiA9IFwiaW5zdGFsbFwiIC1vIFwiJHtBQ1RJT059XCIgPSBcImlu c3RhbGxoZHJzXCIgLW8gXCIke0FDVElPTn1cIiA9IFwiaW5zdGFsbGFwaVwiIF07IHRoZW5cbiAg ICBtYWtlIC0tbm8tYnVpbHRpbi1ydWxlcyAke01BS0VGSUxFX0lOQ0xVREVfRkxBR1N9IC1mIFwi JHtXZWJLaXQyfS9EZXJpdmVkU291cmNlcy5tYWtlXCIgLWogYC91c3Ivc2Jpbi9zeXNjdGwgLW4g aHcuYWN0aXZlY3B1YCBTREtST09UPSR7U0RLUk9PVH1cbmZpXG4iOwogCQl9OworCQlFMUFDMkUy QzIwRjdCOTU4MDBCMDg5N0QgLyogVW5sb2NrIEtleWNoYWluICovID0geworCQkJaXNhID0gUEJY U2hlbGxTY3JpcHRCdWlsZFBoYXNlOworCQkJYnVpbGRBY3Rpb25NYXNrID0gMjE0NzQ4MzY0NzsK KwkJCWZpbGVzID0gKAorCQkJKTsKKwkJCWlucHV0UGF0aHMgPSAoCisJCQkpOworCQkJbmFtZSA9 ICJVbmxvY2sgS2V5Y2hhaW4iOworCQkJb3V0cHV0UGF0aHMgPSAoCisJCQkpOworCQkJcnVuT25s eUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CisJCQlzaGVsbFBhdGggPSAvYmluL3No OworCQkJc2hlbGxTY3JpcHQgPSAiVU5MT0NLX1NDUklQVF9QQVRIPVwiJHtTUkNST09UfS8uLi8u Li8uLi9JbnRlcm5hbC9Ub29scy9TY3JpcHRzL3VubG9jay1zYWZhcmktZW5naW5lZXJpbmcta2V5 Y2hhaW4taWYtbmVlZGVkXCJcblxuW1sgLXggXCIke1VOTE9DS19TQ1JJUFRfUEFUSH1cIiBdXSAm JiBleGVjIFwiJHtVTkxPQ0tfU0NSSVBUX1BBVEh9XCJcblxuZXhpdCAwXG4iOworCQl9OwogLyog RW5kIFBCWFNoZWxsU2NyaXB0QnVpbGRQaGFzZSBzZWN0aW9uICovCiAKIC8qIEJlZ2luIFBCWFNv dXJjZXNCdWlsZFBoYXNlIHNlY3Rpb24gKi8KQEAgLTExNzIzLDYgKzExNzk3LDUxIEBACiAJCQl0 YXJnZXQgPSBCQzNERTQ2NTE1QTkxNzYzMDA4RDI2RkMgLyogV2ViQ29udGVudCAqLzsKIAkJCXRh cmdldFByb3h5ID0gQkNBOEQ0NjcxNUJDRTBENjAwOURDMUYxIC8qIFBCWENvbnRhaW5lckl0ZW1Q cm94eSAqLzsKIAkJfTsKKwkJRTFBQzJFMkUyMEY3Qjk4ODAwQjA4OTdEIC8qIFBCWFRhcmdldERl cGVuZGVuY3kgKi8gPSB7CisJCQlpc2EgPSBQQlhUYXJnZXREZXBlbmRlbmN5OworCQkJdGFyZ2V0 ID0gRTFBQzJFMjcyMEY3Qjk0QzAwQjA4OTdEIC8qIFVubG9jayBLZXljaGFpbiAqLzsKKwkJCXRh cmdldFByb3h5ID0gRTFBQzJFMkQyMEY3Qjk4ODAwQjA4OTdEIC8qIFBCWENvbnRhaW5lckl0ZW1Q cm94eSAqLzsKKwkJfTsKKwkJRTFBQzJFMzAyMEY3Qjk4RTAwQjA4OTdEIC8qIFBCWFRhcmdldERl cGVuZGVuY3kgKi8gPSB7CisJCQlpc2EgPSBQQlhUYXJnZXREZXBlbmRlbmN5OworCQkJdGFyZ2V0 ID0gRTFBQzJFMjcyMEY3Qjk0QzAwQjA4OTdEIC8qIFVubG9jayBLZXljaGFpbiAqLzsKKwkJCXRh cmdldFByb3h5ID0gRTFBQzJFMkYyMEY3Qjk4RTAwQjA4OTdEIC8qIFBCWENvbnRhaW5lckl0ZW1Q cm94eSAqLzsKKwkJfTsKKwkJRTFBQzJFMzIyMEY3Qjk5QjAwQjA4OTdEIC8qIFBCWFRhcmdldERl cGVuZGVuY3kgKi8gPSB7CisJCQlpc2EgPSBQQlhUYXJnZXREZXBlbmRlbmN5OworCQkJdGFyZ2V0 ID0gRTFBQzJFMjcyMEY3Qjk0QzAwQjA4OTdEIC8qIFVubG9jayBLZXljaGFpbiAqLzsKKwkJCXRh cmdldFByb3h5ID0gRTFBQzJFMzEyMEY3Qjk5QjAwQjA4OTdEIC8qIFBCWENvbnRhaW5lckl0ZW1Q cm94eSAqLzsKKwkJfTsKKwkJRTFBQzJFMzQyMEY3Qjk5RTAwQjA4OTdEIC8qIFBCWFRhcmdldERl cGVuZGVuY3kgKi8gPSB7CisJCQlpc2EgPSBQQlhUYXJnZXREZXBlbmRlbmN5OworCQkJdGFyZ2V0 ID0gRTFBQzJFMjcyMEY3Qjk0QzAwQjA4OTdEIC8qIFVubG9jayBLZXljaGFpbiAqLzsKKwkJCXRh cmdldFByb3h5ID0gRTFBQzJFMzMyMEY3Qjk5RTAwQjA4OTdEIC8qIFBCWENvbnRhaW5lckl0ZW1Q cm94eSAqLzsKKwkJfTsKKwkJRTFBQzJFMzYyMEY3QjlBMTAwQjA4OTdEIC8qIFBCWFRhcmdldERl cGVuZGVuY3kgKi8gPSB7CisJCQlpc2EgPSBQQlhUYXJnZXREZXBlbmRlbmN5OworCQkJdGFyZ2V0 ID0gRTFBQzJFMjcyMEY3Qjk0QzAwQjA4OTdEIC8qIFVubG9jayBLZXljaGFpbiAqLzsKKwkJCXRh cmdldFByb3h5ID0gRTFBQzJFMzUyMEY3QjlBMTAwQjA4OTdEIC8qIFBCWENvbnRhaW5lckl0ZW1Q cm94eSAqLzsKKwkJfTsKKwkJRTFBQzJFMzgyMEY3QjlBMzAwQjA4OTdEIC8qIFBCWFRhcmdldERl cGVuZGVuY3kgKi8gPSB7CisJCQlpc2EgPSBQQlhUYXJnZXREZXBlbmRlbmN5OworCQkJdGFyZ2V0 ID0gRTFBQzJFMjcyMEY3Qjk0QzAwQjA4OTdEIC8qIFVubG9jayBLZXljaGFpbiAqLzsKKwkJCXRh cmdldFByb3h5ID0gRTFBQzJFMzcyMEY3QjlBMzAwQjA4OTdEIC8qIFBCWENvbnRhaW5lckl0ZW1Q cm94eSAqLzsKKwkJfTsKKwkJRTFBQzJFM0EyMEY3QjlBNzAwQjA4OTdEIC8qIFBCWFRhcmdldERl cGVuZGVuY3kgKi8gPSB7CisJCQlpc2EgPSBQQlhUYXJnZXREZXBlbmRlbmN5OworCQkJdGFyZ2V0 ID0gRTFBQzJFMjcyMEY3Qjk0QzAwQjA4OTdEIC8qIFVubG9jayBLZXljaGFpbiAqLzsKKwkJCXRh cmdldFByb3h5ID0gRTFBQzJFMzkyMEY3QjlBNzAwQjA4OTdEIC8qIFBCWENvbnRhaW5lckl0ZW1Q cm94eSAqLzsKKwkJfTsKKwkJRTFBQzJFM0MyMEY3QjlBQTAwQjA4OTdEIC8qIFBCWFRhcmdldERl cGVuZGVuY3kgKi8gPSB7CisJCQlpc2EgPSBQQlhUYXJnZXREZXBlbmRlbmN5OworCQkJdGFyZ2V0 ID0gRTFBQzJFMjcyMEY3Qjk0QzAwQjA4OTdEIC8qIFVubG9jayBLZXljaGFpbiAqLzsKKwkJCXRh cmdldFByb3h5ID0gRTFBQzJFM0IyMEY3QjlBQTAwQjA4OTdEIC8qIFBCWENvbnRhaW5lckl0ZW1Q cm94eSAqLzsKKwkJfTsKKwkJRTFBQzJFM0UyMEY3QjlDMDAwQjA4OTdEIC8qIFBCWFRhcmdldERl cGVuZGVuY3kgKi8gPSB7CisJCQlpc2EgPSBQQlhUYXJnZXREZXBlbmRlbmN5OworCQkJdGFyZ2V0 ID0gRTFBQzJFMjcyMEY3Qjk0QzAwQjA4OTdEIC8qIFVubG9jayBLZXljaGFpbiAqLzsKKwkJCXRh cmdldFByb3h5ID0gRTFBQzJFM0QyMEY3QjlDMDAwQjA4OTdEIC8qIFBCWENvbnRhaW5lckl0ZW1Q cm94eSAqLzsKKwkJfTsKIC8qIEVuZCBQQlhUYXJnZXREZXBlbmRlbmN5IHNlY3Rpb24gKi8KIAog LyogQmVnaW4gUEJYVmFyaWFudEdyb3VwIHNlY3Rpb24gKi8KQEAgLTEyMDM4LDYgKzEyMTU3LDMw IEBACiAJCQl9OwogCQkJbmFtZSA9IFByb2R1Y3Rpb247CiAJCX07CisJCUUxQUMyRTI4MjBGN0I5 NEMwMEIwODk3RCAvKiBEZWJ1ZyAqLyA9IHsKKwkJCWlzYSA9IFhDQnVpbGRDb25maWd1cmF0aW9u OworCQkJYnVpbGRTZXR0aW5ncyA9IHsKKwkJCQlDT0RFX1NJR05fU1RZTEUgPSBBdXRvbWF0aWM7 CisJCQkJUFJPRFVDVF9OQU1FID0gIiQoVEFSR0VUX05BTUUpIjsKKwkJCX07CisJCQluYW1lID0g RGVidWc7CisJCX07CisJCUUxQUMyRTI5MjBGN0I5NEMwMEIwODk3RCAvKiBSZWxlYXNlICovID0g eworCQkJaXNhID0gWENCdWlsZENvbmZpZ3VyYXRpb247CisJCQlidWlsZFNldHRpbmdzID0gewor CQkJCUNPREVfU0lHTl9TVFlMRSA9IEF1dG9tYXRpYzsKKwkJCQlQUk9EVUNUX05BTUUgPSAiJChU QVJHRVRfTkFNRSkiOworCQkJfTsKKwkJCW5hbWUgPSBSZWxlYXNlOworCQl9OworCQlFMUFDMkUy QTIwRjdCOTRDMDBCMDg5N0QgLyogUHJvZHVjdGlvbiAqLyA9IHsKKwkJCWlzYSA9IFhDQnVpbGRD b25maWd1cmF0aW9uOworCQkJYnVpbGRTZXR0aW5ncyA9IHsKKwkJCQlDT0RFX1NJR05fU1RZTEUg PSBBdXRvbWF0aWM7CisJCQkJUFJPRFVDVF9OQU1FID0gIiQoVEFSR0VUX05BTUUpIjsKKwkJCX07 CisJCQluYW1lID0gUHJvZHVjdGlvbjsKKwkJfTsKIC8qIEVuZCBYQ0J1aWxkQ29uZmlndXJhdGlv biBzZWN0aW9uICovCiAKIC8qIEJlZ2luIFhDQ29uZmlndXJhdGlvbkxpc3Qgc2VjdGlvbiAqLwpA QCAtMTIxNzEsNiArMTIzMTQsMTYgQEAKIAkJCWRlZmF1bHRDb25maWd1cmF0aW9uSXNWaXNpYmxl ID0gMDsKIAkJCWRlZmF1bHRDb25maWd1cmF0aW9uTmFtZSA9IFByb2R1Y3Rpb247CiAJCX07CisJ CUUxQUMyRTJCMjBGN0I5NEMwMEIwODk3RCAvKiBCdWlsZCBjb25maWd1cmF0aW9uIGxpc3QgZm9y IFBCWEFnZ3JlZ2F0ZVRhcmdldCAiVW5sb2NrIEtleWNoYWluIiAqLyA9IHsKKwkJCWlzYSA9IFhD Q29uZmlndXJhdGlvbkxpc3Q7CisJCQlidWlsZENvbmZpZ3VyYXRpb25zID0gKAorCQkJCUUxQUMy RTI4MjBGN0I5NEMwMEIwODk3RCAvKiBEZWJ1ZyAqLywKKwkJCQlFMUFDMkUyOTIwRjdCOTRDMDBC MDg5N0QgLyogUmVsZWFzZSAqLywKKwkJCQlFMUFDMkUyQTIwRjdCOTRDMDBCMDg5N0QgLyogUHJv ZHVjdGlvbiAqLywKKwkJCSk7CisJCQlkZWZhdWx0Q29uZmlndXJhdGlvbklzVmlzaWJsZSA9IDA7 CisJCQlkZWZhdWx0Q29uZmlndXJhdGlvbk5hbWUgPSBQcm9kdWN0aW9uOworCQl9OwogLyogRW5k IFhDQ29uZmlndXJhdGlvbkxpc3Qgc2VjdGlvbiAqLwogCX07CiAJcm9vdE9iamVjdCA9IDA4NjdE NjkwRkU4NDAyOEZDMDJBQUMwNyAvKiBQcm9qZWN0IG9iamVjdCAqLzsK