diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2012-09-06 19:42:00 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2012-09-06 19:42:00 +0000 |
| commit | 4fc57e5204a74f75e9d197c2c43cef54c8dfd5c2 (patch) | |
| tree | b1c6700fcaea19c5f0bf5211bc8c6203fc01faa1 /sbin/mount_vnd | |
| parent | ea76ce83dd6d5c9adbd72293f2884e5618793790 (diff) | |
move pkcs5_pbkdf5 function to libutil so everybody can play with it
ok deraadt jsing matthew
Diffstat (limited to 'sbin/mount_vnd')
| -rw-r--r-- | sbin/mount_vnd/Makefile | 7 | ||||
| -rw-r--r-- | sbin/mount_vnd/mount_vnd.c | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/sbin/mount_vnd/Makefile b/sbin/mount_vnd/Makefile index a5a81cd507e..478ed593966 100644 --- a/sbin/mount_vnd/Makefile +++ b/sbin/mount_vnd/Makefile @@ -1,10 +1,7 @@ -# $OpenBSD: Makefile,v 1.7 2010/04/12 01:44:08 tedu Exp $ - -.PATH: ${.CURDIR}/../bioctl -CFLAGS+=-I${.CURDIR}/../bioctl +# $OpenBSD: Makefile,v 1.8 2012/09/06 19:41:59 tedu Exp $ PROG= mount_vnd -SRCS= mount_vnd.c pbkdf2.c +SRCS= mount_vnd.c LDADD= -lutil DPADD= ${LIBUTIL} diff --git a/sbin/mount_vnd/mount_vnd.c b/sbin/mount_vnd/mount_vnd.c index d4ae9c3d790..37c1e579bb2 100644 --- a/sbin/mount_vnd/mount_vnd.c +++ b/sbin/mount_vnd/mount_vnd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_vnd.c,v 1.11 2011/04/18 16:52:11 thib Exp $ */ +/* $OpenBSD: mount_vnd.c,v 1.12 2012/09/06 19:41:59 tedu Exp $ */ /* * Copyright (c) 1993 University of Utah. * Copyright (c) 1990, 1993 @@ -56,8 +56,6 @@ #include <unistd.h> #include <util.h> -#include "pbkdf2.h" - #define DEFAULT_VND "vnd0" #define VND_CONFIG 1 |