pefs: Fix build by importing crypto/sha2/sha512.c

freebsd-pefs · Feb 14, 2016 · 0c5d5c9 · 0c5d5c9
1 parent bf43969
commit 0c5d5c9
Show file tree

Hide file tree

Showing 10 changed files with 580 additions and 1,197 deletions.
diff --git a/lib/libpam/modules/pam_pefs/Makefile b/lib/libpam/modules/pam_pefs/Makefile
@@ -9,7 +9,7 @@ MAN=	pam_pefs.8
 SRCS=	pam_pefs.c
 SRCS+=	pefs_key.c pefs_keychain.c pefs_subr.c
 SRCS+=	rijndael-api.c rijndael-api-fst.c rijndael-alg-fst.c
-SRCS+=	sha2.c
+SRCS+=	sha512c.c
 SRCS+=  hmac_sha512.c
 SRCS+=  pbkdf2_hmac_sha512.c
 SRCS+=  crypto_verify_bytes.c

diff --git a/lib/libpam/modules/pam_pefs/Version.map b/lib/libpam/modules/pam_pefs/Version.map
@@ -1,6 +1,7 @@
 {
 	local:
 		SHA*;
+		_libmd_SHA*;
 		crypto*;
 		hmac*;
 		pbkdf2*;

diff --git a/sbin/pefs/Makefile b/sbin/pefs/Makefile
@@ -9,7 +9,7 @@ SYS=	${.CURDIR}/../../sys
 PROG=	pefs
 SRCS=	pefs_ctl.c pefs_key.c pefs_keychain.c pefs_subr.c
 SRCS+=	rijndael-api.c rijndael-api-fst.c rijndael-alg-fst.c
-SRCS+=	sha2.c
+SRCS+=	sha512c.c
 SRCS+=	hmac_sha512.c
 SRCS+=	pbkdf2_hmac_sha512.c
 SRCS+=	crypto_verify_bytes.c

diff --git a/sys/crypto/hmac/hmac_sha512.h b/sys/crypto/hmac/hmac_sha512.h
@@ -29,7 +29,7 @@
 #ifndef	_SYS_CRYPTO_HMAC_SHA512_
 #define	_SYS_CRYPTO_HMAC_SHA512_
 
-#include <crypto/sha2/sha2.h>
+#include <crypto/sha2/sha512.h>
 
 struct hmac_sha512_ctx {
 	SHA512_CTX	shactx;