From: Emeric Brun <ebrun@exceliance.fr>
Date: Tue, 17 Sep 2013 13:47:48 +0000 (+0200)
Subject: BUILD: ssl: compilation issue with openssl v0.9.6.
X-Git-Tag: v1.5-dev20~280
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a33410cf94db24d3ec83003a40aeec62897cca97;p=thirdparty%2Fhaproxy.git

BUILD: ssl: compilation issue with openssl v0.9.6.

Failed to compile with openssl 0.9.6 since the 'verifyhost' feature.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 4ae27fc304..105aa1d3bb 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -855,7 +855,11 @@ static int ssl_sock_srv_verifycbk(int ok, X509_STORE_CTX *ctx)
 		for (i = 0; !ok && i < sk_GENERAL_NAME_num(alt_names); i++) {
 			GENERAL_NAME *name = sk_GENERAL_NAME_value(alt_names, i);
 			if (name->type == GEN_DNS) {
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
+				if (ASN1_STRING_to_UTF8((unsigned char **)&str, name->d.ia5) >= 0) {
+#else
 				if (ASN1_STRING_to_UTF8((unsigned char **)&str, name->d.dNSName) >= 0) {
+#endif
 					ok = ssl_sock_srv_hostcheck(str, servername);
 					OPENSSL_free(str);
 				}