From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sjoer van der Ploeg Subject: [PATCH] Fixed building with newer GNUTLS versions. Date: Thu, 31 Mar 2016 22:58:19 +0200 Message-ID: <1459457899-24651-1-git-send-email-sfjuocekr@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aljfe-0008Oe-M3 for xen-devel@lists.xenproject.org; Thu, 31 Mar 2016 20:58:26 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: sfjuocekr@gmail.com List-Id: xen-devel@lists.xenproject.org U2lnbmVkLW9mZi1ieTogU2pvZXIgdmFuIGRlciBQbG9lZyA8c2ZqdW9jZWtyQGdtYWlsLmNvbT4K LS0tCiB2bmMuYyB8IDcxICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0OCBpbnNlcnRpb25z KCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS92bmMuYyBiL3ZuYy5jCmluZGV4IDU3 M2FmM2IuLjYxZDE1NTUgMTAwNjQ0Ci0tLSBhL3ZuYy5jCisrKyBiL3ZuYy5jCkBAIC0xOTI1LDkg KzE5MjUsOSBAQCBzdGF0aWMgaW50IHZuY190bHNfaW5pdGlhbGl6ZSh2b2lkKQogICAgIHJldHVy biAxOwogfQogCi1zdGF0aWMgZ251dGxzX2Fub25fc2VydmVyX2NyZWRlbnRpYWxzIHZuY190bHNf aW5pdGlhbGl6ZV9hbm9uX2NyZWQodm9pZCkKK3N0YXRpYyBnbnV0bHNfYW5vbl9zZXJ2ZXJfY3Jl ZGVudGlhbHNfdCB2bmNfdGxzX2luaXRpYWxpemVfYW5vbl9jcmVkKHZvaWQpCiB7Ci0gICAgZ251 dGxzX2Fub25fc2VydmVyX2NyZWRlbnRpYWxzIGFub25fY3JlZDsKKyAgICBnbnV0bHNfYW5vbl9z ZXJ2ZXJfY3JlZGVudGlhbHNfdCBhbm9uX2NyZWQ7CiAgICAgaW50IHJldDsKIAogICAgIGlmICgo cmV0ID0gZ251dGxzX2Fub25fYWxsb2NhdGVfc2VydmVyX2NyZWRlbnRpYWxzKCZhbm9uX2NyZWQp KSA8IDApIHsKQEAgLTIxNTEsMTMgKzIxNTEsNTIgQEAgc3RhdGljIHZvaWQgdm5jX2hhbmRzaGFr ZV9pbyh2b2lkICpvcGFxdWUpIHsKICAgICAgKHZzKS0+c3ViYXV0aCA9PSBWTkNfQVVUSF9WRU5D UllQVF9YNTA5Vk5DIHx8ICAgIFwKICAgICAgKHZzKS0+c3ViYXV0aCA9PSBWTkNfQVVUSF9WRU5D UllQVF9YNTA5UExBSU4pCiAKKyNpZiBkZWZpbmVkKEdOVVRMU19WRVJTSU9OX05VTUJFUikgJiYg XAorICAgIEdOVVRMU19WRVJTSU9OX05VTUJFUiA+PSAweDAyMDIwMCAvKiAyLjIuMCAqLworc3Rh dGljIGludCB2bmNfc2V0X2dudXRsc19wcmlvcml0eShnbnV0bHNfc2Vzc2lvbl90IHMsIGludCB4 NTA5KQoreworICAgIGNvbnN0IGNoYXIgKnByaW9yaXR5ID0geDUwOSA/ICJOT1JNQUwiIDogIk5P Uk1BTDorQU5PTi1ESCI7CisgICAgaW50IHJjOwogCi1zdGF0aWMgaW50IHZuY19zdGFydF90bHMo c3RydWN0IFZuY1N0YXRlICp2cykgewotICAgIHN0YXRpYyBjb25zdCBpbnQgY2VydF90eXBlX3By aW9yaXR5W10gPSB7IEdOVVRMU19DUlRfWDUwOSwgMCB9OwotICAgIHN0YXRpYyBjb25zdCBpbnQg cHJvdG9jb2xfcHJpb3JpdHlbXT0geyBHTlVUTFNfVExTMV8xLCBHTlVUTFNfVExTMV8wLCBHTlVU TFNfU1NMMywgMCB9OwotICAgIHN0YXRpYyBjb25zdCBpbnQga3hfYW5vbltdID0ge0dOVVRMU19L WF9BTk9OX0RILCAwfTsKLSAgICBzdGF0aWMgY29uc3QgaW50IGt4X3g1MDlbXSA9IHtHTlVUTFNf S1hfREhFX0RTUywgR05VVExTX0tYX1JTQSwgR05VVExTX0tYX0RIRV9SU0EsIEdOVVRMU19LWF9T UlAsIDB9OworICAgIHJjID0gZ251dGxzX3ByaW9yaXR5X3NldF9kaXJlY3QocywgcHJpb3JpdHks IE5VTEwpOworICAgIGlmIChyYyAhPSBHTlVUTFNfRV9TVUNDRVNTKSB7CisgICAgICAgIHJldHVy biAtMTsKKyAgICB9CisgICAgcmV0dXJuIDA7Cit9CisjZWxzZQorc3RhdGljIGludCB2bmNfc2V0 X2dudXRsc19wcmlvcml0eShnbnV0bHNfc2Vzc2lvbl90IHMsIGludCB4NTA5KQoreworICAgIHN0 YXRpYyBjb25zdCBpbnQgY2VydF90eXBlc1tdID0geyBHTlVUTFNfQ1JUX1g1MDksIDAgfTsKKyAg ICBzdGF0aWMgY29uc3QgaW50IHByb3RvY29sc1tdID0geworICAgICAgICBHTlVUTFNfVExTMV8x LCBHTlVUTFNfVExTMV8wLCBHTlVUTFNfU1NMMywgMAorICAgIH07CisgICAgc3RhdGljIGNvbnN0 IGludCBreF9hbm9uW10gPSB7IEdOVVRMU19LWF9BTk9OX0RILCAwIH07CisgICAgc3RhdGljIGNv bnN0IGludCBreF94NTA5W10gPSB7CisgICAgICAgIEdOVVRMU19LWF9ESEVfRFNTLCBHTlVUTFNf S1hfUlNBLAorICAgICAgICBHTlVUTFNfS1hfREhFX1JTQSwgR05VVExTX0tYX1NSUCwgMAorICAg IH07CisgICAgaW50IHJjOworCisgICAgcmMgPSBnbnV0bHNfa3hfc2V0X3ByaW9yaXR5KHMsIHg1 MDkgPyBreF94NTA5IDoga3hfYW5vbik7CisgICAgaWYgKHJjICE9IEdOVVRMU19FX1NVQ0NFU1Mp IHsKKyAgICAgICAgcmV0dXJuIC0xOworICAgIH0KKworICAgIHJjID0gZ251dGxzX2NlcnRpZmlj YXRlX3R5cGVfc2V0X3ByaW9yaXR5KHMsIGNlcnRfdHlwZXMpOworICAgIGlmIChyYyAhPSBHTlVU TFNfRV9TVUNDRVNTKSB7CisgICAgICAgIHJldHVybiAtMTsKKyAgICB9CiAKKyAgICByYyA9IGdu dXRsc19wcm90b2NvbF9zZXRfcHJpb3JpdHkocywgcHJvdG9jb2xzKTsKKyAgICBpZiAocmMgIT0g R05VVExTX0VfU1VDQ0VTUykgeworICAgICAgICByZXR1cm4gLTE7CisgICAgfQorICAgIHJldHVy biAwOworfQorI2VuZGlmCisKK3N0YXRpYyBpbnQgdm5jX3N0YXJ0X3RscyhzdHJ1Y3QgVm5jU3Rh dGUgKnZzKSB7CiAgICAgVk5DX0RFQlVHKCJEbyBUTFMgc2V0dXBcbiIpOwogICAgIGlmICh2bmNf dGxzX2luaXRpYWxpemUoKSA8IDApIHsKIAlWTkNfREVCVUcoIkZhaWxlZCB0byBpbml0IFRMU1xu Iik7CkBAIC0yMTc3LDIxICsyMjE2LDcgQEAgc3RhdGljIGludCB2bmNfc3RhcnRfdGxzKHN0cnVj dCBWbmNTdGF0ZSAqdnMpIHsKIAkgICAgcmV0dXJuIC0xOwogCX0KIAotCWlmIChnbnV0bHNfa3hf c2V0X3ByaW9yaXR5KHZzLT50bHNfc2Vzc2lvbiwgTkVFRF9YNTA5X0FVVEgodnMpID8ga3hfeDUw OSA6IGt4X2Fub24pIDwgMCkgewotCSAgICBnbnV0bHNfZGVpbml0KHZzLT50bHNfc2Vzc2lvbik7 Ci0JICAgIHZzLT50bHNfc2Vzc2lvbiA9IE5VTEw7Ci0JICAgIHZuY19jbGllbnRfZXJyb3IodnMp OwotCSAgICByZXR1cm4gLTE7Ci0JfQotCi0JaWYgKGdudXRsc19jZXJ0aWZpY2F0ZV90eXBlX3Nl dF9wcmlvcml0eSh2cy0+dGxzX3Nlc3Npb24sIGNlcnRfdHlwZV9wcmlvcml0eSkgPCAwKSB7Ci0J ICAgIGdudXRsc19kZWluaXQodnMtPnRsc19zZXNzaW9uKTsKLQkgICAgdnMtPnRsc19zZXNzaW9u ID0gTlVMTDsKLQkgICAgdm5jX2NsaWVudF9lcnJvcih2cyk7Ci0JICAgIHJldHVybiAtMTsKLQl9 Ci0KLQlpZiAoZ251dGxzX3Byb3RvY29sX3NldF9wcmlvcml0eSh2cy0+dGxzX3Nlc3Npb24sIHBy b3RvY29sX3ByaW9yaXR5KSA8IDApIHsKKwlpZiAodm5jX3NldF9nbnV0bHNfcHJpb3JpdHkodnMt PnRsc19zZXNzaW9uLCAhIU5FRURfWDUwOV9BVVRIKHZzKSkgPCAwKSB7CiAJICAgIGdudXRsc19k ZWluaXQodnMtPnRsc19zZXNzaW9uKTsKIAkgICAgdnMtPnRsc19zZXNzaW9uID0gTlVMTDsKIAkg ICAgdm5jX2NsaWVudF9lcnJvcih2cyk7CkBAIC0yMjE5LDcgKzIyNDQsNyBAQCBzdGF0aWMgaW50 IHZuY19zdGFydF90bHMoc3RydWN0IFZuY1N0YXRlICp2cykgewogCSAgICB9CiAKIAl9IGVsc2Ug ewotCSAgICBnbnV0bHNfYW5vbl9zZXJ2ZXJfY3JlZGVudGlhbHMgYW5vbl9jcmVkID0gdm5jX3Rs c19pbml0aWFsaXplX2Fub25fY3JlZCgpOworCSAgICBnbnV0bHNfYW5vbl9zZXJ2ZXJfY3JlZGVu dGlhbHNfdCBhbm9uX2NyZWQgPSB2bmNfdGxzX2luaXRpYWxpemVfYW5vbl9jcmVkKCk7CiAJICAg IGlmICghYW5vbl9jcmVkKSB7CiAJCWdudXRsc19kZWluaXQodnMtPnRsc19zZXNzaW9uKTsKIAkJ dnMtPnRsc19zZXNzaW9uID0gTlVMTDsKLS0gCjIuOC4wLnJjMwoKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==