CVS log for src/sbin/cgdconfig/params.c

Up to [cvs.NetBSD.org] / src / sbin / cgdconfig

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Pull up following revision(s) (requested by riastradh in ticket #941):

	sbin/cgdconfig/params.c: revision 1.35
	sbin/cgdconfig/params.h: revision 1.15
	sbin/cgdconfig/cgdconfig.c: revision 1.62
	sbin/cgdconfig/cgdconfig.c: revision 1.63
	sbin/cgdconfig/cgdconfig.8: revision 1.58
	sbin/cgdconfig/cgdconfig.8: revision 1.59
	sbin/cgdconfig/Makefile: revision 1.23

cgdconfig(8): KNF in cgdconfig.c.
No functional change intended.

PR/58212: Malte Dehling: Add zfs verification method

cgdconfig(8): Estimate verify methods' false accept probabilities.
An addendum following discussion around:
PR bin/58212: cgdconfig(8): Add zfs verification method

PR/58212: Malte Dehling: Add zfs verification method

cgdconfig(8): Add support for generating shared-key parameters files.

Usage model:

- Generate a parameters file that supports sharing its main key:

	cgdconfig -g -S -o /etc/cgd/wd0e -V gpt adiantum

- Make another parameters file that uses the same shared main key but
  derives an independent subkey from it:

	cgdconfig -g -S -P /etc/cgd/wd0e -o /etc/cgd/ld1e \
	    -V disklabel aes-cbc 256

cgdconfig(8): Add support for shared keys.

New clause `shared <id> algorithm <alg> subkey <info>' in a keygen
block enables `cgdconfig -C' to reuse a key between different params
files, so you can, e.g., use a single password for multiple disks.
This is better than simply caching the password itself because:

- Hashing the password is expensive, so it should only be done once.

  Suppose your budget is time t before you get bored, and you
  calibrate password hash parameters to unlock n disks before you get
  bored waiting for `cgdconfig -C'.

  . With n password hashings the adversary's cost goes up only by a
    factor of t/n.
  . With one password hashing and n subkeys the adversary's cost goes
    up by a factor of n.

  And if you ever add a disk, rehashing it will make `cgdconfig -C'
  go over budget, whereas another subkey adds negligible cost to you.

- Subkeys work for other types of keygen blocks, like shell_cmd,
  which could be used to get a key from a hardware token that needs a
  button press.

The <info> parameter must be different for each params file;
everything else in the keygen block must be the same.  With this
clause, the keygen block determines a shared key used only to derive
keys; the actual key used by cgdconfig is derived from the shared key
by the specified algorithm.

The only supported algorithm is hkdf-hmac-sha256, which uses
HKDF-Expand of RFC 5869 instantiated with SHA-256.

Example:

	algorithm aes-cbc;
	iv-method encblkno1;
	keylength 128;
	verify_method none;
	keygen pkcs5_pbkdf2/sha1 {
		iterations 39361;
		salt AAAAgMoHiYonye6KogdYJAobCHE=;
		shared "pw" algorithm hkdf-hmac-sha256
		    subkey AAAAgFlw0BMQ5gY+haYkZ6JC+yY=;
	};

The key used for this disk will be derived by

	HKDF-HMAC-SHA256_k(WXDQExDmBj6FpiRnokL7Jg==),

where k is the outcome of PBKDF2-SHA1 with the given parameters.

Note that <info> encodes a four-byte prefix giving the big-endian
length in bits of the info argument to HKDF, just like all other bit
strings in cgdconfig parameters files.

If you have multiple disks configured using the same keygen block
except for the info parameter, `cgdconfig -C' will only prompt once
for your passphrase, generate a shared key k with PBKDF2 as usual,
and then reuse it for each of the disks.

cgdconfig(8): Add an argon2id password-based key generation method

This provides an extra level of side-channel and cracking resistance
compared to the pre-existing pkcs5_pbkdf2/sha1 method used for
password-based disk encryption.

Several new keygen parameters are supported:

	memory (integer, in kilobytes)
	parallelism (integer, usually the number of CPU cores)
	version (integer, usually 19...)

We do our best to calibrate these automatically when the paramsfile
is initially generated.

lgtm riastradh@

sync with head

Make adiantum a first class citizen

Sync with HEAD

Synch with HEAD

Avoid crash when no algorithm is specified in parameter file.

Sync with HEAD.  (Note that most of these changes are simply $NetBSD$
tag issues.)

Add aes-xts to cgdconfig(8).

CID 1340063: fix TOCTOU

Don't chdir to the config directory; just form the parameters file with a
path if needed.

fix error messages containing \n

Add validation methods "mbr" and "gpt" for disks without a valid disklabel.

Sync with HEAD.

Merge in changes between wrstuden-revivesa-base-2 and
wrstuden-revivesa-base-3.

PR/39525: Joachim Schueth, Frederik Sausmikat:
cgd inadvertently encrypts blkno eight times to generate IV

Sync w/ -current. 34 merge conflicts to follow.

Sync with HEAD.

sync with head.

Add a new keygen method which will execute an external command and
take its output as the key.  I've been meaning to do this for quite
a while...

Remove clause 3 and 4 from TNF licenses

sync with HEAD

simplify and fix the combination code. Hi pooka.

sync with HEAD

3 month roland feedback timeout:
- Pass lint
- knf
- convert ints to size_t's

Use warn() and warnx().

crypt_defaults_lookup():
 * Avoid comparison of int with unsigned.
 * Simplified.

Remove more duplicate #includes,
from Slava Semushin <slava.semushin@gmail.com>

Programs that use efun.

Proper bounds check, found by Coverity, CID 1468.

- constify.
- don't dup extern declarations on each file because they end up being
  inconsistent (yyerror).

Centralize error checking for malloc,calloc,strdup.

Fix comment.  We're using microseconds not milliseconds.

Fix bits vs. bytes problem in call to calibration routine.

Add "urandomkey" key generation method as described in PR kern/22766;
useful for configuring a throwaway key for cgd-on-swap at boot time.

Oy, sometimes CVS sticky tags hurt.  Revert urandomkey; that should be on HEAD.

Fix a longstanding algorithmic flaw in PKCS#5 key generation.

The existing pkcs5_pbdkf2 keygen method is retained functionally
as-is, for compatibility with existing params files.  The corrected
algorithm, which is now the default for new params file generation, is
called pkcs5_pbkdf2/sha1.

NB. The backwards compatibility for the miscreant keygen method will
be removed at the same time as support for the previous parameters
file syntax. Sometime between now and then, users should update their
params files using -G, which will create a new params file including
an xor value so that the resulting generated key is the same; they
should also

Problem discovery and 2-char algorithm fix by Charles Blundell, messy
compat goop by me, long complicated names by Roland Dowdeswell.

Update manpage accordingly and bump date.

add a new verification method that prompts for the pkcs#5 pbkdf2
passphrase again and checks the generated key against the original.

die if asprintf fails to malloc

If reading an old style parameters file then default a missing
keygen_iteration to 128.  This will not default the iteration count
on a new style parameter file as it is an error in the new style
to fail to specify the iteration count.

Addresses PR: bin/21056

substantial rototill of the code.

	o  added new features:
		o  -G:  generate a new paramsfile that produces the same
			key as the old paramsfile,
		o  ffs verify_method,
		o  multiple keygen methods that are xor'ed together
		   (for n-factor authentication), and
		o  calibrating the iteration count of PKCS#5 PBKDF2 to
		   the current machine's speed.
	o  changed paramsfile format to allow for the new features.
	o  replaced open-coded parser with yacc grammar.
	o  lots of supporting changes.
	o  updated documentation to reflect new features and new
	   paramsfile format.

Make iteration count for PKCS#5 settable in the parameters files.

tweaks for fparseln(3) move from libutil to libc:
- remove #include <util.h> if nothing else needed it
- remove LDFLAGS+=-lutil if nothing else needed it

Add the concept of a verification method which allows cgdconfig(8)
to reprompt for the passphrase if the key does not meet certain
criteria.  The currently implemented methods are ``none'' and
``disklabel''.  The first behaves in the original fashion, the
second will scan for a disklabel on the cgd after configuration
and if it does not find a disklabel then it will reprompt for the
password and reconfigure the disk.

Initial checkin of cgdconfig(8), a program to configure a cgd.