svn commit: r312139 - projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/hash

Ngie Cooper ngie at FreeBSD.org
Sat Jan 14 08:11:18 UTC 2017


Author: ngie
Date: Sat Jan 14 08:11:17 2017
New Revision: 312139
URL: https://svnweb.freebsd.org/changeset/base/312139

Log:
  Use copy of sha2.h from libnetbsd

Modified:
  projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/hash/t_sha2.c

Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/hash/t_sha2.c
==============================================================================
--- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/hash/t_sha2.c	Sat Jan 14 08:10:37 2017	(r312138)
+++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/hash/t_sha2.c	Sat Jan 14 08:11:17 2017	(r312139)
@@ -36,23 +36,9 @@ __RCSID("$NetBSD: t_sha2.c,v 1.3 2012/09
 
 #include <atf-c.h>
 #include <sys/types.h>
-#ifdef __NetBSD__
 #include <sha2.h>
-#endif
 #include <string.h>
 
-#ifdef __FreeBSD__
-#include <openssl/sha.h>
-typedef SHA512_CTX SHA384_CTX;
-/* From /usr/src/crypto/openssh/openbsd-compat/sha2.h */
-#define SHA256_DIGEST_LENGTH		32
-#define SHA256_DIGEST_STRING_LENGTH	(SHA256_DIGEST_LENGTH * 2 + 1)
-#define SHA384_DIGEST_LENGTH		48
-#define SHA384_DIGEST_STRING_LENGTH	(SHA384_DIGEST_LENGTH * 2 + 1)
-#define SHA512_DIGEST_LENGTH		64
-#define SHA512_DIGEST_STRING_LENGTH	(SHA512_DIGEST_LENGTH * 2 + 1)
-#endif
-
 ATF_TC(t_sha256);
 ATF_TC(t_sha384);
 ATF_TC(t_sha512);


More information about the svn-src-projects mailing list