From owner-svn-src-all@freebsd.org  Sat Jul 11 17:06:56 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-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 036EF999A16;
 Sat, 11 Jul 2015 17:06:56 +0000 (UTC)
 (envelope-from andrew@fubar.geek.nz)
Received: from kif.fubar.geek.nz (kif.fubar.geek.nz [178.62.119.249])
 by mx1.freebsd.org (Postfix) with ESMTP id C35561699;
 Sat, 11 Jul 2015 17:06:55 +0000 (UTC)
 (envelope-from andrew@fubar.geek.nz)
Received: from bender.Home (97e07b11.skybroadband.com [151.224.123.17])
 by kif.fubar.geek.nz (Postfix) with ESMTPSA id 5EE5ED7907;
 Sat, 11 Jul 2015 17:06:18 +0000 (UTC)
Date: Sat, 11 Jul 2015 18:06:15 +0100
From: Andrew Turner <andrew@fubar.geek.nz>
To: John-Mark Gurney <jmg@funkthat.com>
Cc: Craig Rodrigues <rodrigc@crodrigues.org>, "src-committers@freebsd.org"
 <src-committers@freebsd.org>, "svn-src-all@freebsd.org"
 <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org"
 <svn-src-head@freebsd.org>
Subject: Re: svn commit: r285366 - in head: lib/libmd sys/crypto/sha2
Message-ID: <20150711180615.52a618b7@bender.Home>
In-Reply-To: <20150711142920.GE8523@funkthat.com>
References: <201507110312.t6B3CZBv081280@repo.freebsd.org>
 <20150711080439.GD8523@funkthat.com>
 <CAG=rPVcCSzHKwqyOzAZOG=N9pBMpwFbY+CMOM655BanjnNVQ-w@mail.gmail.com>
 <20150711142920.GE8523@funkthat.com>
X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.27; amd64-portbld-freebsd10.0)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
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: Sat, 11 Jul 2015 17:06:56 -0000

On Sat, 11 Jul 2015 07:29:20 -0700
John-Mark Gurney <jmg@funkthat.com> wrote:
... 
> The closest I can see is that sha256hl.c (from mdXhl.c) is including
> "sha256.h" with double quotes, and getting the wrong header file..
> 

I concur, the following fixes libmd to use the correct header.

Andrew

Index: lib/libmd/Makefile
===================================================================
--- lib/libmd/Makefile  (revision 285383)
+++ lib/libmd/Makefile  (working copy)
@@ -49,6 +49,7 @@
 #   * macros are used to rename symbols to libcrypt internal names
 #   * no weak aliases are generated
 CFLAGS+= -I${.CURDIR} -DWEAK_REFS
+CFLAGS+= -I${.CURDIR}/../../sys/crypto/sha2
 .PATH: ${.CURDIR}/${MACHINE_ARCH} ${.CURDIR}/../../sys/crypto/sha2
 
 .if exists(${MACHINE_ARCH}/sha.S)