From owner-svn-src-head@freebsd.org Thu May 26 20:37:51 2016 Return-Path: Delivered-To: svn-src-head@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 193A0B4B258; Thu, 26 May 2016 20:37:51 +0000 (UTC) (envelope-from cem@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 DF7A51A39; Thu, 26 May 2016 20:37:50 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4QKbo1j010356; Thu, 26 May 2016 20:37:50 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4QKboBj010354; Thu, 26 May 2016 20:37:50 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201605262037.u4QKboBj010354@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: "Conrad E. Meyer" Date: Thu, 26 May 2016 20:37:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300774 - head/sys/sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 May 2016 20:37:51 -0000 Author: cem Date: Thu May 26 20:37:49 2016 New Revision: 300774 URL: https://svnweb.freebsd.org/changeset/base/300774 Log: Ifndef KERNEL the userspace-only routines in sys/md[45].h A follow-up to r300773. Nothing in the kernel uses those definitions, but apparently libmd includes the sys/md45 headers. Fix the build. Reported by: gjb Pointy-hat: cem Sponsored by: EMC / Isilon Storage Division Modified: head/sys/sys/md4.h head/sys/sys/md5.h Modified: head/sys/sys/md4.h ============================================================================== --- head/sys/sys/md4.h Thu May 26 19:29:29 2016 (r300773) +++ head/sys/sys/md4.h Thu May 26 20:37:49 2016 (r300774) @@ -40,6 +40,11 @@ void MD4Init(MD4_CTX *); void MD4Update(MD4_CTX *, const unsigned char *, unsigned int); void MD4Pad(MD4_CTX *); void MD4Final(unsigned char [static 16], MD4_CTX *); +#ifndef _KERNEL +char * MD4End(MD4_CTX *, char *); +char * MD4File(const char *, char *); +char * MD4Data(const unsigned char *, unsigned int, char *); +#endif __END_DECLS #endif /* _MD4_H_ */ Modified: head/sys/sys/md5.h ============================================================================== --- head/sys/sys/md5.h Thu May 26 19:29:29 2016 (r300773) +++ head/sys/sys/md5.h Thu May 26 20:37:49 2016 (r300774) @@ -45,5 +45,11 @@ __BEGIN_DECLS void MD5Init (MD5_CTX *); void MD5Update (MD5_CTX *, const void *, unsigned int); void MD5Final (unsigned char[static MD5_DIGEST_LENGTH], MD5_CTX *); +#ifndef _KERNEL +char * MD5End(MD5_CTX *, char *); +char * MD5File(const char *, char *); +char * MD5FileChunk(const char *, char *, off_t, off_t); +char * MD5Data(const void *, unsigned int, char *); +#endif __END_DECLS #endif /* _SYS_MD5_H_ */