[PATCH] ssl: use the OpenSSL-provided host name check
Kamil Dudka <[email protected]> Tue, 30 Jun 2015 12:31:14 +0200
| Newsgroups | gmane.comp.web.links |
|---|---|
| Message-ID | <[email protected]> |
Li4uIGlmIGJ1aWx0IGFnYWluc3QgYSBuZXcgZW5vdWdoIHZlcnNpb24gb2YgT3BlblNTTAoKU3Vn Z2VzdGVkLWJ5OiBDaHJpc3RpYW4gSGVpbWVzCi0tLQogY29uZmlndXJlLmluICAgICAgICAgICAg IHwgIDMgKysrCiBzcmMvbmV0d29yay9zc2wvc29ja2V0LmMgfCA1MCArKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0KIDIgZmlsZXMgY2hhbmdlZCwgNTIgaW5z ZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2NvbmZpZ3VyZS5pbiBiL2Nv bmZpZ3VyZS5pbgppbmRleCA1ODU0OGZlLi4zMjRmYjJhIDEwMDY0NAotLS0gYS9jb25maWd1cmUu aW4KKysrIGIvY29uZmlndXJlLmluCkBAIC0xMTM0LDYgKzExMzQsOSBAQCBlbHNlCiBmaQogCiBB Q19NU0dfUkVTVUxUKCRjZl9yZXN1bHQpCitpZiB0ZXN0ICIkY2ZfcmVzdWx0IiA9IHllczsgdGhl bgorCUFDX0NIRUNLX0ZVTkNTKFg1MDlfVkVSSUZZX1BBUkFNX3NldDFfaG9zdCkKK2ZpCiAKICMg LS0tLSBHTlUgVExTCiAKZGlmZiAtLWdpdCBhL3NyYy9uZXR3b3JrL3NzbC9zb2NrZXQuYyBiL3Ny Yy9uZXR3b3JrL3NzbC9zb2NrZXQuYwppbmRleCA2YWY1ZTBkLi45YTIxMDliIDEwMDY0NAotLS0g YS9zcmMvbmV0d29yay9zc2wvc29ja2V0LmMKKysrIGIvc3JjL25ldHdvcmsvc3NsL3NvY2tldC5j CkBAIC03LDYgKzcsOSBAQAogI2lmZGVmIENPTkZJR19PUEVOU1NMCiAjaW5jbHVkZSA8b3BlbnNz bC9zc2wuaD4KICNpbmNsdWRlIDxvcGVuc3NsL3g1MDl2My5oPgorI2lmZGVmIEhBVkVfWDUwOV9W RVJJRllfUEFSQU1fU0VUMV9IT1NUCisjaW5jbHVkZSA8b3BlbnNzbC94NTA5X3ZmeS5oPgorI2Vu ZGlmCiAjZGVmaW5lIFVTRV9PUEVOU1NMCiAjZWxpZiBkZWZpbmVkKENPTkZJR19OU1NfQ09NUEFU X09TU0wpCiAjaW5jbHVkZSA8bnNzX2NvbXBhdF9vc3NsL25zc19jb21wYXRfb3NzbC5oPgpAQCAt MTY4LDYgKzE3MSwzMCBAQCB2ZXJpZnlfY2VydGlmaWNhdGVzKHN0cnVjdCBzb2NrZXQgKnNvY2tl dCkKIAogI2lmZGVmIFVTRV9PUEVOU1NMCiAKKyNpZmRlZiBIQVZFX1g1MDlfVkVSSUZZX1BBUkFN X1NFVDFfSE9TVAorLyogYWN0aXZhdGUgdGhlIE9wZW5TU0wtcHJvdmlkZWQgaG9zdCBuYW1lIGNo ZWNrICovCitzdGF0aWMgaW50Citvc3NsX3NldF9ob3N0bmFtZSh2b2lkICpzc2wsIHVuc2lnbmVk IGNoYXIgKnNlcnZlcl9uYW1lKQoreworCWludCByZXQgPSAtMTsKKworCVg1MDlfVkVSSUZZX1BB UkFNICp2cG0gPSBYNTA5X1ZFUklGWV9QQVJBTV9uZXcoKTsKKwlpZiAodnBtKSB7CisJCWlmIChY NTA5X1ZFUklGWV9QQVJBTV9zZXQxX2hvc3QodnBtLCAoY2hhciAqKSBzZXJ2ZXJfbmFtZSwgMCkK KwkJCQkmJiBTU0xfc2V0MV9wYXJhbShzc2wsIHZwbSkpCisJCXsKKwkJCS8qIHN1Y2Nlc3NmdWxs eSBhY3RpdmF0ZWQgdGhlIE9wZW5TU0wgaG9zdCBuYW1lIGNoZWNrICovCisJCQlyZXQgPSAwOwor CQl9CisKKwkJWDUwOV9WRVJJRllfUEFSQU1fZnJlZSh2cG0pOworCX0KKworCXJldHVybiByZXQ7 Cit9CisKKyNlbHNlIC8qIEhBVkVfWDUwOV9WRVJJRllfUEFSQU1fU0VUMV9IT1NUICovCisKIC8q KiBDaGVja3Mgd2hldGhlciB0aGUgaG9zdCBjb21wb25lbnQgb2YgYSBVUkkgbWF0Y2hlcyBhIGhv c3QgbmFtZSBpbgogICogdGhlIHNlcnZlciBjZXJ0aWZpY2F0ZS4KICAqCkBAIC0zNjAsNiArMzg3 LDcgQEAgdmVyaWZ5X2NhbGxiYWNrKGludCBwcmV2ZXJpZnlfb2ssIFg1MDlfU1RPUkVfQ1RYICpj dHgpCiAJbWVtX2ZyZWUoaG9zdF9pbl91cmkpOwogCXJldHVybiBtYXRjaGVkOwogfQorI2VuZGlm CS8qIEhBVkVfWDUwOV9WRVJJRllfUEFSQU1fU0VUMV9IT1NUICovCiAKICNlbmRpZgkvKiBVU0Vf T1BFTlNTTCAqLwogCkBAIC00MDAsNiArNDI4LDkgQEAgc3NsX2Nvbm5lY3Qoc3RydWN0IHNvY2tl dCAqc29ja2V0KQogCWludCByZXQ7CiAJdW5zaWduZWQgY2hhciAqc2VydmVyX25hbWU7CiAJc3Ry dWN0IGNvbm5lY3Rpb24gKmNvbm4gPSBzb2NrZXQtPmNvbm47CisjaWZkZWYgVVNFX09QRU5TU0wK KwlpbnQgKCp2ZXJpZnlfY2FsbGJhY2tfcHRyKShpbnQsIFg1MDlfU1RPUkVfQ1RYICopOworI2Vu ZGlmCS8qIFVTRV9PUEVOU1NMICovCiAKIAkvKiBUT0RPOiBSZWNvZGUgc2VydmVyX25hbWUgdG8g VVRGLTguICAqLwogCXNlcnZlcl9uYW1lID0gZ2V0X3VyaV9zdHJpbmcoY29ubi0+cHJveGllZF91 cmksIFVSSV9IT1NUKTsKQEAgLTQxOCw2ICs0NDksMjMgQEAgc3NsX2Nvbm5lY3Qoc3RydWN0IHNv Y2tldCAqc29ja2V0KQogCQlyZXR1cm4gLTE7CiAJfQogCisjaWZkZWYgVVNFX09QRU5TU0wKKyNp ZmRlZiBIQVZFX1g1MDlfVkVSSUZZX1BBUkFNX1NFVDFfSE9TVAorCS8qIGFjdGl2YXRlIHRoZSBP cGVuU1NMLXByb3ZpZGVkIGhvc3QgbmFtZSBjaGVjayAqLworCWlmIChvc3NsX3NldF9ob3N0bmFt ZShzb2NrZXQtPnNzbCwgc2VydmVyX25hbWUpKSB7CisJCW1lbV9mcmVlX2lmKHNlcnZlcl9uYW1l KTsKKwkJc29ja2V0LT5vcHMtPmRvbmUoc29ja2V0LCBjb25uZWN0aW9uX3N0YXRlKFNfU1NMX0VS Uk9SKSk7CisJCXJldHVybiAtMTsKKwl9CisKKwkvKiB2ZXJpZnlfY2FsbGJhY2soKSBpcyBub3Qg bmVlZGVkIHdpdGggWDUwOV9WRVJJRllfUEFSQU1fc2V0MV9ob3N0KCkgKi8KKwl2ZXJpZnlfY2Fs bGJhY2tfcHRyID0gTlVMTDsKKyNlbHNlCisJLyogdXNlIG91ciBvd24gY2FsbGJhY2sgaW1wbGVt ZW50aW5nIHRoZSBob3N0IG5hbWUgY2hlY2sgKi8KKwl2ZXJpZnlfY2FsbGJhY2tfcHRyID0gdmVy aWZ5X2NhbGxiYWNrOworI2VuZGlmCisjZW5kaWYJLyogVVNFX09QRU5TU0wgKi8KKwogCW1lbV9m cmVlX2lmKHNlcnZlcl9uYW1lKTsKIAogCWlmIChzb2NrZXQtPm5vX3RscykKQEAgLTQyOSw3ICs0 NzcsNyBAQCBzc2xfY29ubmVjdChzdHJ1Y3Qgc29ja2V0ICpzb2NrZXQpCiAJaWYgKGdldF9vcHRf Ym9vbCgiY29ubmVjdGlvbi5zc2wuY2VydF92ZXJpZnkiLCBOVUxMKSkKIAkJU1NMX3NldF92ZXJp Znkoc29ja2V0LT5zc2wsIFNTTF9WRVJJRllfUEVFUgogCQkJCQkgIHwgU1NMX1ZFUklGWV9GQUlM X0lGX05PX1BFRVJfQ0VSVCwKLQkJCSAgICAgICB2ZXJpZnlfY2FsbGJhY2spOworCQkJICAgICAg IHZlcmlmeV9jYWxsYmFja19wdHIpOwogCiAJaWYgKGdldF9vcHRfYm9vbCgiY29ubmVjdGlvbi5z c2wuY2xpZW50X2NlcnQuZW5hYmxlIiwgTlVMTCkpIHsKIAkJdW5zaWduZWQgY2hhciAqY2xpZW50 X2NlcnQ7Ci0tIAoyLjQuMwoKLS0gCmh0dHA6Ly9saXN0cy5saW51eGZyb21zY3JhdGNoLm9yZy9s aXN0aW5mby9lbGlua3MtZGV2ClVuc3Vic2NyaWJlOiBTZWUgdGhlIGFib3ZlIGluZm9ybWF0aW9u IHBhZ2UK