ZGlmZiAtLWdpdCBhL3NyYy9WdWxrYW4vVmtJbWFnZS5jcHAgYi9zcmMvVnVsa2FuL1ZrSW1hZ2UuY3BwCmluZGV4IGZiOWM0M2MuLjkxMDQzYzkgMTAwNjQ0Ci0tLSBhL3NyYy9WdWxrYW4vVmtJbWFnZS5jcHAKKysrIGIvc3JjL1Z1bGthbi9Wa0ltYWdlLmNwcApAQCAtMTExLDExICsxMTEsMTUgQEAKIHsKIAkvLyBCeSBzcGVjLCBhc3BlY3RNYXNrIGhhcyBhIHNpbmdsZSBiaXQgc2V0LgogCWlmICghKChwU3VicmVzb3VyY2UtPmFzcGVjdE1hc2sgPT0gVktfSU1BR0VfQVNQRUNUX0NPTE9SX0JJVCkgfHwKLQkJICAocFN1YnJlc291cmNlLT5hc3BlY3RNYXNrID09IFZLX0lNQUdFX0FTUEVDVF9ERVBUSF9CSVQpIHx8Ci0JCSAgKHBTdWJyZXNvdXJjZS0+YXNwZWN0TWFzayA9PSBWS19JTUFHRV9BU1BFQ1RfU1RFTkNJTF9CSVQpKSkKKwkgICAgICAocFN1YnJlc291cmNlLT5hc3BlY3RNYXNrID09IFZLX0lNQUdFX0FTUEVDVF9ERVBUSF9CSVQpIHx8CisJICAgICAgKHBTdWJyZXNvdXJjZS0+YXNwZWN0TWFzayA9PSBWS19JTUFHRV9BU1BFQ1RfU1RFTkNJTF9CSVQpIHx8CisJICAgICAgKHBTdWJyZXNvdXJjZS0+YXNwZWN0TWFzayA9PSBWS19JTUFHRV9BU1BFQ1RfUExBTkVfMF9CSVQpIHx8CisJICAgICAgKHBTdWJyZXNvdXJjZS0+YXNwZWN0TWFzayA9PSBWS19JTUFHRV9BU1BFQ1RfUExBTkVfMV9CSVQpIHx8CisJICAgICAgKHBTdWJyZXNvdXJjZS0+YXNwZWN0TWFzayA9PSBWS19JTUFHRV9BU1BFQ1RfUExBTkVfMl9CSVQpKSkKIAl7Ci0JCVVOSU1QTEVNRU5URUQoImFzcGVjdE1hc2siKTsKKwkJVU5TVVBQT1JURUQoImFzcGVjdE1hc2sgJVgiLCBwU3VicmVzb3VyY2UtPmFzcGVjdE1hc2spOwogCX0KKwogCWF1dG8gYXNwZWN0ID0gc3RhdGljX2Nhc3Q8VmtJbWFnZUFzcGVjdEZsYWdCaXRzPihwU3VicmVzb3VyY2UtPmFzcGVjdE1hc2spOwogCXBMYXlvdXQtPm9mZnNldCA9IGdldE1lbW9yeU9mZnNldChhc3BlY3QsIHBTdWJyZXNvdXJjZS0+bWlwTGV2ZWwsIHBTdWJyZXNvdXJjZS0+YXJyYXlMYXllcik7CiAJcExheW91dC0+c2l6ZSA9IGdldE11bHRpU2FtcGxlZExldmVsU2l6ZShhc3BlY3QsIHBTdWJyZXNvdXJjZS0+bWlwTGV2ZWwpOwpAQCAtMTMwLDE4ICsxMzQsMjQgQEAKIAkvLyBhbiBpbWFnZSB0byBhbm90aGVyIGltYWdlIHRoYXQgaGFzIHRoZSBzYW1lIG51bWJlciBvZiBieXRlcyBwZXIgcGl4ZWwuCiAJSW1hZ2UqIGRzdCA9IENhc3QoZHN0SW1hZ2UpOwogCi0JaWYoISgocFJlZ2lvbi5zcmNTdWJyZXNvdXJjZS5hc3BlY3RNYXNrID09IFZLX0lNQUdFX0FTUEVDVF9DT0xPUl9CSVQpIHx8Ci0JCSAocFJlZ2lvbi5zcmNTdWJyZXNvdXJjZS5hc3BlY3RNYXNrID09IFZLX0lNQUdFX0FTUEVDVF9ERVBUSF9CSVQpIHx8Ci0JCSAocFJlZ2lvbi5zcmNTdWJyZXNvdXJjZS5hc3BlY3RNYXNrID09IFZLX0lNQUdFX0FTUEVDVF9TVEVOQ0lMX0JJVCkpKQorCWlmICghKChwUmVnaW9uLnNyY1N1YnJlc291cmNlLmFzcGVjdE1hc2sgPT0gVktfSU1BR0VfQVNQRUNUX0NPTE9SX0JJVCkgfHwKKwkgICAgICAocFJlZ2lvbi5zcmNTdWJyZXNvdXJjZS5hc3BlY3RNYXNrID09IFZLX0lNQUdFX0FTUEVDVF9ERVBUSF9CSVQpIHx8CisJICAgICAgKHBSZWdpb24uc3JjU3VicmVzb3VyY2UuYXNwZWN0TWFzayA9PSBWS19JTUFHRV9BU1BFQ1RfU1RFTkNJTF9CSVQpIHx8CisJICAgICAgKHBSZWdpb24uc3JjU3VicmVzb3VyY2UuYXNwZWN0TWFzayA9PSBWS19JTUFHRV9BU1BFQ1RfUExBTkVfMF9CSVQpIHx8CisJICAgICAgKHBSZWdpb24uc3JjU3VicmVzb3VyY2UuYXNwZWN0TWFzayA9PSBWS19JTUFHRV9BU1BFQ1RfUExBTkVfMV9CSVQpIHx8CisJICAgICAgKHBSZWdpb24uc3JjU3VicmVzb3VyY2UuYXNwZWN0TWFzayA9PSBWS19JTUFHRV9BU1BFQ1RfUExBTkVfMl9CSVQpKSkKIAl7Ci0JCVVOSU1QTEVNRU5URUQoInNyY1N1YnJlc291cmNlIik7CisJCVVOU1VQUE9SVEVEKCJzcmNTdWJyZXNvdXJjZS5hc3BlY3RNYXNrICVYIiwgcFJlZ2lvbi5zcmNTdWJyZXNvdXJjZS5hc3BlY3RNYXNrKTsKIAl9CiAKLQlpZighKChwUmVnaW9uLmRzdFN1YnJlc291cmNlLmFzcGVjdE1hc2sgPT0gVktfSU1BR0VfQVNQRUNUX0NPTE9SX0JJVCkgfHwKLQkJIChwUmVnaW9uLmRzdFN1YnJlc291cmNlLmFzcGVjdE1hc2sgPT0gVktfSU1BR0VfQVNQRUNUX0RFUFRIX0JJVCkgfHwKLQkJIChwUmVnaW9uLmRzdFN1YnJlc291cmNlLmFzcGVjdE1hc2sgPT0gVktfSU1BR0VfQVNQRUNUX1NURU5DSUxfQklUKSkpCisJaWYgKCEoKHBSZWdpb24uZHN0U3VicmVzb3VyY2UuYXNwZWN0TWFzayA9PSBWS19JTUFHRV9BU1BFQ1RfQ09MT1JfQklUKSB8fAorCSAgICAgIChwUmVnaW9uLmRzdFN1YnJlc291cmNlLmFzcGVjdE1hc2sgPT0gVktfSU1BR0VfQVNQRUNUX0RFUFRIX0JJVCkgfHwKKwkgICAgICAocFJlZ2lvbi5kc3RTdWJyZXNvdXJjZS5hc3BlY3RNYXNrID09IFZLX0lNQUdFX0FTUEVDVF9TVEVOQ0lMX0JJVCkgfHwKKwkgICAgICAocFJlZ2lvbi5kc3RTdWJyZXNvdXJjZS5hc3BlY3RNYXNrID09IFZLX0lNQUdFX0FTUEVDVF9QTEFORV8wX0JJVCkgfHwKKwkgICAgICAocFJlZ2lvbi5kc3RTdWJyZXNvdXJjZS5hc3BlY3RNYXNrID09IFZLX0lNQUdFX0FTUEVDVF9QTEFORV8xX0JJVCkgfHwKKwkgICAgICAocFJlZ2lvbi5kc3RTdWJyZXNvdXJjZS5hc3BlY3RNYXNrID09IFZLX0lNQUdFX0FTUEVDVF9QTEFORV8yX0JJVCkpKQogCXsKLQkJVU5JTVBMRU1FTlRFRCgiZHN0U3VicmVzb3VyY2UiKTsKKwkJVU5TVVBQT1JURUQoImRzdFN1YnJlc291cmNlLmFzcGVjdE1hc2sgJVgiLCBwUmVnaW9uLmRzdFN1YnJlc291cmNlLmFzcGVjdE1hc2spOwogCX0KIAogCVZrSW1hZ2VBc3BlY3RGbGFnQml0cyBzcmNBc3BlY3QgPSBzdGF0aWNfY2FzdDxWa0ltYWdlQXNwZWN0RmxhZ0JpdHM+KHBSZWdpb24uc3JjU3VicmVzb3VyY2UuYXNwZWN0TWFzayk7CkBAIC01MTAsOSArNTIwLDkgQEAKIAltaXBMZXZlbEV4dGVudC5oZWlnaHQgPSBleHRlbnQuaGVpZ2h0ID4+IG1pcExldmVsOwogCW1pcExldmVsRXh0ZW50LmRlcHRoID0gZXh0ZW50LmRlcHRoID4+IG1pcExldmVsOwogCi0JaWYobWlwTGV2ZWxFeHRlbnQud2lkdGggPT0gMCkgIG1pcExldmVsRXh0ZW50LndpZHRoID0gMTsKLQlpZihtaXBMZXZlbEV4dGVudC5oZWlnaHQgPT0gMCkgbWlwTGV2ZWxFeHRlbnQuaGVpZ2h0ID0gMTsKLQlpZihtaXBMZXZlbEV4dGVudC5kZXB0aCA9PSAwKSAgbWlwTGV2ZWxFeHRlbnQuZGVwdGggPSAxOworCWlmKG1pcExldmVsRXh0ZW50LndpZHRoICA9PSAwKSB7IG1pcExldmVsRXh0ZW50LndpZHRoICA9IDE7IH0KKwlpZihtaXBMZXZlbEV4dGVudC5oZWlnaHQgPT0gMCkgeyBtaXBMZXZlbEV4dGVudC5oZWlnaHQgPSAxOyB9CisJaWYobWlwTGV2ZWxFeHRlbnQuZGVwdGggID09IDApIHsgbWlwTGV2ZWxFeHRlbnQuZGVwdGggID0gMTsgfQogCiAJc3dpdGNoKGFzcGVjdCkKIAl7CmRpZmYgLS1naXQgYS9zcmMvVnVsa2FuL1ZrUGh5c2ljYWxEZXZpY2UuY3BwIGIvc3JjL1Z1bGthbi9Wa1BoeXNpY2FsRGV2aWNlLmNwcAppbmRleCBkZGE0NWYzLi44YTNiNTlhIDEwMDY0NAotLS0gYS9zcmMvVnVsa2FuL1ZrUGh5c2ljYWxEZXZpY2UuY3BwCisrKyBiL3NyYy9WdWxrYW4vVmtQaHlzaWNhbERldmljZS5jcHAKQEAgLTM3NSw3ICszNzUsNyBAQAogCXJldHVybiB0cnVlOwogfQogCi12b2lkIFBoeXNpY2FsRGV2aWNlOjpnZXRGb3JtYXRQcm9wZXJ0aWVzKFZrRm9ybWF0IGZvcm1hdCwgVmtGb3JtYXRQcm9wZXJ0aWVzKiBwRm9ybWF0UHJvcGVydGllcykgY29uc3QKK3ZvaWQgUGh5c2ljYWxEZXZpY2U6OmdldEZvcm1hdFByb3BlcnRpZXMoRm9ybWF0IGZvcm1hdCwgVmtGb3JtYXRQcm9wZXJ0aWVzKiBwRm9ybWF0UHJvcGVydGllcykgY29uc3QKIHsKIAlwRm9ybWF0UHJvcGVydGllcy0+bGluZWFyVGlsaW5nRmVhdHVyZXMgPSAwOyAvLyBVbnN1cHBvcnRlZCBmb3JtYXQKIAlwRm9ybWF0UHJvcGVydGllcy0+b3B0aW1hbFRpbGluZ0ZlYXR1cmVzID0gMDsgLy8gVW5zdXBwb3J0ZWQgZm9ybWF0CkBAIC02NjAsMTEgKzY2MCwxNyBAQAogCWRlZmF1bHQ6CiAJCWJyZWFrOwogCX0KKworCWlmKHBGb3JtYXRQcm9wZXJ0aWVzLT5vcHRpbWFsVGlsaW5nRmVhdHVyZXMpCisJeworCQlwRm9ybWF0UHJvcGVydGllcy0+bGluZWFyVGlsaW5nRmVhdHVyZXMgPSBWS19GT1JNQVRfRkVBVFVSRV9UUkFOU0ZFUl9TUkNfQklUIHwKKwkJICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVktfRk9STUFUX0ZFQVRVUkVfVFJBTlNGRVJfRFNUX0JJVDsKKwl9CiB9CiAKLXZvaWQgUGh5c2ljYWxEZXZpY2U6OmdldEltYWdlRm9ybWF0UHJvcGVydGllcyhWa0Zvcm1hdCBmb3JtYXQsIFZrSW1hZ2VUeXBlIHR5cGUsIFZrSW1hZ2VUaWxpbmcgdGlsaW5nLAordm9pZCBQaHlzaWNhbERldmljZTo6Z2V0SW1hZ2VGb3JtYXRQcm9wZXJ0aWVzKEZvcm1hdCBmb3JtYXQsIFZrSW1hZ2VUeXBlIHR5cGUsIFZrSW1hZ2VUaWxpbmcgdGlsaW5nLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZrSW1hZ2VVc2FnZUZsYWdzIHVzYWdlLCBWa0ltYWdlQ3JlYXRlRmxhZ3MgZmxhZ3MsCi0JICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVmtJbWFnZUZvcm1hdFByb3BlcnRpZXMqIHBJbWFnZUZvcm1hdFByb3BlcnRpZXMpIGNvbnN0CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVmtJbWFnZUZvcm1hdFByb3BlcnRpZXMqIHBJbWFnZUZvcm1hdFByb3BlcnRpZXMpIGNvbnN0CiB7CiAJcEltYWdlRm9ybWF0UHJvcGVydGllcy0+c2FtcGxlQ291bnRzID0gVktfU0FNUExFX0NPVU5UXzFfQklUOwogCXBJbWFnZUZvcm1hdFByb3BlcnRpZXMtPm1heEFycmF5TGF5ZXJzID0gdms6Ok1BWF9JTUFHRV9BUlJBWV9MQVlFUlM7CkBAIC03MTMsNiArNzE5LDI0IEBACiAJfQogCiAJcEltYWdlRm9ybWF0UHJvcGVydGllcy0+bWF4UmVzb3VyY2VTaXplID0gMSA8PCAzMTsgLy8gTWluaW11bSB2YWx1ZSBmb3IgbWF4UmVzb3VyY2VTaXplCisKKwkvLyAiSW1hZ2VzIGNyZWF0ZWQgd2l0aCB0aWxpbmcgZXF1YWwgdG8gVktfSU1BR0VfVElMSU5HX0xJTkVBUiBoYXZlIGZ1cnRoZXIgcmVzdHJpY3Rpb25zIG9uIHRoZWlyIGxpbWl0cyBhbmQgY2FwYWJpbGl0aWVzCisJLy8gIGNvbXBhcmVkIHRvIGltYWdlcyBjcmVhdGVkIHdpdGggdGlsaW5nIGVxdWFsIHRvIFZLX0lNQUdFX1RJTElOR19PUFRJTUFMLiIKKwlpZih0aWxpbmcgPT0gVktfSU1BR0VfVElMSU5HX0xJTkVBUikKKwl7CisJCXBJbWFnZUZvcm1hdFByb3BlcnRpZXMtPm1heE1pcExldmVscyA9IDE7CisJCXBJbWFnZUZvcm1hdFByb3BlcnRpZXMtPm1heEFycmF5TGF5ZXJzID0gMTsKKwkJcEltYWdlRm9ybWF0UHJvcGVydGllcy0+c2FtcGxlQ291bnRzID0gVktfU0FNUExFX0NPVU5UXzFfQklUOworCX0KKworCS8vICJJbWFnZXMgY3JlYXRlZCB3aXRoIGEgZm9ybWF0IGZyb20gb25lIG9mIHRob3NlIGxpc3RlZCBpbiBGb3JtYXRzIHJlcXVpcmluZyBzYW1wbGVyIFmSQ0JDUiBjb252ZXJzaW9uIGZvciBWS19JTUFHRV9BU1BFQ1RfQ09MT1JfQklUIGltYWdlIHZpZXdzCisJLy8gIGhhdmUgZnVydGhlciByZXN0cmljdGlvbnMgb24gdGhlaXIgbGltaXRzIGFuZCBjYXBhYmlsaXRpZXMgY29tcGFyZWQgdG8gaW1hZ2VzIGNyZWF0ZWQgd2l0aCBvdGhlciBmb3JtYXRzLiIKKwlpZihmb3JtYXQuaXNZY2JjckZvcm1hdCgpKQorCXsKKwkJcEltYWdlRm9ybWF0UHJvcGVydGllcy0+bWF4TWlwTGV2ZWxzID0gMTsKKwkJcEltYWdlRm9ybWF0UHJvcGVydGllcy0+bWF4QXJyYXlMYXllcnMgPSAxOworCQlwSW1hZ2VGb3JtYXRQcm9wZXJ0aWVzLT5zYW1wbGVDb3VudHMgPSBWS19TQU1QTEVfQ09VTlRfMV9CSVQ7CisJfQogfQogCiB1aW50MzJfdCBQaHlzaWNhbERldmljZTo6Z2V0UXVldWVGYW1pbHlQcm9wZXJ0eUNvdW50KCkgY29uc3QKZGlmZiAtLWdpdCBhL3NyYy9WdWxrYW4vVmtQaHlzaWNhbERldmljZS5ocHAgYi9zcmMvVnVsa2FuL1ZrUGh5c2ljYWxEZXZpY2UuaHBwCmluZGV4IDIxNmIyMmEuLmMxMjY2NzUgMTAwNjQ0Ci0tLSBhL3NyYy9WdWxrYW4vVmtQaHlzaWNhbERldmljZS5ocHAKKysrIGIvc3JjL1Z1bGthbi9Wa1BoeXNpY2FsRGV2aWNlLmhwcApAQCAtMTYsNiArMTYsNyBAQAogI2RlZmluZSBWS19QSFlTSUNBTF9ERVZJQ0VfSFBQXwogCiAjaW5jbHVkZSAiVmtPYmplY3QuaHBwIgorI2luY2x1ZGUgIlZrRm9ybWF0LmgiCiAKICNpZmRlZiBWS19VU0VfUExBVEZPUk1fQU5EUk9JRF9LSFIKICNpbmNsdWRlIDx2dWxrYW4vdmtfYW5kcm9pZF9uYXRpdmVfYnVmZmVyLmg+CkBAIC02MCw4ICs2MSw4IEBACiAJdm9pZCBnZXRQcm9wZXJ0aWVzKGNvbnN0IFZrUGh5c2ljYWxEZXZpY2VFeHRlcm5hbEZlbmNlSW5mbyogcEV4dGVybmFsRmVuY2VJbmZvLCBWa0V4dGVybmFsRmVuY2VQcm9wZXJ0aWVzKiBwRXh0ZXJuYWxGZW5jZVByb3BlcnRpZXMpIGNvbnN0OwogCXZvaWQgZ2V0UHJvcGVydGllcyhjb25zdCBWa1BoeXNpY2FsRGV2aWNlRXh0ZXJuYWxTZW1hcGhvcmVJbmZvKiBwRXh0ZXJuYWxTZW1hcGhvcmVJbmZvLCBWa0V4dGVybmFsU2VtYXBob3JlUHJvcGVydGllcyogcEV4dGVybmFsU2VtYXBob3JlUHJvcGVydGllcykgY29uc3Q7CiAKLQl2b2lkIGdldEZvcm1hdFByb3BlcnRpZXMoVmtGb3JtYXQgZm9ybWF0LCBWa0Zvcm1hdFByb3BlcnRpZXMqIHBGb3JtYXRQcm9wZXJ0aWVzKSBjb25zdDsKLQl2b2lkIGdldEltYWdlRm9ybWF0UHJvcGVydGllcyhWa0Zvcm1hdCBmb3JtYXQsIFZrSW1hZ2VUeXBlIHR5cGUsIFZrSW1hZ2VUaWxpbmcgdGlsaW5nLAorCXZvaWQgZ2V0Rm9ybWF0UHJvcGVydGllcyhGb3JtYXQgZm9ybWF0LCBWa0Zvcm1hdFByb3BlcnRpZXMqIHBGb3JtYXRQcm9wZXJ0aWVzKSBjb25zdDsKKwl2b2lkIGdldEltYWdlRm9ybWF0UHJvcGVydGllcyhGb3JtYXQgZm9ybWF0LCBWa0ltYWdlVHlwZSB0eXBlLCBWa0ltYWdlVGlsaW5nIHRpbGluZywKIAkgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBWa0ltYWdlVXNhZ2VGbGFncyB1c2FnZSwgVmtJbWFnZUNyZWF0ZUZsYWdzIGZsYWdzLAogCSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFZrSW1hZ2VGb3JtYXRQcm9wZXJ0aWVzKiBwSW1hZ2VGb3JtYXRQcm9wZXJ0aWVzKSBjb25zdDsKIAl1aW50MzJfdCBnZXRRdWV1ZUZhbWlseVByb3BlcnR5Q291bnQoKSBjb25zdDsKZGlmZiAtLWdpdCBhL3NyYy9WdWxrYW4vbGliVnVsa2FuLmNwcCBiL3NyYy9WdWxrYW4vbGliVnVsa2FuLmNwcAppbmRleCAwODE0MTRlLi44OTFiYTNjIDEwMDY0NAotLS0gYS9zcmMvVnVsa2FuL2xpYlZ1bGthbi5jcHAKKysrIGIvc3JjL1Z1bGthbi9saWJWdWxrYW4uY3BwCkBAIC0yMzIsNiArMjMyLDEwIEBACiAJVFJBQ0UoIihWa1BoeXNpY2FsRGV2aWNlIHBoeXNpY2FsRGV2aWNlID0gJXAsIFZrRm9ybWF0IGZvcm1hdCA9ICVkLCBWa0ltYWdlVHlwZSB0eXBlID0gJWQsIFZrSW1hZ2VUaWxpbmcgdGlsaW5nID0gJWQsIFZrSW1hZ2VVc2FnZUZsYWdzIHVzYWdlID0gJWQsIFZrSW1hZ2VDcmVhdGVGbGFncyBmbGFncyA9ICVkLCBWa0ltYWdlRm9ybWF0UHJvcGVydGllcyogcEltYWdlRm9ybWF0UHJvcGVydGllcyA9ICVwKSIsCiAJCQlwaHlzaWNhbERldmljZSwgKGludClmb3JtYXQsIChpbnQpdHlwZSwgKGludCl0aWxpbmcsIHVzYWdlLCBmbGFncywgcEltYWdlRm9ybWF0UHJvcGVydGllcyk7CiAKKwkvLyAiSWYgdGhlIGNvbWJpbmF0aW9uIG9mIHBhcmFtZXRlcnMgdG8gdmtHZXRQaHlzaWNhbERldmljZUltYWdlRm9ybWF0UHJvcGVydGllcyBpcyBub3Qgc3VwcG9ydGVkIGJ5IHRoZSBpbXBsZW1lbnRhdGlvbgorCS8vICBmb3IgdXNlIGluIHZrQ3JlYXRlSW1hZ2UsIHRoZW4gYWxsIG1lbWJlcnMgb2YgVmtJbWFnZUZvcm1hdFByb3BlcnRpZXMgd2lsbCBiZSBmaWxsZWQgd2l0aCB6ZXJvLiIKKwltZW1zZXQocEltYWdlRm9ybWF0UHJvcGVydGllcywgMCwgc2l6ZW9mKFZrSW1hZ2VGb3JtYXRQcm9wZXJ0aWVzKSk7CisKIAlWa0Zvcm1hdFByb3BlcnRpZXMgcHJvcGVydGllczsKIAl2azo6Q2FzdChwaHlzaWNhbERldmljZSktPmdldEZvcm1hdFByb3BlcnRpZXMoZm9ybWF0LCAmcHJvcGVydGllcyk7CiAKQEAgLTMwMiw2ICszMDYsMzEgQEAKIAkJCVZLX0lNQUdFX1VTQUdFX1RSQU5TSUVOVF9BVFRBQ0hNRU5UX0JJVDsKIAlBU1NFUlQoISh1c2FnZSAmIH4oYWxsUmVjb2duaXplZFVzYWdlQml0cykpKTsKIAorCS8vICJJbWFnZXMgY3JlYXRlZCB3aXRoIHRpbGluZyBlcXVhbCB0byBWS19JTUFHRV9USUxJTkdfTElORUFSIGhhdmUgZnVydGhlciByZXN0cmljdGlvbnMgb24gdGhlaXIgbGltaXRzIGFuZCBjYXBhYmlsaXRpZXMKKwkvLyAgY29tcGFyZWQgdG8gaW1hZ2VzIGNyZWF0ZWQgd2l0aCB0aWxpbmcgZXF1YWwgdG8gVktfSU1BR0VfVElMSU5HX09QVElNQUwuIgorCWlmKHRpbGluZyA9PSBWS19JTUFHRV9USUxJTkdfTElORUFSKQorCXsKKwkJaWYodHlwZSAhPSBWS19JTUFHRV9UWVBFXzJEKQorCQl7CisJCQlyZXR1cm4gVktfRVJST1JfRk9STUFUX05PVF9TVVBQT1JURUQ7CisJCX0KKworCQlpZih2azo6Rm9ybWF0KGZvcm1hdCkuaXNEZXB0aCgpIHx8IHZrOjpGb3JtYXQoZm9ybWF0KS5pc1N0ZW5jaWwoKSkKKwkJeworCQkJcmV0dXJuIFZLX0VSUk9SX0ZPUk1BVF9OT1RfU1VQUE9SVEVEOworCQl9CisJfQorCisJLy8gIkltYWdlcyBjcmVhdGVkIHdpdGggYSBmb3JtYXQgZnJvbSBvbmUgb2YgdGhvc2UgbGlzdGVkIGluIEZvcm1hdHMgcmVxdWlyaW5nIHNhbXBsZXIgWZJDQkNSIGNvbnZlcnNpb24gZm9yIFZLX0lNQUdFX0FTUEVDVF9DT0xPUl9CSVQgaW1hZ2Ugdmlld3MKKwkvLyAgaGF2ZSBmdXJ0aGVyIHJlc3RyaWN0aW9ucyBvbiB0aGVpciBsaW1pdHMgYW5kIGNhcGFiaWxpdGllcyBjb21wYXJlZCB0byBpbWFnZXMgY3JlYXRlZCB3aXRoIG90aGVyIGZvcm1hdHMuIgorCWlmKHZrOjpGb3JtYXQoZm9ybWF0KS5pc1ljYmNyRm9ybWF0KCkpCisJeworCQlpZih0eXBlICE9IFZLX0lNQUdFX1RZUEVfMkQpCisJCXsKKwkJCXJldHVybiBWS19FUlJPUl9GT1JNQVRfTk9UX1NVUFBPUlRFRDsKKwkJfQorCX0KKwogCXZrOjpDYXN0KHBoeXNpY2FsRGV2aWNlKS0+Z2V0SW1hZ2VGb3JtYXRQcm9wZXJ0aWVzKGZvcm1hdCwgdHlwZSwgdGlsaW5nLCB1c2FnZSwgZmxhZ3MsIHBJbWFnZUZvcm1hdFByb3BlcnRpZXMpOwogCiAJcmV0dXJuIFZLX1NVQ0NFU1M7Cg==