From owner-svn-src-all@FreeBSD.ORG  Fri Nov 29 21:13:31 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1E96DDE4;
 Fri, 29 Nov 2013 21:13:31 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 07A141FDF;
 Fri, 29 Nov 2013 21:13:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rATLDUZh014731;
 Fri, 29 Nov 2013 21:13:30 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rATLDUEY014730;
 Fri, 29 Nov 2013 21:13:30 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201311292113.rATLDUEY014730@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 29 Nov 2013 21:13:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r258756 - stable/10/lib/libfetch
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Nov 2013 21:13:31 -0000

Author: bdrewery (ports committer)
Date: Fri Nov 29 21:13:30 2013
New Revision: 258756
URL: http://svnweb.freebsd.org/changeset/base/258756

Log:
  MFC r258347,r258349:
  
    Support SNI in libfetch
  
    SNI is Server Name Indentification which is a protocol for TLS that
    indicates the host that is being connected to at the start of the
    handshake. It allows to use Virtual Hosts on HTTPS.
  
  PR:		kern/183583
  Approved by:	bapt (implicit)
  Approved by:	re (gjb)

Modified:
  stable/10/lib/libfetch/common.c
Directory Properties:
  stable/10/lib/libfetch/   (props changed)

Modified: stable/10/lib/libfetch/common.c
==============================================================================
--- stable/10/lib/libfetch/common.c	Fri Nov 29 21:12:35 2013	(r258755)
+++ stable/10/lib/libfetch/common.c	Fri Nov 29 21:13:30 2013	(r258756)
@@ -829,6 +829,16 @@ fetch_ssl(conn_t *conn, const struct url
 		return (-1);
 	}
 	SSL_set_fd(conn->ssl, conn->sd);
+
+#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+	if (!SSL_set_tlsext_host_name(conn->ssl,
+	    __DECONST(struct url *, URL)->host)) {
+		fprintf(stderr,
+		    "TLS server name indication extension failed for host %s\n",
+		    URL->host);
+		return (-1);
+	}
+#endif
 	while ((ret = SSL_connect(conn->ssl)) == -1) {
 		ssl_err = SSL_get_error(conn->ssl, ret);
 		if (ssl_err != SSL_ERROR_WANT_READ &&