Rename libsa pbkdf2.c to pkcs5_pbkdf2.c so that we match libutil.

5 files changed, 10 insertions, 10 deletions

diff --git a/sys/arch/amd64/stand/boot/Makefile b/sys/arch/amd64/stand/boot/Makefile
index 567f85967f4..f72e55658fb 100644
--- a/sys/arch/amd64/stand/boot/Makefile
+++ b/sys/arch/amd64/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.32 2016/07/30 03:25:48 guenther Exp $
+#	$OpenBSD: Makefile,v 1.33 2016/09/10 16:38:16 jsing Exp $
 
 COPTS?=
 MAN?=	boot.8
@@ -40,7 +40,7 @@ SRCS+=	close.c closeall.c cons.c cread.c dev.c disklabel.c dkcksum.c fstat.c \
 SRCS+=	elf32.c elf64.c loadfile.c
 SRCS+=	ufs.c
 .if ${SOFTRAID:L} == "yes"
-SRCS+=	aes_xts.c explicit_bzero.c hmac_sha1.c pbkdf2.c rijndael.c sha1.c
+SRCS+=	aes_xts.c explicit_bzero.c hmac_sha1.c pkcs5_pbkdf2.c rijndael.c sha1.c
 .endif
 
 .PATH:	${S}/lib/libkern
diff --git a/sys/arch/amd64/stand/cdboot/Makefile b/sys/arch/amd64/stand/cdboot/Makefile
index e431f4be3f9..57921f17803 100644
--- a/sys/arch/amd64/stand/cdboot/Makefile
+++ b/sys/arch/amd64/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.28 2016/07/30 03:25:48 guenther Exp $
+#	$OpenBSD: Makefile,v 1.29 2016/09/10 16:38:16 jsing Exp $
 
 MAN=	cdboot.8
 
@@ -32,7 +32,7 @@ SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c lseek.c \
 	open.c read.c stat.c cread.c readdir.c cons.c loadfile.c \
 	elf32.c elf64.c
 SRCS+=	ufs.c cd9660.c
-SRCS+=	aes_xts.c explicit_bzero.c hmac_sha1.c pbkdf2.c rijndael.c sha1.c
+SRCS+=	aes_xts.c explicit_bzero.c hmac_sha1.c pkcs5_pbkdf2.c rijndael.c sha1.c
 
 .PATH:	${S}/lib/libkern/arch/i386 ${S}/lib/libkern
 SRCS+=	divdi3.c moddi3.c qdivrem.c
diff --git a/sys/arch/amd64/stand/efiboot/Makefile.common b/sys/arch/amd64/stand/efiboot/Makefile.common
index da2646d6664..9219ccff71e 100644
--- a/sys/arch/amd64/stand/efiboot/Makefile.common
+++ b/sys/arch/amd64/stand/efiboot/Makefile.common
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.common,v 1.6 2016/08/31 15:11:22 yasuoka Exp $
+#	$OpenBSD: Makefile.common,v 1.7 2016/09/10 16:38:16 jsing Exp $
 
 S=		${.CURDIR}/../../../../..
 SADIR=		${.CURDIR}/../..
@@ -38,7 +38,7 @@ SRCS+=	close.c closeall.c cons.c cread.c dev.c disklabel.c dkcksum.c fstat.c \
 	lseek.c open.c read.c readdir.c stat.c
 SRCS+=	ufs.c cd9660.c
 .if ${SOFTRAID:L} == "yes"
-SRCS+=	aes_xts.c explicit_bzero.c hmac_sha1.c pbkdf2.c rijndael.c sha1.c
+SRCS+=	aes_xts.c explicit_bzero.c hmac_sha1.c pkcs5_pbkdf2.c rijndael.c sha1.c
 .endif
 
 .PATH:	${S}/lib/libz
diff --git a/sys/arch/amd64/stand/libsa/softraid.c b/sys/arch/amd64/stand/libsa/softraid.c
index a8fca46b02a..88299a3432c 100644
--- a/sys/arch/amd64/stand/libsa/softraid.c
+++ b/sys/arch/amd64/stand/libsa/softraid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid.c,v 1.25 2016/01/06 16:12:20 krw Exp $	*/
+/*	$OpenBSD: softraid.c,v 1.26 2016/09/10 16:38:16 jsing Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -26,7 +26,7 @@
 
 #include <lib/libsa/aes_xts.h>
 #include <lib/libsa/hmac_sha1.h>
-#include <lib/libsa/pbkdf2.h>
+#include <lib/libsa/pkcs5_pbkdf2.h>
 #include <lib/libsa/rijndael.h>
 #include <lib/libz/zlib.h>
 
diff --git a/sys/arch/amd64/stand/pxeboot/Makefile b/sys/arch/amd64/stand/pxeboot/Makefile
index 57f7cde6fc6..2058e08f973 100644
--- a/sys/arch/amd64/stand/pxeboot/Makefile
+++ b/sys/arch/amd64/stand/pxeboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.26 2016/07/30 03:25:48 guenther Exp $
+#	$OpenBSD: Makefile,v 1.27 2016/09/10 16:38:16 jsing Exp $
 
 MAN=	pxeboot.8
 
@@ -31,7 +31,7 @@ SRCS+=	alloc.c exit.c getchar.c getfile.c getln.c globals.c putchar.c \
 	strcmp.c strlen.c strncmp.c memcmp.c memcpy.c memset.c printf.c \
 	snprintf.c strerror.c strncpy.c strtol.c strtoll.c ctime.c strlcpy.c \
 	strlcat.c
-SRCS+=	aes_xts.c explicit_bzero.c hmac_sha1.c pbkdf2.c rijndael.c sha1.c
+SRCS+=	aes_xts.c explicit_bzero.c hmac_sha1.c pkcs5_pbkdf2.c rijndael.c sha1.c
 
 SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c fstat.c ioctl.c lseek.c \
 	read.c stat.c write.c cread.c readdir.c cons.c loadfile.c \