From owner-svn-src-projects@freebsd.org Sat Jan 14 07:58:42 2017 Return-Path: Delivered-To: svn-src-projects@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 58B2FCAFEE8 for ; Sat, 14 Jan 2017 07:58:42 +0000 (UTC) (envelope-from ngie@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 0D2F61FAF; Sat, 14 Jan 2017 07:58:41 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0E7wftX037969; Sat, 14 Jan 2017 07:58:41 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0E7wfLW037967; Sat, 14 Jan 2017 07:58:41 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201701140758.v0E7wfLW037967@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Sat, 14 Jan 2017 07:58:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r312136 - in projects/netbsd-tests-upstream-01-2017: contrib/netbsd-tests/lib/libc/hash lib/libc/tests/hash X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jan 2017 07:58:42 -0000 Author: ngie Date: Sat Jan 14 07:58:40 2017 New Revision: 312136 URL: https://svnweb.freebsd.org/changeset/base/312136 Log: Diff reduce with upstream using lib/libnetbsd's updated copy of sha1.h Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/hash/h_hash.c projects/netbsd-tests-upstream-01-2017/lib/libc/tests/hash/Makefile Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/hash/h_hash.c ============================================================================== --- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/hash/h_hash.c Sat Jan 14 07:57:34 2017 (r312135) +++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/hash/h_hash.c Sat Jan 14 07:58:40 2017 (r312136) @@ -35,13 +35,7 @@ #include #include #include -#ifdef __NetBSD__ #include -#endif - -#ifdef __FreeBSD__ -#include -#endif int mflag, rflag, sflag, tflag; @@ -107,32 +101,17 @@ regress(void) MD5Final(out, &ctx); outlen = 16; } else { -#ifdef __FreeBSD__ - SHA_CTX ctx; - - SHA1_Init(&ctx); - SHA1_Update(&ctx, buf, len); -#else SHA1_CTX ctx; SHA1Init(&ctx); SHA1Update(&ctx, buf, len); -#endif while (!last && fgets((char *)buf, sizeof(buf), stdin) != NULL) { len = strlen((char *)buf); CHOMP(buf, len, last); -#ifdef __FreeBSD__ - SHA1_Update(&ctx, buf, len); -#else SHA1Update(&ctx, buf, len); -#endif } -#ifdef __FreeBSD__ - SHA1_Final(out, &ctx); -#else SHA1Final(out, &ctx); -#endif outlen = 20; } hexdump(out, outlen); Modified: projects/netbsd-tests-upstream-01-2017/lib/libc/tests/hash/Makefile ============================================================================== --- projects/netbsd-tests-upstream-01-2017/lib/libc/tests/hash/Makefile Sat Jan 14 07:57:34 2017 (r312135) +++ projects/netbsd-tests-upstream-01-2017/lib/libc/tests/hash/Makefile Sat Jan 14 07:58:40 2017 (r312136) @@ -32,6 +32,7 @@ ${PACKAGE}DATA_FILES+= data/sha1test2-ou LIBADD+= md LIBADD.sha2_test+= crypto +CFLAGS.h_hash+= -I${SRCTOP}/lib/libnetbsd CFLAGS.sha2_test+= -I${SRCTOP}/crypto/openssh/openbsd-compat CFLAGS.sha2_test+= -I${SRCTOP}/crypto/openssh