ZGlmZiAtLWdpdCBhL3NyYy9tYWluL2phdmEvY29tL2dpdGJsaXQvd2lja2V0L0dpdEJsaXRXZWJBcHAucHJvcGVydGllcyBiL3NyYy9tYWluL2phdmEvY29tL2dpdGJsaXQvd2lja2V0L0dpdEJsaXRXZWJBcHAucHJvcGVydGllcwppbmRleCBjNDZiZDYzLi5kOGE1ODk0IDEwMDY0NAotLS0gYS9zcmMvbWFpbi9qYXZhL2NvbS9naXRibGl0L3dpY2tldC9HaXRCbGl0V2ViQXBwLnByb3BlcnRpZXMKKysrIGIvc3JjL21haW4vamF2YS9jb20vZ2l0YmxpdC93aWNrZXQvR2l0QmxpdFdlYkFwcC5wcm9wZXJ0aWVzCkBAIC03MzksNiArNzM5LDggQEAKIGdiLnNzaEtleXMgPSBTU0ggS2V5cwogZ2Iuc3NoS2V5c0Rlc2NyaXB0aW9uID0gU1NIIHB1YmxpYyBrZXkgYXV0aGVudGljYXRpb24gaXMgYSBzZWN1cmUgYWx0ZXJuYXRpdmUgdG8gcGFzc3dvcmQgYXV0aGVudGljYXRpb24KIGdiLmFkZFNzaEtleSA9IEFkZCBTU0ggS2V5CitnYi5hZGRTc2hLZXlFcnJvckVtcHR5ID0gU1NIIHB1YmxpYyBrZXkgZW1wdHkuIFBsZWFzZSBwcm92aWRlIGEgdmFsaWQgU1NIIHB1YmxpYyBrZXkKK2diLmFkZFNzaEtleUVycm9yRm9ybWF0ID0gTm90IGEgdmFsaWQgU1NIIHB1YmxpYyBrZXkgZm9ybWF0LiBQbGVhc2UgcHJvdmlkZSBhIHZhbGlkIFNTSCBwdWJsaWMga2V5CiBnYi5rZXkgPSBLZXkKIGdiLmNvbW1lbnQgPSBDb21tZW50CiBnYi5zc2hLZXlDb21tZW50RGVzY3JpcHRpb24gPSBFbnRlciBhbiBvcHRpb25hbCBjb21tZW50LiBJZiBibGFuaywgdGhlIGNvbW1lbnQgd2lsbCBiZSBleHRyYWN0ZWQgZnJvbSB0aGUga2V5IGRhdGEuCmRpZmYgLS1naXQgYS9zcmMvbWFpbi9qYXZhL2NvbS9naXRibGl0L3dpY2tldC9HaXRCbGl0V2ViQXBwX2RlLnByb3BlcnRpZXMgYi9zcmMvbWFpbi9qYXZhL2NvbS9naXRibGl0L3dpY2tldC9HaXRCbGl0V2ViQXBwX2RlLnByb3BlcnRpZXMKaW5kZXggOTU5OWY3ZS4uM2Y4NzNjYyAxMDA2NDQKLS0tIGEvc3JjL21haW4vamF2YS9jb20vZ2l0YmxpdC93aWNrZXQvR2l0QmxpdFdlYkFwcF9kZS5wcm9wZXJ0aWVzCisrKyBiL3NyYy9tYWluL2phdmEvY29tL2dpdGJsaXQvd2lja2V0L0dpdEJsaXRXZWJBcHBfZGUucHJvcGVydGllcwpAQCAtNzM2LDYgKzczNiw4IEBACiBnYi5zc2hLZXlzID0gU1NIIEtleXMKIGdiLnNzaEtleXNEZXNjcmlwdGlvbiA9IFNTSCBQdWJsaWMgS2V5IEF1dGhlbnRpZml6aWVydW5nIGlzdCBlaW5lIHNpY2hlcmUgQWx0ZXJuYXRpdmUgenVyIEF1dGhlbnRpZml6aWVydW5nIG1pdCBQYXNzd29ydAogZ2IuYWRkU3NoS2V5ID0gU1NIIEtleSBoaW56dWZcdTAwZmNnZW4KK2diLmFkZFNzaEtleUVycm9yRW1wdHkgPSBTU0ggUHVibGljIEtleSBsZWVyLiBCaXR0ZSBnZWJlbiBTaWUgZWluZW4gZ1x1MDBmbHRpZ2VuIFNTSCBQdWJsaWMgS2V5IGFuCitnYi5hZGRTc2hLZXlFcnJvckZvcm1hdCA9IFNTSCBQdWJsaWMgS2V5IEZvcm1hdCB1bmf8bHRpZy4gQml0dGUgZ2ViZW4gU2llIGVpbmVuIGdcdTAwZmx0aWdlbiBTU0ggUHVibGljIEtleSBhbgogZ2Iua2V5ID0gS2V5CiBnYi5jb21tZW50ID0gS29tbWVudGFyCiBnYi5zc2hLZXlDb21tZW50RGVzY3JpcHRpb24gPSBHZWJlbiBTaWUgb3B0aW9uYWwgZWluZW4gS29tbWVudGFyIGVpbi4gRmFsbHMgU2llIGRpZXMgbmljaHQgdHVuLCB3aXJkIGRlciBLb21tZW50YXIgYXVzIGRlbSBLZXkgZXh0cmFoaWVydC4KZGlmZiAtLWdpdCBhL3NyYy9tYWluL2phdmEvY29tL2dpdGJsaXQvd2lja2V0L3BhZ2VzL0Jhc2VQYWdlLmphdmEgYi9zcmMvbWFpbi9qYXZhL2NvbS9naXRibGl0L3dpY2tldC9wYWdlcy9CYXNlUGFnZS5qYXZhCmluZGV4IDBkOTlmNWUuLmJiOTdlZTggMTAwNjQ0Ci0tLSBhL3NyYy9tYWluL2phdmEvY29tL2dpdGJsaXQvd2lja2V0L3BhZ2VzL0Jhc2VQYWdlLmphdmEKKysrIGIvc3JjL21haW4vamF2YS9jb20vZ2l0YmxpdC93aWNrZXQvcGFnZXMvQmFzZVBhZ2UuamF2YQpAQCAtMjUxLDcgKzI1MSw3IEBACiAJCWFkZChyb290TGluayk7DQogDQogCQkvLyBGZWVkYmFjayBwYW5lbCBmb3IgaW5mbywgd2FybmluZywgYW5kIG5vbi1mYXRhbCBlcnJvciBtZXNzYWdlcw0KLQkJYWRkKG5ldyBGZWVkYmFja1BhbmVsKCJmZWVkYmFjayIpKTsNCisJCWFkZChuZXcgRmVlZGJhY2tQYW5lbCgiZmVlZGJhY2siKS5zZXRPdXRwdXRNYXJrdXBJZCh0cnVlKSk7DQogDQogCQlhZGQobmV3IExhYmVsKCJnYlZlcnNpb24iLCAidiIgKyBDb25zdGFudHMuZ2V0VmVyc2lvbigpKSk7DQogCQlpZiAoYXBwKCkuc2V0dGluZ3MoKS5nZXRCb29sZWFuKEtleXMud2ViLmFnZ3Jlc3NpdmVIZWFwTWFuYWdlbWVudCwgZmFsc2UpKSB7DQpkaWZmIC0tZ2l0IGEvc3JjL21haW4vamF2YS9jb20vZ2l0YmxpdC93aWNrZXQvcGFuZWxzL1NzaEtleXNQYW5lbC5qYXZhIGIvc3JjL21haW4vamF2YS9jb20vZ2l0YmxpdC93aWNrZXQvcGFuZWxzL1NzaEtleXNQYW5lbC5qYXZhCmluZGV4IDRiODc4NzYuLjYyOWM1OGUgMTAwNjQ0Ci0tLSBhL3NyYy9tYWluL2phdmEvY29tL2dpdGJsaXQvd2lja2V0L3BhbmVscy9Tc2hLZXlzUGFuZWwuamF2YQorKysgYi9zcmMvbWFpbi9qYXZhL2NvbS9naXRibGl0L3dpY2tldC9wYW5lbHMvU3NoS2V5c1BhbmVsLmphdmEKQEAgLTI0LDYgKzI0LDcgQEAKIGltcG9ydCBvcmcuYXBhY2hlLndpY2tldC5hamF4Lm1hcmt1cC5odG1sLmZvcm0uQWpheEJ1dHRvbjsNCiBpbXBvcnQgb3JnLmFwYWNoZS53aWNrZXQubWFya3VwLmh0bWwuYmFzaWMuTGFiZWw7DQogaW1wb3J0IG9yZy5hcGFjaGUud2lja2V0Lm1hcmt1cC5odG1sLmZvcm0uRm9ybTsNCitpbXBvcnQgb3JnLmFwYWNoZS53aWNrZXQubWFya3VwLmh0bWwucGFuZWwuRmVlZGJhY2tQYW5lbDsNCiBpbXBvcnQgb3JnLmFwYWNoZS53aWNrZXQubWFya3VwLnJlcGVhdGVyLkl0ZW07DQogaW1wb3J0IG9yZy5hcGFjaGUud2lja2V0Lm1hcmt1cC5yZXBlYXRlci5kYXRhLkRhdGFWaWV3Ow0KIGltcG9ydCBvcmcuYXBhY2hlLndpY2tldC5tYXJrdXAucmVwZWF0ZXIuZGF0YS5MaXN0RGF0YVByb3ZpZGVyOw0KQEAgLTEyMyw2ICsxMjQsOSBAQAogCQkJCSJzcGFuNSIsDQogCQkJCWtleUNvbW1lbnQpKTsNCiANCisvLwkJZmluYWwgRmVlZGJhY2tQYW5lbCBmZWVkYmFjayA9IG5ldyBGZWVkYmFja1BhbmVsKCJmZWVkYmFjayIpOw0KKy8vCQlmZWVkYmFjay5zZXRPdXRwdXRNYXJrdXBJZCh0cnVlKTsNCisvLwkJYWRkS2V5Rm9ybS5hZGQoZmVlZGJhY2spOw0KIAkJYWRkS2V5Rm9ybS5hZGQobmV3IEFqYXhCdXR0b24oImFkZEtleUJ1dHRvbiIpIHsNCiANCiAJCQlwcml2YXRlIHN0YXRpYyBmaW5hbCBsb25nIHNlcmlhbFZlcnNpb25VSUQgPSAxTDsNCkBAIC0xMzQsNiArMTM4LDggQEAKIAkJCQlTdHJpbmcgZGF0YSA9IGtleURhdGEuZ2V0T2JqZWN0KCk7DQogCQkJCWlmIChTdHJpbmdVdGlscy5pc0VtcHR5KGRhdGEpKSB7DQogCQkJCQkvLyBkbyBub3Qgc3VibWl0IGVtcHR5IGtleQ0KKwkJCQkJZXJyb3IoZ2V0U3RyaW5nKCJnYi5hZGRTc2hLZXlFcnJvckVtcHR5IikpOw0KKwkJCQkJdGFyZ2V0LmFkZENvbXBvbmVudChnZXRQYWdlKCkuZ2V0KCJmZWVkYmFjayIpKTsNCiAJCQkJCXJldHVybjsNCiAJCQkJfQ0KIA0KQEAgLTE0Miw2ICsxNDgsOCBAQAogCQkJCQlrZXkuZ2V0UHVibGljS2V5KCk7DQogCQkJCX0gY2F0Y2ggKEV4Y2VwdGlvbiBlKSB7DQogCQkJCQkvLyBmYWlsZWQgdG8gcGFyc2UgdGhlIGtleQ0KKwkJCQkJZXJyb3IoZ2V0U3RyaW5nKCJnYi5hZGRTc2hLZXlFcnJvckZvcm1hdCIpKTsNCisJCQkJCXRhcmdldC5hZGRDb21wb25lbnQoZ2V0UGFnZSgpLmdldCgiZmVlZGJhY2siKSk7DQogCQkJCQlyZXR1cm47DQogCQkJCX0NCiANCg==