Style fix

This commit is contained in:
Eelco Dolstra 2015-05-04 14:16:03 +02:00
parent c2bf9c3ee3
commit 28e49dcb41

View file

@ -303,43 +303,43 @@ in
twoFactor = mkOption { twoFactor = mkOption {
default = true; default = true;
type = types.bool; type = types.bool;
description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false)"; description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false).";
}; };
slot = mkOption { slot = mkOption {
default = 2; default = 2;
type = types.int; type = types.int;
description = "Which slot on the Yubikey to challenge"; description = "Which slot on the Yubikey to challenge.";
}; };
saltLength = mkOption { saltLength = mkOption {
default = 16; default = 16;
type = types.int; type = types.int;
description = "Length of the new salt in byte (64 is the effective maximum)"; description = "Length of the new salt in byte (64 is the effective maximum).";
}; };
keyLength = mkOption { keyLength = mkOption {
default = 64; default = 64;
type = types.int; type = types.int;
description = "Length of the LUKS slot key derived with PBKDF2 in byte"; description = "Length of the LUKS slot key derived with PBKDF2 in byte.";
}; };
iterationStep = mkOption { iterationStep = mkOption {
default = 0; default = 0;
type = types.int; type = types.int;
description = "How much the iteration count for PBKDF2 is increased at each successful authentication"; description = "How much the iteration count for PBKDF2 is increased at each successful authentication.";
}; };
gracePeriod = mkOption { gracePeriod = mkOption {
default = 2; default = 2;
type = types.int; type = types.int;
description = "Time in seconds to wait before attempting to find the Yubikey"; description = "Time in seconds to wait before attempting to find the Yubikey.";
}; };
ramfsMountPoint = mkOption { ramfsMountPoint = mkOption {
default = "/crypt-ramfs"; default = "/crypt-ramfs";
type = types.string; type = types.string;
description = "Path where the ramfs used to update the LUKS key will be mounted in stage-1"; description = "Path where the ramfs used to update the LUKS key will be mounted during early boot.";
}; };
/* TODO: Add to the documentation of the current module: /* TODO: Add to the documentation of the current module:
@ -359,13 +359,13 @@ in
fsType = mkOption { fsType = mkOption {
default = "vfat"; default = "vfat";
type = types.string; type = types.string;
description = "The filesystem of the unencrypted device"; description = "The filesystem of the unencrypted device.";
}; };
mountPoint = mkOption { mountPoint = mkOption {
default = "/crypt-storage"; default = "/crypt-storage";
type = types.string; type = types.string;
description = "Path where the unencrypted device will be mounted in stage-1"; description = "Path where the unencrypted device will be mounted during early boot.";
}; };
path = mkOption { path = mkOption {
@ -419,10 +419,10 @@ in
mkdir -p $out/etc/ssl mkdir -p $out/etc/ssl
cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl cp -pdv ${pkgs.openssl}/etc/ssl/openssl.cnf $out/etc/ssl
cat > $out/bin/openssl-wrap <<EOF cat > $out/bin/openssl-wrap <<EOF
#!$out/bin/sh #!$out/bin/sh
EOF EOF
chmod +x $out/bin/openssl-wrap chmod +x $out/bin/openssl-wrap
''} ''}
''; '';
@ -432,10 +432,10 @@ EOF
$out/bin/ykchalresp -V $out/bin/ykchalresp -V
$out/bin/ykinfo -V $out/bin/ykinfo -V
cat > $out/bin/openssl-wrap <<EOF cat > $out/bin/openssl-wrap <<EOF
#!$out/bin/sh #!$out/bin/sh
export OPENSSL_CONF=$out/etc/ssl/openssl.cnf export OPENSSL_CONF=$out/etc/ssl/openssl.cnf
$out/bin/openssl "\$@" $out/bin/openssl "\$@"
EOF EOF
$out/bin/openssl-wrap version $out/bin/openssl-wrap version
''} ''}
''; '';