[Midnightbsd-cvs] src [11202] U trunk/sbin/gbde: fixup build
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jul 1 14:19:56 EDT 2018
Revision: 11202
http://svnweb.midnightbsd.org/src/?rev=11202
Author: laffer1
Date: 2018-07-01 14:19:55 -0400 (Sun, 01 Jul 2018)
Log Message:
-----------
fixup build
Modified Paths:
--------------
trunk/sbin/gbde/Makefile
trunk/sbin/gbde/gbde.8
trunk/sbin/gbde/gbde.c
Property Changed:
----------------
trunk/sbin/gbde/gbde.8
trunk/sbin/gbde/image.uu
trunk/sbin/gbde/template.txt
trunk/sbin/gbde/test.sh
Modified: trunk/sbin/gbde/Makefile
===================================================================
--- trunk/sbin/gbde/Makefile 2018-07-01 18:19:13 UTC (rev 11201)
+++ trunk/sbin/gbde/Makefile 2018-07-01 18:19:55 UTC (rev 11202)
@@ -1,15 +1,17 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/sbin/gbde/Makefile 314327 2017-02-27 08:27:38Z avg $
PROG= gbde
SRCS= gbde.c template.c
SRCS+= rijndael-alg-fst.c
SRCS+= rijndael-api-fst.c
-SRCS+= sha2.c
+SRCS+= sha512c.c
SRCS+= g_bde_lock.c
# rijndael-fst.c does evil casting things which can results in warnings,
# the test-vectors check out however, so it works right.
NO_WCAST_ALIGN=
+NO_WMISSING_VARIABLE_DECLARATIONS=
CFLAGS+= -I${.CURDIR}/../../sys
.PATH: ${.CURDIR}/../../sys/geom/bde \
Modified: trunk/sbin/gbde/gbde.8
===================================================================
--- trunk/sbin/gbde/gbde.8 2018-07-01 18:19:13 UTC (rev 11201)
+++ trunk/sbin/gbde/gbde.8 2018-07-01 18:19:55 UTC (rev 11202)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\"
.\" Copyright (c) 2002 Poul-Henning Kamp
.\" Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -29,9 +30,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/sbin/gbde/gbde.8 307403 2016-10-16 22:02:50Z sevan $
.\"
-.Dd February 8, 2006
+.Dd October 3, 2016
.Dt GBDE 8
.Os
.Sh NAME
@@ -207,11 +208,11 @@
.Sh EXAMPLES
To initialize a device, using default parameters:
.Pp
-.Dl "gbde init /dev/ad0s1f -L /etc/ad0s1f.lock"
+.Dl "gbde init /dev/ada0s1f -L /etc/ada0s1f.lock"
.Pp
To attach an encrypted device:
.Pp
-.Dl "gbde attach ad0s1f -l /etc/ad0s1f.lock"
+.Dl "gbde attach ada0s1f -l /etc/ada0s1f.lock"
.Pp
The encrypted device has the suffix
.Pa .bde
@@ -218,12 +219,12 @@
so a typical
command to create and mount a file system would be:
.Pp
-.Dl "newfs /dev/ad0s1f.bde"
-.Dl "mount /dev/ad0s1f.bde /secret"
+.Dl "newfs /dev/ada0s1f.bde"
+.Dl "mount /dev/ada0s1f.bde /secret"
.Pp
To detach an encrypted device:
.Pp
-.Dl "gbde detach ad0s1f"
+.Dl "gbde detach ada0s1f"
.Pp
Please notice that detaching an encrypted device corresponds to
physically removing it, do not forget to unmount the file system first.
@@ -231,11 +232,11 @@
To initialize the second key using a detached lockfile and a trivial
pass-phrase:
.Pp
-.Dl "gbde setkey ad0s1f -n 2 -P foo -L key2.lockfile"
+.Dl "gbde setkey ada0s1f -n 2 -P foo -L key2.lockfile"
.Pp
To destroy all copies of the masterkey:
.Pp
-.Dl "gbde destroy ad0s1f -n -1"
+.Dl "gbde destroy ada0s1f"
.Sh SEE ALSO
.Xr gbde 4 ,
.Xr geom 4
@@ -243,14 +244,17 @@
This software was developed for the
.Fx
Project by
-.An "Poul-Henning Kamp"
+.An Poul-Henning Kamp
and NAI Labs, the Security Research Division of Network Associates, Inc.\&
under DARPA/SPAWAR contract N66001-01-C-8035
.Pq Dq CBOSS ,
as part of the
DARPA CHATS research program.
+.Nm
+first appeared in
+.Fx 5.0 .
.Sh AUTHORS
-.An "Poul-Henning Kamp" Aq phk at FreeBSD.org
+.An Poul-Henning Kamp Aq Mt phk at FreeBSD.org
.Sh BUGS
The cryptographic algorithms and the overall design have not been
attacked mercilessly for over 10 years by a gang of cryptoanalysts.
Property changes on: trunk/sbin/gbde/gbde.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sbin/gbde/gbde.c
===================================================================
--- trunk/sbin/gbde/gbde.c 2018-07-01 18:19:13 UTC (rev 11201)
+++ trunk/sbin/gbde/gbde.c 2018-07-01 18:19:55 UTC (rev 11202)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2002 Poul-Henning Kamp
* Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -29,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sbin/gbde/gbde.c 314327 2017-02-27 08:27:38Z avg $
*
* XXX: Future stuff
*
@@ -84,7 +85,7 @@
#include <sys/disk.h>
#include <sys/stat.h>
#include <crypto/rijndael/rijndael-api-fst.h>
-#include <crypto/sha2/sha2.h>
+#include <crypto/sha2/sha512.h>
#include <sys/param.h>
#include <sys/linker.h>
@@ -805,6 +806,7 @@
break;
case 'i':
i_opt = !i_opt;
+ break;
case 'k':
k_opt = optarg;
break;
Index: trunk/sbin/gbde/image.uu
===================================================================
--- trunk/sbin/gbde/image.uu 2018-07-01 18:19:13 UTC (rev 11201)
+++ trunk/sbin/gbde/image.uu 2018-07-01 18:19:55 UTC (rev 11202)
Property changes on: trunk/sbin/gbde/image.uu
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Index: trunk/sbin/gbde/template.txt
===================================================================
--- trunk/sbin/gbde/template.txt 2018-07-01 18:19:13 UTC (rev 11201)
+++ trunk/sbin/gbde/template.txt 2018-07-01 18:19:55 UTC (rev 11202)
Property changes on: trunk/sbin/gbde/template.txt
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Index: trunk/sbin/gbde/test.sh
===================================================================
--- trunk/sbin/gbde/test.sh 2018-07-01 18:19:13 UTC (rev 11201)
+++ trunk/sbin/gbde/test.sh 2018-07-01 18:19:55 UTC (rev 11202)
Property changes on: trunk/sbin/gbde/test.sh
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list