eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-17 05:40:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add defaults to --help output.

Browse Source 
git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@460 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2011-03-14 13:41:00 +00:00
parent d658159ae5
commit 4505d0a36b
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@@ -250,6 +250,8 @@ CS_STR_WITH([luks1-cipher], [cipher for LUKS1], [aes])
CS_STR_WITH([luks1-mode], [cipher mode for LUKS1], [cbc-essiv:sha256]) CS_STR_WITH([luks1-mode], [cipher mode for LUKS1], [cbc-essiv:sha256])
CS_NUM_WITH([luks1-keybits],[key length in bits for LUKS1], [256]) CS_NUM_WITH([luks1-keybits],[key length in bits for LUKS1], [256])
CS_STR_WITH([loopaes-cipher], [cipher for loop-AES mode], [aes])
CS_NUM_WITH([loopaes-keybits],[key length in bits for loop-AES mode], [256])
dnl ========================================================================== dnl ==========================================================================

2
lib/loopaes/loopaes.h
View File

@@ -5,8 +5,6 @@
#define LOOPAES_KEYFILE_MINSIZE 60 #define LOOPAES_KEYFILE_MINSIZE 60
#define LOOPAES_KEYFILE_MAXSIZE 8000 #define LOOPAES_KEYFILE_MAXSIZE 8000
#define DEFAULT_LOOPAES_CIPHER "aes"
int LOOPAES_parse_keyfile(struct crypt_device *cd, int LOOPAES_parse_keyfile(struct crypt_device *cd,
struct volume_key **vk, struct volume_key **vk,
unsigned int *keys_count, unsigned int *keys_count,

4
man/cryptsetup.8
View File

@@ -148,7 +148,7 @@ This command allows restoring header if device do not contain LUKS header or if
For more information about LUKS, see \fBhttp://code.google.com/p/cryptsetup/wiki/Specification\fR For more information about LUKS, see \fBhttp://code.google.com/p/cryptsetup/wiki/Specification\fR
.SH Loop-AES EXTENSION .SH loop-AES EXTENSION
cryptsetup allows to map loop-AES encrypted partition using compatible dm-crypt mode. cryptsetup allows to map loop-AES encrypted partition using compatible dm-crypt mode.
@@ -160,6 +160,8 @@ opens the loop-AES <device> and sets up a mapping <name>.
N.B. If keyfile is in GPG encrypted format, you have to use \-\-key-file=- and decrypt it before use. N.B. If keyfile is in GPG encrypted format, you have to use \-\-key-file=- and decrypt it before use.
gpg --decrypt <keyfile> | cryptsetup loopaesOpen \-\-key-file=- <device> <name> gpg --decrypt <keyfile> | cryptsetup loopaesOpen \-\-key-file=- <device> <name>
Use \-\-key-file to specify proper key length, default compiled-in parameters are visible in \-\-help output.
\fB<options>\fR can be [\-\-key-file, \-\-key-size, \-\-offset, \-\-readonly]. \fB<options>\fR can be [\-\-key-file, \-\-key-size, \-\-offset, \-\-readonly].
.PP .PP
\fIloopaesClose\fR <name> \fIloopaesClose\fR <name>

8
src/cryptsetup.c
View File

@@ -265,7 +265,7 @@ static int action_loopaesOpen(int arg)
.hash = opt_hash ?: NULL, // FIXME .hash = opt_hash ?: NULL, // FIXME
.offset = opt_offset, .offset = opt_offset,
}; };
unsigned int key_size = (opt_key_size ?: 128) / 8; unsigned int key_size = (opt_key_size ?: DEFAULT_LOOPAES_KEYBITS) / 8;
int r; int r;
if (!opt_key_file) { if (!opt_key_file) {
@@ -276,8 +276,8 @@ static int action_loopaesOpen(int arg)
if ((r = crypt_init(&cd, action_argv[0]))) if ((r = crypt_init(&cd, action_argv[0])))
goto out; goto out;
r = crypt_format(cd, CRYPT_LOOPAES, NULL, NULL, NULL, NULL, r = crypt_format(cd, CRYPT_LOOPAES, opt_cipher ?: DEFAULT_LOOPAES_CIPHER,
key_size, &params); NULL, NULL, NULL, key_size, &params);
if (r < 0) if (r < 0)
goto out; goto out;
@@ -988,8 +988,10 @@ static void help(poptContext popt_context, enum poptCallbackReason reason,
crypt_get_dir()); crypt_get_dir());
log_std(_("\nDefault compiled-in device cipher parameters:\n" log_std(_("\nDefault compiled-in device cipher parameters:\n"
"\tloop-AES: %s, Key %d bits\n"
"\tplain: %s, Key: %d bits, Password hashing: %s\n" "\tplain: %s, Key: %d bits, Password hashing: %s\n"
"\tLUKS1: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n"), "\tLUKS1: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n"),
DEFAULT_LOOPAES_CIPHER, DEFAULT_LOOPAES_KEYBITS,
DEFAULT_CIPHER(PLAIN), DEFAULT_PLAIN_KEYBITS, DEFAULT_PLAIN_HASH, DEFAULT_CIPHER(PLAIN), DEFAULT_PLAIN_KEYBITS, DEFAULT_PLAIN_HASH,
DEFAULT_CIPHER(LUKS1), DEFAULT_LUKS1_KEYBITS, DEFAULT_LUKS1_HASH, DEFAULT_CIPHER(LUKS1), DEFAULT_LUKS1_KEYBITS, DEFAULT_LUKS1_HASH,
DEFAULT_RNG); DEFAULT_RNG);

10
tests/loopaes-test
View File

@@ -2,7 +2,7 @@
CRYPTSETUP=../src/cryptsetup CRYPTSETUP=../src/cryptsetup
# try to validate using loop-aes losetup/kernel if available # try to validate using loop-AES losetup/kernel if available
LOSETUP_AES=/losetup-aes LOSETUP_AES=/losetup-aes
LOOP_DD_PARAM="bs=1k count=10000" LOOP_DD_PARAM="bs=1k count=10000"
@@ -84,7 +84,7 @@ function check_sum_losetup() # $key $alg
{ {
[ ! -x $LOSETUP_AES ] && echo && return [ ! -x $LOSETUP_AES ] && echo && return
echo -n " Verification using Loop-AES: " echo -n " Verification using loop-AES: "
losetup -d $LOOPDEV >/dev/null 2>&1 losetup -d $LOOPDEV >/dev/null 2>&1
cat $1 | $LOSETUP_AES -p 0 -e $2 $LOOPDEV $IMG cat $1 | $LOSETUP_AES -p 0 -e $2 $LOOPDEV $IMG
@@ -94,7 +94,7 @@ function check_sum_losetup() # $key $alg
echo "[OK]" echo "[OK]"
else else
echo "[FAIL]" echo "[FAIL]"
echo " Expecting $EXPSUM got $VSUM (loop-aes)." echo " Expecting $EXPSUM got $VSUM (loop-AES)."
fail fail
fi fi
losetup -d $LOOPDEV >/dev/null 2>&1 losetup -d $LOOPDEV >/dev/null 2>&1
@@ -116,13 +116,13 @@ function check_version()
which uuencode >/dev/null || skip "WARNING: test require uuencode binary, test skipped." which uuencode >/dev/null || skip "WARNING: test require uuencode binary, test skipped."
check_version || skip "Probably old kernel, test skipped." check_version || skip "Probably old kernel, test skipped."
# Loop-AES tests # loop-AES tests
KEY_SIZES="128 256" KEY_SIZES="128 256"
KEY_FILES="$KEYv1 $KEYv2 $KEYv3" KEY_FILES="$KEYv1 $KEYv2 $KEYv3"
for key_size in $KEY_SIZES ; do for key_size in $KEY_SIZES ; do
for key in $KEY_FILES ; do for key in $KEY_FILES ; do
prepare "Open Loop-AES $key / AES-$key_size" prepare "Open loop-AES $key / AES-$key_size"
$CRYPTSETUP loopaesOpen $LOOPDEV $DEV_NAME -s $key_size --key-file $key || fail $CRYPTSETUP loopaesOpen $LOOPDEV $DEV_NAME -s $key_size --key-file $key || fail
check_exists check_exists
check_sum $key $key_size check_sum $key $key_size