Copy stable/11@r303970 to releng/11.0 as part of the 11.0-RELEASE
cycle.

Prune svn:mergeinfo from the new branch, and rename it to RC1.

Update __FreeBSD_version.

Use the quarterly branch for the default FreeBSD.conf pkg(8) repo and
the dvd1.iso packages population.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Report the 1-based key numbers rather than the 0-based ones to be consistent.

Fix documentation for destroy command. Not sure how the wrong explanation
happened.

Spotted by: mwlucas

Correct the destroy example. The -n argument is not needed (and is not
valid).

Reported by: mwlucas
Reviewed by: phk
MFC after: 1 week

use .Mt to mark up email addresses consistently (part1)

PR: 191174
Submitted by: Franco Fichtner <franco@lastsummer.de>

Sweep man pages replacing ad -> ada.

Approved by: re (blackend)
MFC after: 1 week
X-MFC note: stable/9 only

Markup fixes.

Teach gbde(8) to use a key file in addition to a passphrase. This
makes it practical to use GBDE for "something you have plus something
you know" security together with a USB flash drive.

Reviewed by: phk
MFC after: 7 days

- Fixed description of the "destroy" command options.
- Document the "nuke" command.
- Mention which commands correspond to which functions.

Fix typo

Submitted by: edwin

Assorted markup, grammar, and spelling fixes.

Clarify that the encrypted device is called foo.bde and mention that
unmounting it before detaching GBDE is a good idea.

Insisted on by: Flemming Jacobsen <fj@batmule.dk>
Approveed by: re@

Remove reference to unavailable paper.

mdoc(7) police: markup overhaul.

Approved by: re

De-danglify the manual page.

Submitted by: ceri
Approved by: re (blanket)

o Bring the NOTICE section into the DESCRIPTION section and wrap it in
.Bf -emphasis ... .Ef
o Grammar/spelling

Sponsored by: DARPA, NAI Labs

Run a revision on the GBDE encryption facility.

Replace ARC4 with SHA2-512.
Change lock-structure encoding to use random ordering rather for obscurity.
Encrypt lock-structure with AES/256 instead of AES/128.
Change kkey derivation to be MD5 hash based.
Watch for malloc(M_NOWAIT) failures and ditch our cache when they happen.
Remove clause 3 of the license with NAI Labs consent.

Many thanks to "Lucky Green" <shamrock@cypherpunks.to> and "David
Wagner" <daw@cs.berkeley.edu>, for code reading, inputs and
suggestions.

This code has still not been stared at for 10 years by a gang of
hard-core cryptographers. Discretion advised.

NB: These changes result in the on-disk format changing: dump/restore needed.

Sponsored by: DARPA & NAI Labs.

o Use .Cm for 'attach', 'detach', 'init', 'setkey', and 'destroy' commands
o Fix some punctuation and wording
o Wording consistency in command-line option documentation
o Make use of mdoc's markup a bit more (quoting and the like)

Obtained from: TrustedBSD Project
Sponsored by: DARPA, NAI Labs

s/dettach/detach/g etc.

Pointed out by: chris

Use .PATH instead of VPATH.

Fix typo in man-page: man-section is 8.

Complete the Geom Based Disk Encryption: Add the OAM utility.

Sponsored by: DARPA and NAI Labs