projects
/
grml-crypt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
343f3a5
)
fixed variable naming
t/cleanup
author
Michael Gebetsroither
<gebi@grml.org>
Sat, 10 Jan 2009 21:40:37 +0000
(22:40 +0100)
committer
Michael Gebetsroither
<gebi@grml.org>
Sat, 10 Jan 2009 21:40:37 +0000
(22:40 +0100)
grml-crypt
patch
|
blob
|
history
diff --git
a/grml-crypt
b/grml-crypt
index
5591351
..
0aef76d
100755
(executable)
--- a/
grml-crypt
+++ b/
grml-crypt
@@
-35,7
+35,7
@@
DM_PATH_=""
ACTION_=""
DM_PREFIX_="grml-crypt_"
FORCE_='false'
ACTION_=""
DM_PREFIX_="grml-crypt_"
FORCE_='false'
-
OVERWRITE_SOURCE_DEV
_='/dev/urandom'
+
ENTROPY_SOURCE
_='/dev/urandom'
OPTIMIZED_MODE_SET_='false'
OPTIMIZING_LEVEL_=0
CIPHER_SIZE_="256"
OPTIMIZED_MODE_SET_='false'
OPTIMIZING_LEVEL_=0
CIPHER_SIZE_="256"
@@
-262,13
+262,13
@@
function actionFormat
execute "dd if=/dev/zero of=$TARGET_ bs=1M count=${SIZE_} &>/dev/null" \
die "could not initialise $TARGET_ with /dev/zero"
else
execute "dd if=/dev/zero of=$TARGET_ bs=1M count=${SIZE_} &>/dev/null" \
die "could not initialise $TARGET_ with /dev/zero"
else
- if [[ $
OVERWRITE_SOURCE_DEV
_ == '/dev/zero' ]]; then
+ if [[ $
ENTROPY_SOURCE
_ == '/dev/zero' ]]; then
echo "INSERCURE mode"
else
echo "SECURE mode (taking /dev/urandom as source, this could take some time)"
fi
echo "INSERCURE mode"
else
echo "SECURE mode (taking /dev/urandom as source, this could take some time)"
fi
- execute "dd if=$
OVERWRITE_SOURCE_DEV
_ of=$TARGET_ bs=1M count=${SIZE_} &>/dev/null" ||\
- die "could not initialise $TARGET_ with $
OVERWRITE_SOURCE_DEV
_"
+ execute "dd if=$
ENTROPY_SOURCE
_ of=$TARGET_ bs=1M count=${SIZE_} &>/dev/null" ||\
+ die "could not initialise $TARGET_ with $
ENTROPY_SOURCE
_"
fi
fi
fi
fi
@@
-276,7
+276,7
@@
function actionFormat
# TARGET_ is now /dev/loop<x>
execute "losetup $TARGET_ $ORIG_TARGET_" die
# TARGET_ is now /dev/loop<x>
execute "losetup $TARGET_ $ORIG_TARGET_" die
- if [[ $OPTIMIZED_MODE_SET_ == 'true' || $
OVERWRITE_SOURCE_DEV
_ == '/dev/zero' ]]; then
+ if [[ $OPTIMIZED_MODE_SET_ == 'true' || $
ENTROPY_SOURCE
_ == '/dev/zero' ]]; then
execute "dd if=/dev/urandom of=$TARGET_ bs=1M count=2 &>/dev/null" \
die "could not initialise the fist 2MB of $TARGET_ with /dev/urandom"
fi
execute "dd if=/dev/urandom of=$TARGET_ bs=1M count=2 &>/dev/null" \
die "could not initialise the fist 2MB of $TARGET_ with /dev/urandom"
fi
@@
-290,12
+290,12
@@
function actionFormat
echo "optimised SECURE mode"
execute "dd if=/dev/urandom of=$TARGET_ bs=1M count=2 &>/dev/null" ||\
die "could not initialise the first 2MB of $TARGET_ with /dev/urandom"
echo "optimised SECURE mode"
execute "dd if=/dev/urandom of=$TARGET_ bs=1M count=2 &>/dev/null" ||\
die "could not initialise the first 2MB of $TARGET_ with /dev/urandom"
- elif [[ $
OVERWRITE_SOURCE_DEV
_ != '/dev/zero' ]]; then
+ elif [[ $
ENTROPY_SOURCE
_ != '/dev/zero' ]]; then
# default mode
# default mode
- echo "SECURE mode (taking $
OVERWRITE_SOURCE_DEV
_ as source, this could take some time)"
- execute "dd if=$
OVERWRITE_SOURCE_DEV
_ of=$TARGET_ bs=1M &>/dev/null" #||\
+ echo "SECURE mode (taking $
ENTROPY_SOURCE
_ as source, this could take some time)"
+ execute "dd if=$
ENTROPY_SOURCE
_ of=$TARGET_ bs=1M &>/dev/null" #||\
# skipped because "no space left on device" from dd
# skipped because "no space left on device" from dd
- # die "could not initialise $TARGET_ with $
OVERWRITE_SOURCE_DEV
_"
+ # die "could not initialise $TARGET_ with $
ENTROPY_SOURCE
_"
else
echo 'INSECURE mode (only initialising the fist 2MB with /dev/urandom)'
execute "dd if=/dev/urandom of=$TARGET_ bs=1M count=2 &>/dev/null" \
else
echo 'INSECURE mode (only initialising the fist 2MB with /dev/urandom)'
execute "dd if=/dev/urandom of=$TARGET_ bs=1M count=2 &>/dev/null" \
@@
-340,7
+340,7
@@
while getopts "s:t:rzoyfm:hvS:C:I:A:" opt; do
t) FSTYPE_="$OPTARG" ;;
r) READONLY_SET_='true' ;;
z) let OPTIMIZING_LEVEL_=$OPTIMIZING_LEVEL_+1
t) FSTYPE_="$OPTARG" ;;
r) READONLY_SET_='true' ;;
z) let OPTIMIZING_LEVEL_=$OPTIMIZING_LEVEL_+1
-
OVERWRITE_SOURCE_DEV
_='/dev/zero'
+
ENTROPY_SOURCE
_='/dev/zero'
warn 'initialising from INSECURE source /dev/zero' ;;
o) let OPTIMIZING_LEVEL_=$OPTIMIZING_LEVEL_+1
OPTIMIZED_MODE_SET_='true' ;;
warn 'initialising from INSECURE source /dev/zero' ;;
o) let OPTIMIZING_LEVEL_=$OPTIMIZING_LEVEL_+1
OPTIMIZED_MODE_SET_='true' ;;