Date: Tue, 9 Jul 2013 22:04:35 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253119 - head/sys/crypto/sha2 Message-ID: <201307092204.r69M4Zgn062161@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Tue Jul 9 22:04:35 2013 New Revision: 253119 URL: http://svnweb.freebsd.org/changeset/base/253119 Log: Sync with KAME. MFC after: 1 month Modified: head/sys/crypto/sha2/sha2.c head/sys/crypto/sha2/sha2.h Modified: head/sys/crypto/sha2/sha2.c ============================================================================== --- head/sys/crypto/sha2/sha2.c Tue Jul 9 22:01:05 2013 (r253118) +++ head/sys/crypto/sha2/sha2.c Tue Jul 9 22:04:35 2013 (r253119) @@ -1,4 +1,4 @@ -/* $KAME: sha2.c,v 1.8 2001/11/08 01:07:52 itojun Exp $ */ +/* $KAME: sha2.c,v 1.11 2004/06/02 09:52:45 itojun Exp $ */ /* * sha2.c @@ -32,6 +32,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * */ #include <sys/cdefs.h> @@ -67,7 +68,7 @@ __FBSDID("$FreeBSD$"); * */ -#if defined(_KERNEL) && (defined(__bsdi__) || defined(__FreeBSD__)) +#if defined(_KERNEL) && defined(__FreeBSD__) #define assert(x) #else #include <assert.h> @@ -1051,4 +1052,3 @@ char* SHA384_Data(const sha2_byte* data, SHA384_Update(&context, data, len); return SHA384_End(&context, digest); } - Modified: head/sys/crypto/sha2/sha2.h ============================================================================== --- head/sys/crypto/sha2/sha2.h Tue Jul 9 22:01:05 2013 (r253118) +++ head/sys/crypto/sha2/sha2.h Tue Jul 9 22:04:35 2013 (r253119) @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $KAME: sha2.h,v 1.3 2001/03/12 08:27:48 itojun Exp $ */ +/* $KAME: sha2.h,v 1.5 2007/06/14 12:09:41 itojun Exp $ */ /* * sha2.h @@ -138,4 +138,3 @@ char* SHA512_Data(const u_int8_t*, size_ #endif /* __cplusplus */ #endif /* __SHA2_H__ */ -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307092204.r69M4Zgn062161>