From owner-svn-ports-all@freebsd.org  Thu Oct 22 10:41:04 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D9A9A1A9D2;
 Thu, 22 Oct 2015 10:41:04 +0000 (UTC)
 (envelope-from demon@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 054F21381;
 Thu, 22 Oct 2015 10:41:03 +0000 (UTC)
 (envelope-from demon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9MAf3X1047313;
 Thu, 22 Oct 2015 10:41:03 GMT (envelope-from demon@FreeBSD.org)
Received: (from demon@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9MAf3W5047312;
 Thu, 22 Oct 2015 10:41:03 GMT (envelope-from demon@FreeBSD.org)
Message-Id: <201510221041.t9MAf3W5047312@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: demon set sender to
 demon@FreeBSD.org using -f
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Thu, 22 Oct 2015 10:41:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399965 - head/net/haproxy/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Oct 2015 10:41:04 -0000

Author: demon
Date: Thu Oct 22 10:41:02 2015
New Revision: 399965
URL: https://svnweb.freebsd.org/changeset/ports/399965

Log:
  Fix build with OpenSSL < 1.0 (FreeBSD-9)

Added:
  head/net/haproxy/files/patch-src-ssl_sock.c   (contents, props changed)

Added: head/net/haproxy/files/patch-src-ssl_sock.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/haproxy/files/patch-src-ssl_sock.c	Thu Oct 22 10:41:02 2015	(r399965)
@@ -0,0 +1,19 @@
+--- src/ssl_sock.c
++++ src/ssl_sock.c
+@@ -1091,12 +1091,16 @@ ssl_sock_do_create_cert(const char *servername, unsigned int serial,
+ 	else if (EVP_PKEY_type (capkey->type) == EVP_PKEY_EC)
+ 		digest = EVP_sha256();
+ 	else {
++#if (OPENSSL_VERSION_NUMBER >= 0x1000000fL)
+ 		int nid;
+ 
+ 		if (EVP_PKEY_get_default_digest_nid(capkey, &nid) <= 0)
+ 			goto mkcert_error;
+ 		if (!(digest = EVP_get_digestbynid(nid)))
+ 			goto mkcert_error;
++#else
++		goto mkcert_error;
++#endif
+ 	}
+ 
+ 	if (!(X509_sign(newcrt, capkey, digest)))