From: Build Team Date: January 11 2012 5:54pm Subject: bzr push into mysql-5.1 branch (MYSQL-RE_WW:3663 to 3664) List-Archive: http://lists.mysql.com/commits/142375 Message-Id: <20120111175412.1198.qmail@helheim> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 IDM2NjQgS2FyZW4gTGFuZ2ZvcmQJMjAxMi0wMS0xMSBbbWVyZ2VdCiAgICAgIE1lcmdlIGZyb20g bXlzcWwtNS4xLjYxLXJlbGVhc2UKCiAgICBtb2RpZmllZDoKICAgICAgY21kLWxpbmUtdXRpbHMv bGliZWRpdC9jaGFydHlwZS5oCiAgICAgIGNtZC1saW5lLXV0aWxzL2xpYmVkaXQvZWxuLmMKICAg ICAgY21kLWxpbmUtdXRpbHMvbGliZWRpdC9yZWFkbGluZS5jCiAgICAgIG15c3FsLXRlc3Qvci9r ZXlfY2FjaGUucmVzdWx0CiAgICAgIG15c3FsLXRlc3Qvci9teXNxbGNoZWNrLnJlc3VsdAogICAg ICBteXNxbC10ZXN0L3Qva2V5X2NhY2hlLnRlc3QKICAgICAgbXlzcWwtdGVzdC90L21lcmdlLnRl c3QKICAgICAgbXlzcWwtdGVzdC90L215c3FsY2hlY2sudGVzdAogICAgICBzcWwvc3FsX3RhYmxl LmNjCiAgICAgIHN0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cKICAgICAgc3RvcmFnZS9t eWlzYW0vbWlfcHJlbG9hZC5jCiAgICAgIHVuaXR0ZXN0L215c3lzL2JpdG1hcC10LmMKIDM2NjMg TmlyYmhheSBDaG91YmV5CTIwMTItMDEtMTAKICAgICAgQlVHIzExNzYwMzg0IC0gNTI3OTI6IG15 c3FsZHVtcCBpbiBYTUwgbW9kZSBkb2VzIG5vdCBkdW1wCiAgICAgICAgICAgICAgICAgICAgICAg ICAgIHJvdXRpbmVzLgogICAgICAKICAgICAgbXlzcWxkdW1wIGluIHhtbCBtb2RlIGRpZCBub3Qg ZHVtcCByb3V0aW5lcywgZXZlbnRzIG9yCiAgICAgIHRyaWdnZXJzLgogICAgICAKICAgICAgVGhp cyBwYXRjaCBmaXhlcyB0aGlzIGlzc3VlIGJ5IGZpeGluZyB0aGUgaWYgY29uZGl0aW9ucwogICAg ICB0aGF0IGRpc2FsbG93ZWQgdGhlIGR1bXAgb2YgYWJvdmUgbWVudGlvbmVkIG9iamVjdHMgaW4K ICAgICAgeG1sIG1vZGUsIGFuZCBhZGRlZCB0aGUgcmVxdWlyZWQgY29kZSB0byBlbmFibGUgZHVt cAogICAgICBpbiB4bWwgZm9ybWF0LgogICAgIEAgY2xpZW50L215c3FsZHVtcC5jCiAgICAgICAg QlVHIzExNzYwMzg0IC0gNTI3OTI6IG15c3FsZHVtcCBpbiBYTUwgbW9kZSBkb2VzIG5vdCBkdW1w CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJvdXRpbmVzLgogICAgICAgIAogICAgICAg IEZpeGVkIHNvbWUgaWYgY29uZGl0aW9ucyB0byBhbGxvdyBleGVjdXRpb24gb2YgZHVtcCBtZXRo b2RzCiAgICAgICAgZm9yIHhtbCBhbmQgZnVydGhlciBhZGRlZCB0aGUgcmVsZXZhbnQgY29kZSBh dCBwbGFjZXMgdG8gcHJvZHVjZQogICAgICAgIHRoZSBkdW1wIGluIHhtbCBmb3JtYXQuCiAgICAg QCBteXNxbC10ZXN0L3IvbXlzcWxkdW1wLnJlc3VsdAogICAgICAgIEFkZGVkIGEgdGVzdCBjYXNl IGZvciBCdWcjMTE3NjAzODQuCiAgICAgQCBteXNxbC10ZXN0L3QvbXlzcWxkdW1wLnRlc3QKICAg ICAgICBBZGRlZCBhIHRlc3QgY2FzZSBmb3IgQnVnIzExNzYwMzg0LgoKICAgIG1vZGlmaWVkOgog ICAgICBjbGllbnQvbXlzcWxkdW1wLmMKICAgICAgbXlzcWwtdGVzdC9yL215c3FsZHVtcC5yZXN1 bHQKICAgICAgbXlzcWwtdGVzdC90L215c3FsZHVtcC50ZXN0Cj09PSBtb2RpZmllZCBmaWxlICdj bWQtbGluZS11dGlscy9saWJlZGl0L2NoYXJ0eXBlLmgnCi0tLSBhL2NtZC1saW5lLXV0aWxzL2xp YmVkaXQvY2hhcnR5cGUuaAkyMDExLTEwLTEzIDE5OjMzOjI1ICswMDAwCisrKyBiL2NtZC1saW5l LXV0aWxzL2xpYmVkaXQvY2hhcnR5cGUuaAkyMDEyLTAxLTExIDE3OjQwOjI5ICswMDAwCkBAIC00 NSwxMSArNDUsMTEgQEAKICAqIHNlZW1zIHRvIGFjdHVhbGx5IGFkdmVydGlzZSB0aGlzIHByb3Bl cmx5LCBkZXNwaXRlIFVuaWNvZGUgMy4xIGhhdmluZwogICogYmVlbiBhcm91bmQgc2luY2UgMjAw MS4uLiAqLwogCi0vKiBYWFhNWVNRTCA6IEFkZGVkIEZyZWVCU0QgdG8gYnlwYXNzIHRoaXMgY2hl Y2suCi0gIFRPRE8gOiBWZXJpZnkgaWYgRnJlZUJTRCBzdG9yZXMgSVNPIDEwNjQ2IGluIHdjaGFy X3QuICovCisvKiBYWFhNWVNRTCA6IEFkZGVkIEZyZWVCU0QgJiBBSVggdG8gYnlwYXNzIHRoaXMg Y2hlY2suCisgIFRPRE8gOiBWZXJpZnkgaWYgRnJlZUJTRCAmIEFJWCBzdG9yZXMgSVNPIDEwNjQ2 IGluIHdjaGFyX3QuICovCiAjaWYgIWRlZmluZWQoX19OZXRCU0RfXykgJiYgIWRlZmluZWQoX19z dW4pIFwKICAgJiYgIShkZWZpbmVkKF9fQVBQTEVfXykgJiYgZGVmaW5lZChfX01BQ0hfXykpIFwK LSAgJiYgIWRlZmluZWQoX19GcmVlQlNEX18pCisgICYmICFkZWZpbmVkKF9fRnJlZUJTRF9fKSAm JiAhZGVmaW5lZChfQUlYKQogI2lmbmRlZiBfX1NURENfSVNPXzEwNjQ2X18KIC8qIEluIG1hbnkg cGxhY2VzIGl0IGlzIGFzc3VtZWQgdGhhdCB0aGUgZmlyc3QgMTI3IGNvZGUgcG9pbnRzIGFyZSBB U0NJSQogICogY29tcGF0aWJsZSwgc28gZW5zdXJlIHdjaGFyX3QgaW5kZWVkIGRvZXMgSVNPIDEw NjQ2IGFuZCBub3Qgc29tZSBvdGhlcgoKPT09IG1vZGlmaWVkIGZpbGUgJ2NtZC1saW5lLXV0aWxz L2xpYmVkaXQvZWxuLmMnCi0tLSBhL2NtZC1saW5lLXV0aWxzL2xpYmVkaXQvZWxuLmMJMjAxMS0x MC0xMyAxOTozMzoyNSArMDAwMAorKysgYi9jbWQtbGluZS11dGlscy9saWJlZGl0L2Vsbi5jCTIw MTItMDEtMTEgMTc6NDA6MjkgKzAwMDAKQEAgLTIwMCw3ICsyMDAsNyBAQCBlbF9zZXQoRWRpdExp bmUgKmVsLCBpbnQgb3AsIC4uLikKIAkJICAgIHJldCA9IC0xOwogCQkgICAgZ290byBvdXQ7CiAJ CX0KLQkJLy8gWFhYOiBUaGUgdHdvIHN0cmR1cCdzIGxlYWsKKyAgICAgICAgICAgICAgICAvKiBY WFg6IFRoZSB0d28gc3RyZHVwcyBsZWFrLiAqLwogCQlyZXQgPSBtYXBfYWRkZnVuYyhlbCwgU3Ry ZHVwKHdhcmd2WzBdKSwgU3RyZHVwKHdhcmd2WzFdKSwKIAkJICAgIGZ1bmMpOwogCQljdF9mcmVl X2FyZ3Yod2FyZ3YpOwoKPT09IG1vZGlmaWVkIGZpbGUgJ2NtZC1saW5lLXV0aWxzL2xpYmVkaXQv cmVhZGxpbmUuYycKLS0tIGEvY21kLWxpbmUtdXRpbHMvbGliZWRpdC9yZWFkbGluZS5jCTIwMTEt MTAtMTMgMTk6MzM6MjUgKzAwMDAKKysrIGIvY21kLWxpbmUtdXRpbHMvbGliZWRpdC9yZWFkbGlu ZS5jCTIwMTItMDEtMTEgMTc6NDA6MjkgKzAwMDAKQEAgLTE5NzgsNyArMTk3OCw3IEBAIHJsX2Nh bGxiYWNrX3JlYWRfY2hhcigpCiAJCX0gZWxzZQogCQkJd2J1ZiA9IE5VTEw7CiAJCSgqKHZvaWQg KCopKGNvbnN0IGNoYXIgKikpcmxfbGluZWZ1bmMpKHdidWYpOwotCQkvL2VsX3NldChlLCBFTF9V TkJVRkZFUkVELCAxKTsKKyAgICAgICAgICAgICAgICAvKmVsX3NldChlLCBFTF9VTkJVRkZFUkVE LCAxKTsqLwogCX0KIH0KIAoKPT09IG1vZGlmaWVkIGZpbGUgJ215c3FsLXRlc3Qvci9rZXlfY2Fj aGUucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3Iva2V5X2NhY2hlLnJlc3VsdAkyMDEwLTExLTI1 IDAzOjExOjA1ICswMDAwCisrKyBiL215c3FsLXRlc3Qvci9rZXlfY2FjaGUucmVzdWx0CTIwMTEt MTItMTQgMTM6NDE6NDAgKzAwMDAKQEAgLTM2NSwzICszNjUsMTkgQEAgVmFyaWFibGVfbmFtZQlW YWx1ZQoga2V5X2NhY2hlX2Jsb2NrX3NpemUJMTUzNgogU0VUIEdMT0JBTCBrZXlfY2FjaGVfYmxv Y2tfc2l6ZT0gQGJ1ZzI4NDc4X2tleV9jYWNoZV9ibG9ja19zaXplOwogRFJPUCBUQUJMRSB0MTsK KyMKKyMgQnVnIzEyMzYxMTEzOiBjcmFzaCB3aGVuIGxvYWQgaW5kZXggaW50byBjYWNoZQorIwor IyBOb3RlIHRoYXQgdGhpcyBjcmVhdGVzIGFuIGVtcHR5IGRpc2FibGVkIGtleSBjYWNoZSEKK1NF VCBHTE9CQUwga2V5X2NhY2hlX25vbmUua2V5X2NhY2hlX2Jsb2NrX3NpemUgPSAxMDI0OworQ1JF QVRFIFRBQkxFIHQxIChhIElOVCwgYiBJTlRFR0VSIE5PVCBOVUxMLCBLRVkgKGIpICkgRU5HSU5F ID0gTVlJU0FNOworSU5TRVJUIElOVE8gdDEgVkFMVUVTICgxLCAxKTsKK0NBQ0hFIElOREVYIHQx IGluIGtleV9jYWNoZV9ub25lOworRVJST1IgSFkwMDA6IFVua25vd24ga2V5IGNhY2hlICdrZXlf Y2FjaGVfbm9uZScKKyMgVGhlIGJ1ZyBjcmFzaGVkIHRoZSBzZXJ2ZXIgYXQgTE9BRCBJTkRFWCBi ZWxvdy4gTm93IGl0IHdpbGwgc3VjY2VlZCAKKyMgc2luY2UgdGhlIGRlZmF1bHQgY2FjaGUgaXMg dXNlZCBkdWUgdG8gQ0FDSEUgSU5ERVggZmFpbGVkIGZvcgorIyBrZXlfY2FjaGVfbm9uZS4KK0xP QUQgSU5ERVggSU5UTyBDQUNIRSB0MTsKK1RhYmxlCU9wCU1zZ190eXBlCU1zZ190ZXh0Cit0ZXN0 LnQxCXByZWxvYWRfa2V5cwlzdGF0dXMJT0sKK0RST1AgVEFCTEUgdDE7Cgo9PT0gbW9kaWZpZWQg ZmlsZSAnbXlzcWwtdGVzdC9yL215c3FsY2hlY2sucmVzdWx0JwotLS0gYS9teXNxbC10ZXN0L3Iv bXlzcWxjaGVjay5yZXN1bHQJMjAwOS0wNy0xNCAxNzowODozOCArMDAwMAorKysgYi9teXNxbC10 ZXN0L3IvbXlzcWxjaGVjay5yZXN1bHQJMjAxMS0xMi0xNSAxNTo1OToxOCArMDAwMApAQCAtMTQ3 LDYgKzE0Nyw3IEBAIERST1AgVEFCTEUgYEBgOwogQ1JFQVRFIFRBQkxFIGDvv73vv71gIChhIElO VCk7CiBTRVQgTkFNRVMgREVGQVVMVDsKIG15c3FsY2hlY2sgLS1kZWZhdWx0LWNoYXJhY3Rlci1z ZXQ9ImxhdGluMSIgLS1kYXRhYmFzZXMgdGVzdAorY2FsbCBtdHIuYWRkX3N1cHByZXNzaW9uKCJD YW4ndCBmaW5kIGZpbGU6ICcuLnRlc3QuQDAwM2YuZnJtJyIpOwogdGVzdC4/CiBFcnJvciAgICA6 IFRhYmxlIGRvZXNuJ3QgZXhpc3QKIHN0YXR1cyAgIDogT3BlcmF0aW9uIGZhaWxlZAoKPT09IG1v ZGlmaWVkIGZpbGUgJ215c3FsLXRlc3QvdC9rZXlfY2FjaGUudGVzdCcKLS0tIGEvbXlzcWwtdGVz dC90L2tleV9jYWNoZS50ZXN0CTIwMTAtMTEtMjUgMDM6MTE6MDUgKzAwMDAKKysrIGIvbXlzcWwt dGVzdC90L2tleV9jYWNoZS50ZXN0CTIwMTEtMTItMTQgMTM6NDE6NDAgKzAwMDAKQEAgLTI0OCwz ICsyNDgsMTkgQEAgU0VUIEdMT0JBTCBrZXlfY2FjaGVfYmxvY2tfc2l6ZT0gQGJ1ZzI4NAogRFJP UCBUQUJMRSB0MTsKIAogIyBFbmQgb2YgNC4xIHRlc3RzCisKKy0tZWNobyAjCistLWVjaG8gIyBC dWcjMTIzNjExMTM6IGNyYXNoIHdoZW4gbG9hZCBpbmRleCBpbnRvIGNhY2hlCistLWVjaG8gIwor CistLWVjaG8gIyBOb3RlIHRoYXQgdGhpcyBjcmVhdGVzIGFuIGVtcHR5IGRpc2FibGVkIGtleSBj YWNoZSEKK1NFVCBHTE9CQUwga2V5X2NhY2hlX25vbmUua2V5X2NhY2hlX2Jsb2NrX3NpemUgPSAx MDI0OworQ1JFQVRFIFRBQkxFIHQxIChhIElOVCwgYiBJTlRFR0VSIE5PVCBOVUxMLCBLRVkgKGIp ICkgRU5HSU5FID0gTVlJU0FNOworSU5TRVJUIElOVE8gdDEgVkFMVUVTICgxLCAxKTsKKy0tZXJy b3IgRVJfVU5LTk9XTl9LRVlfQ0FDSEUKK0NBQ0hFIElOREVYIHQxIGluIGtleV9jYWNoZV9ub25l OworLS1lY2hvICMgVGhlIGJ1ZyBjcmFzaGVkIHRoZSBzZXJ2ZXIgYXQgTE9BRCBJTkRFWCBiZWxv dy4gTm93IGl0IHdpbGwgc3VjY2VlZCAKKy0tZWNobyAjIHNpbmNlIHRoZSBkZWZhdWx0IGNhY2hl IGlzIHVzZWQgZHVlIHRvIENBQ0hFIElOREVYIGZhaWxlZCBmb3IKKy0tZWNobyAjIGtleV9jYWNo ZV9ub25lLgorTE9BRCBJTkRFWCBJTlRPIENBQ0hFIHQxOworRFJPUCBUQUJMRSB0MTsKCj09PSBt b2RpZmllZCBmaWxlICdteXNxbC10ZXN0L3QvbWVyZ2UudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC90 L21lcmdlLnRlc3QJMjAxMS0wOC0xOCAwNjozODo1MSArMDAwMAorKysgYi9teXNxbC10ZXN0L3Qv bWVyZ2UudGVzdAkyMDExLTEyLTE1IDE1OjU5OjE4ICswMDAwCkBAIC0xODE3LDkgKzE4MTcsMTMg QEAgQ1JFQVRFIFRBQkxFIHQxKGEgSU5UKTsKIC0tZWNobyAjIFRlc3QgcmVhdHRhY2ggbWVyZ2Ug ZmFpbHVyZQogTE9DSyBUQUJMRVMgbTEgUkVBRDsKIC0tZWNobyAjIFJlcGxhY2UgJ3QxJyB3aXRo ICd0MycgdGFibGUgdXNpbmcgZmlsZSBvcGVyYXRpb25zLgotcmVtb3ZlX2ZpbGUgJE1ZU1FMRF9E QVRBRElSL3Rlc3QvdDEuZnJtOwotcmVtb3ZlX2ZpbGUgJE1ZU1FMRF9EQVRBRElSL3Rlc3QvdDEu TVlJOwotcmVtb3ZlX2ZpbGUgJE1ZU1FMRF9EQVRBRElSL3Rlc3QvdDEuTVlEOworIyBtb3ZlICsg cmVtb3ZlIGlzIGEgd29yayBhcm91bmQgZm9yIHdpbmRvd3MuCittb3ZlX2ZpbGUgJE1ZU1FMRF9E QVRBRElSL3Rlc3QvdDEuZnJtICRNWVNRTERfREFUQURJUi90ZXN0L29sZHQxLmZybTsKK21vdmVf ZmlsZSAkTVlTUUxEX0RBVEFESVIvdGVzdC90MS5NWUkgJE1ZU1FMRF9EQVRBRElSL3Rlc3Qvb2xk dDEuTVlJOworbW92ZV9maWxlICRNWVNRTERfREFUQURJUi90ZXN0L3QxLk1ZRCAkTVlTUUxEX0RB VEFESVIvdGVzdC9vbGR0MS5NWUQ7CityZW1vdmVfZmlsZSAkTVlTUUxEX0RBVEFESVIvdGVzdC9v bGR0MS5mcm07CityZW1vdmVfZmlsZSAkTVlTUUxEX0RBVEFESVIvdGVzdC9vbGR0MS5NWUk7City ZW1vdmVfZmlsZSAkTVlTUUxEX0RBVEFESVIvdGVzdC9vbGR0MS5NWUQ7CiBjb3B5X2ZpbGUgJE1Z U1FMRF9EQVRBRElSL3Rlc3QvdDMuZnJtICRNWVNRTERfREFUQURJUi90ZXN0L3QxLmZybTsKIGNv cHlfZmlsZSAkTVlTUUxEX0RBVEFESVIvdGVzdC90My5NWUkgJE1ZU1FMRF9EQVRBRElSL3Rlc3Qv dDEuTVlJOwogY29weV9maWxlICRNWVNRTERfREFUQURJUi90ZXN0L3QzLk1ZRCAkTVlTUUxEX0RB VEFESVIvdGVzdC90MS5NWUQ7Cgo9PT0gbW9kaWZpZWQgZmlsZSAnbXlzcWwtdGVzdC90L215c3Fs Y2hlY2sudGVzdCcKLS0tIGEvbXlzcWwtdGVzdC90L215c3FsY2hlY2sudGVzdAkyMDA5LTA3LTE0 IDE3OjA4OjM4ICswMDAwCisrKyBiL215c3FsLXRlc3QvdC9teXNxbGNoZWNrLnRlc3QJMjAxMS0x Mi0xNSAxNTo1OToxOCArMDAwMApAQCAtMTM4LDYgKzEzOCw3IEBAIENSRUFURSBUQUJMRSBg77+9 77+9YCAoYSBJTlQpOwogU0VUIE5BTUVTIERFRkFVTFQ7CiAtLWVjaG8gbXlzcWxjaGVjayAtLWRl ZmF1bHQtY2hhcmFjdGVyLXNldD0ibGF0aW4xIiAtLWRhdGFiYXNlcyB0ZXN0CiAjIEVycm9yIHJl dHVybmVkIGRlcGVuZHMgb24gcGxhdGZvcm0sIHJlcGxhY2UgaXQgd2l0aCAiVGFibGUgZG9lc24n dCBleGlzdCIKK2NhbGwgbXRyLmFkZF9zdXBwcmVzc2lvbigiQ2FuJ3QgZmluZCBmaWxlOiAnLi50 ZXN0LkAwMDNmLmZybSciKTsKIC0tcmVwbGFjZV9yZXN1bHQgIkNhbid0IGZpbmQgZmlsZTogJy4v dGVzdC9AMDAzZi5mcm0nIChlcnJubzogMjIpIiAiVGFibGUgZG9lc24ndCBleGlzdCIgIlRhYmxl ICd0ZXN0Lj8nIGRvZXNuJ3QgZXhpc3QiICJUYWJsZSBkb2Vzbid0IGV4aXN0IgogLS1leGVjICRN WVNRTF9DSEVDSyAtLWRlZmF1bHQtY2hhcmFjdGVyLXNldD0ibGF0aW4xIiAtLWRhdGFiYXNlcyB0 ZXN0CiAtLWVjaG8gbXlzcWxjaGVjayAtLWRlZmF1bHQtY2hhcmFjdGVyLXNldD0idXRmOCIgLS1k YXRhYmFzZXMgdGVzdAoKPT09IG1vZGlmaWVkIGZpbGUgJ3NxbC9zcWxfdGFibGUuY2MnCi0tLSBh L3NxbC9zcWxfdGFibGUuY2MJMjAxMS0xMS0wMSAwNjo1MDo1NCArMDAwMAorKysgYi9zcWwvc3Fs X3RhYmxlLmNjCTIwMTEtMTItMTQgMTM6NDE6NDAgKzAwMDAKQEAgLTUxMjYsNiArNTEyNiwxMSBA QCBib29sIG15c3FsX2Fzc2lnbl90b19rZXljYWNoZShUSEQqIHRoZCwKICAgICBEQlVHX1JFVFVS TihUUlVFKTsKICAgfQogICBwdGhyZWFkX211dGV4X3VubG9jaygmTE9DS19nbG9iYWxfc3lzdGVt X3ZhcmlhYmxlcyk7CisgIGlmICgha2V5X2NhY2hlLT5rZXlfY2FjaGVfaW5pdGVkKQorICB7Cisg ICAgbXlfZXJyb3IoRVJfVU5LTk9XTl9LRVlfQ0FDSEUsIE1ZRigwKSwga2V5X2NhY2hlX25hbWUt PnN0cik7CisgICAgREJVR19SRVRVUk4oVFJVRSk7CisgIH0KICAgY2hlY2tfb3B0LmtleV9jYWNo ZT0ga2V5X2NhY2hlOwogICBEQlVHX1JFVFVSTihteXNxbF9hZG1pbl90YWJsZSh0aGQsIHRhYmxl cywgJmNoZWNrX29wdCwKIAkJCQkiYXNzaWduX3RvX2tleWNhY2hlIiwgVExfUkVBRF9OT19JTlNF UlQsIDAsIDAsCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5n ZUxvZycKLS0tIGEvc3RvcmFnZS9pbm5vZGJfcGx1Z2luL0NoYW5nZUxvZwkyMDEyLTAxLTEwIDA1 OjE4OjU4ICswMDAwCisrKyBiL3N0b3JhZ2UvaW5ub2RiX3BsdWdpbi9DaGFuZ2VMb2cJMjAxMi0w MS0xMSAxNzo1MTo0MiArMDAwMApAQCAtMzQsNyArMzQsMTIgQEAKIDIwMTEtMTAtMjcJVGhlIElu bm9EQiBUZWFtCiAKIAkqIHJvdy9yb3cwbXlzcWwuYzoKLQlGaXggQnVnIzEyODg0NjMxIDYyMTQ2 OiBUQUJMRVMgQVJFIExPU1QgRk9SIERETAorCUZpeCBCdWcgIzEyODg0NjMxIDYyMTQ2OiBUQUJM RVMgQVJFIExPU1QgRk9SIERETAorCisyMDExLTEwLTI1CVRoZSBJbm5vREIgVGVhbQorCisJKiBo YW5kbGVyL2hhX2lubm9kYi5jYywgcm93L3JvdzBpbnMuYzoKKwlGaXggQnVnIzEzMDAyNzgzIFBB UlRJQUxMWSBVTklOSVRJQUxJWkVEIENBU0NBREUgVVBEQVRFIFZFQ1RPUgogCiAyMDExLTEwLTIw CVRoZSBJbm5vREIgVGVhbQogCgo9PT0gbW9kaWZpZWQgZmlsZSAnc3RvcmFnZS9teWlzYW0vbWlf cHJlbG9hZC5jJwotLS0gYS9zdG9yYWdlL215aXNhbS9taV9wcmVsb2FkLmMJMjAxMS0wNi0zMCAx NTozNzoxMyArMDAwMAorKysgYi9zdG9yYWdlL215aXNhbS9taV9wcmVsb2FkLmMJMjAxMS0xMi0x NCAxMzo0MTo0MCArMDAwMApAQCAtNTYsNiArNTYsOSBAQCBpbnQgbWlfcHJlbG9hZChNSV9JTkZP ICppbmZvLCB1bG9uZ2xvbmcKICAgaWYgKCFrZXlzIHx8ICFtaV9pc19hbnlfa2V5X2FjdGl2ZShr ZXlfbWFwKSB8fCBrZXlfZmlsZV9sZW5ndGggPT0gcG9zKQogICAgIERCVUdfUkVUVVJOKDApOwog CisgIC8qIFByZWxvYWQgaW50byBhIG5vbiBpbml0aWFsaXplZCBrZXkgY2FjaGUgc2hvdWxkIG5l dmVyIGhhcHBlbi4gKi8KKyAgREJVR19BU1NFUlQoc2hhcmUtPmtleV9jYWNoZS0+a2V5X2NhY2hl X2luaXRlZCk7CisKICAgYmxvY2tfbGVuZ3RoPSBrZXlpbmZvWzBdLmJsb2NrX2xlbmd0aDsKIAog ICBpZiAoaWdub3JlX2xlYXZlcykKCj09PSBtb2RpZmllZCBmaWxlICd1bml0dGVzdC9teXN5cy9i aXRtYXAtdC5jJwotLS0gYS91bml0dGVzdC9teXN5cy9iaXRtYXAtdC5jCTIwMTEtMDctMDMgMTU6 NDc6MzcgKzAwMDAKKysrIGIvdW5pdHRlc3QvbXlzeXMvYml0bWFwLXQuYwkyMDEyLTAxLTExIDE3 OjQwOjI5ICswMDAwCkBAIC00MjksNyArNDI5LDcgQEAgbXlfYm9vbCB0ZXN0X2ludGVyc2VjdChN WV9CSVRNQVAgKm1hcCwgdQogewogICB1aW50IGJpdHNpemUyID0gMSArIGdldF9yYW5kX2JpdChN QVhfVEVTVEVEX0JJVE1BUF9TSVpFIC0gMSk7CiAgIE1ZX0JJVE1BUCBtYXAyOwotICB1aW50MzIg bWFwMmJ1ZltiaXRzaXplMl07CisgIHVpbnQzMiBtYXAyYnVmW01BWF9URVNURURfQklUTUFQX1NJ WkVdOwogICB1aW50IGksIHRlc3RfYml0MSwgdGVzdF9iaXQyLCB0ZXN0X2JpdDM7CiAgIGlmIChi aXRtYXBfaW5pdCgmbWFwMiwgbWFwMmJ1ZiwgYml0c2l6ZTIsIEZBTFNFKSkKICAgewoKTm8gYnVu ZGxlIChyZWFzb246IHVzZWxlc3MgZm9yIHB1c2ggZW1haWxzKS4=