From owner-svn-src-head@FreeBSD.ORG  Fri Sep 14 13:00:43 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AD8BC106566B;
	Fri, 14 Sep 2012 13:00:43 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 98B428FC14;
	Fri, 14 Sep 2012 13:00:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8ED0h4W026214;
	Fri, 14 Sep 2012 13:00:43 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8ED0hI1026210;
	Fri, 14 Sep 2012 13:00:43 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201209141300.q8ED0hI1026210@svn.freebsd.org>
From: Dag-Erling Smørgrav <des@FreeBSD.org>
Date: Fri, 14 Sep 2012 13:00:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240496 - in head: lib/libfetch usr.bin/fetch
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Sep 2012 13:00:43 -0000

Author: des
Date: Fri Sep 14 13:00:43 2012
New Revision: 240496
URL: http://svn.freebsd.org/changeset/base/240496

Log:
  Use libmd if and only if OpenSSL is not available.
  
  PR:		bin/171402
  MFC after:	3 days

Modified:
  head/lib/libfetch/Makefile
  head/lib/libfetch/http.c
  head/usr.bin/fetch/Makefile

Modified: head/lib/libfetch/Makefile
==============================================================================
--- head/lib/libfetch/Makefile	Fri Sep 14 12:15:13 2012	(r240495)
+++ head/lib/libfetch/Makefile	Fri Sep 14 13:00:43 2012	(r240496)
@@ -16,8 +16,8 @@ CFLAGS+=	-DINET6
 
 .if ${MK_OPENSSL} != "no"
 CFLAGS+=	-DWITH_SSL
-DPADD=		${LIBSSL} ${LIBCRYPTO} ${LIBMD}
-LDADD=		-lssl -lcrypto -lmd
+DPADD=		${LIBSSL} ${LIBCRYPTO}
+LDADD=		-lssl -lcrypto
 .else
 DPADD=		${LIBMD}
 LDADD=		-lmd

Modified: head/lib/libfetch/http.c
==============================================================================
--- head/lib/libfetch/http.c	Fri Sep 14 12:15:13 2012	(r240495)
+++ head/lib/libfetch/http.c	Fri Sep 14 13:00:43 2012	(r240496)
@@ -76,7 +76,15 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+
+#ifdef WITH_SSL
+#include <openssl/md5.h>
+#define MD5Init(c) MD5_Init(c)
+#define MD5Update(c, data, len) MD5_Update(c, data, len)
+#define MD5Final(md, c) MD5_Final(md, c)
+#else
 #include <md5.h>
+#endif
 
 #include <netinet/in.h>
 #include <netinet/tcp.h>

Modified: head/usr.bin/fetch/Makefile
==============================================================================
--- head/usr.bin/fetch/Makefile	Fri Sep 14 12:15:13 2012	(r240495)
+++ head/usr.bin/fetch/Makefile	Fri Sep 14 13:00:43 2012	(r240496)
@@ -4,11 +4,12 @@
 
 PROG=		fetch
 CSTD?=		c99
+.if ${MK_OPENSSL} != "no"
+DPADD=		${LIBFETCH} ${LIBSSL} ${LIBCRYPTO}
+LDADD=		-lfetch -lssl -lcrypto
+.else
 DPADD=		${LIBFETCH} ${LIBMD}
 LDADD=		-lfetch -lmd
-.if ${MK_OPENSSL} != "no"
-DPADD+=		${LIBSSL} ${LIBCRYPTO}
-LDADD+=		-lssl -lcrypto
 .endif
 
 .include <bsd.prog.mk>