X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-crypt;h=5591351896418f238c693999eda06086d1535449;hb=0e5173ea299dc3dbd74903be8bc640f64b76ebe9;hp=65608ee5a4ab6a18e9b43c35417b0d33f363fa34;hpb=aad28464122ca115b2852bddd67367d55bd4d476;p=grml-crypt.git

diff --git a/grml-crypt b/grml-crypt
index 65608ee..5591351 100755
--- a/grml-crypt
+++ b/grml-crypt
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      grml-crypt
 # Purpose:       Program to format, mount and unmount encrypted devices/files
 # Authors:       Michael Gebetsroither <gebi@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mon Aug 08 11:37:20 CEST 2005
+# Latest change: Don Jul 26 19:57:28 CEST 2007 [mika]
 ################################################################################
 
 
@@ -38,9 +38,9 @@ FORCE_='false'
 OVERWRITE_SOURCE_DEV_='/dev/urandom'
 OPTIMIZED_MODE_SET_='false'
 OPTIMIZING_LEVEL_=0
-CIPHER_SIZE_="128"
+CIPHER_SIZE_="256"
 CIPHER_="aes-cbc-essiv:sha256"
-ITERATION_TIME_="1"
+ITERATION_TIME_="1000"
 ADDITIONAL_CRYPTSETUP_ARGS_=""
 READONLY_SET_='false'
 ADDITIONAL_MOUNT_ARGS_=""
@@ -55,14 +55,14 @@ function printUsage
   cat <<EOT
 Usage: "$PROG_NAME__" [OPTIONS] action <device/file> [mountpoint]
 
-$PROG_NAME__ is a wrapper arround cryptsetup with LUKS support to format a device
+$PROG_NAME__ is a wrapper around cryptsetup with LUKS support to format a device
 
 OPTIONS:
    -s         size of the loop-filesystem to create, in MB (default=$SIZE_)
    -t         type of filesystem (default=$FSTYPE_)
    -r         read only mode (fully supported only by start)
    -z         insecure mode, using /dev/zero for most of the initialisation (INSECURE!)
-   -o         optimized initialisation mode (should be as secure as the default but faster)
+   -o         optimised initialisation mode (should be as secure as the default but faster)
    -y         verifies the passphrase by asking for it twice
    -f         force file overwriting in format mode and/or disable confirmation dialog
    -m         additional arguments to mount
@@ -100,7 +100,7 @@ EOT
 function getDMName
 {
   device_="${1##*/}"
-  
+
   # first trying normal devicename
   tmp_="${DM_PREFIX_}${device_}"
   if [ ! -e "$tmp_" ]; then
@@ -131,10 +131,10 @@ function formatDevice
   execute "$CRYPTSETUP_ luksOpen $TARGET_ $DM_NAME_" warn \
     "could not open $DM_PATH_ to create a filesystem on it!" || return 1
   if [[ $type_ == 'init' && $OPTIMIZED_MODE_SET_ == 'true' ]]; then
-    echo "finishing optimized initialisation (this could take some time)"
+    echo "finishing optimised initialisation (this could take some time)"
     # FIXME
     execute "dd if=/dev/zero of=$DM_PATH_ bs=1M &>/dev/null" # || \
-    #  warn "could not finish optimized initialisation properly"
+    #  warn "could not finish optimised initialisation properly"
     ret_=$?
     # cutted out because of no space left on device error :(
     #if [[ $ret_ != 0 ]]; then
@@ -152,13 +152,13 @@ function formatDevice
     echo "Successully created $FSTYPE_ on encrypted $TARGET_"
     return 0
   fi
-} 
+}
 
 
 function actionStart
 {
   ret_=0
-  
+
   # no mountpoint, by-by
   if [[ "$MOUNT_POINT_" == "" ]]; then
     printUsage
@@ -198,12 +198,12 @@ function actionStop
   isExistent "$mp_" die
   tmp_=`realpath $mp_` || die "could not get realpath of $mp_"
   dprint "realpath_=\"$tmp_\""
-  
+
   dm_path_=`mount |grep "$tmp_ "` || die "$tmp_ is not mounted"
   dprint "dm_path_=\"$dm_path_\""
   dm_path_=`echo $dm_path_ |awk '{print $1}'` || die "could not get devicemapper name for $tmp_"
   dprint "dm_path_=\"$dm_path_\""
-  
+
   dm_name_="${dm_path_##*/}"
   dprint "dm_name_=\"$dm_name_\""
 
@@ -211,7 +211,7 @@ function actionStop
   device_=`$CRYPTSETUP_ status $dm_name_ |awk '/device:/{print $2}'` || \
     die "could not get underlying device of $dm_path_"
   dprint "device_=\"$device_\""
-  
+
   execute "umount $dm_path_" die "could not unmount $device_"
   execute "$CRYPTSETUP_ luksClose $dm_name_" die "could not close $dm_path_"
   echo "$device_" |grep loop &>/dev/null && execute "losetup -d $device_" \
@@ -224,7 +224,7 @@ this device could possible not be a loop device => maybe bogus error"
 function yesDialog
 {
   msg_="$1"
-  
+
   echo "WARNING!" >&2
   echo "========" >&2
   echo -n "$msg_" >&2
@@ -252,13 +252,13 @@ function actionFormat
     notice "Operating on a file"
     IS_IMAGE_='true'
     if [ -e "$TARGET_" ]; then
-      $FORCE_ || die "file $TARGET_ does allready exist"
+      $FORCE_ || die "$TARGET_ does already exist"
       warn "overwriting file $TARGET_"
       init_='donothing'
     else
       echo -n "Initialising file with "
       if [[ $OPTIMIZED_MODE_SET_ == 'true' ]]; then
-        echo "optimized SECURE mode"
+        echo "optimised SECURE mode"
         execute "dd if=/dev/zero of=$TARGET_ bs=1M count=${SIZE_} &>/dev/null" \
           die "could not initialise $TARGET_ with /dev/zero"
       else