Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2025-01-05 15:12:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed expr bug and added tomb mktemp internal command

Browse Source
This commit is contained in:
Jaromil 2011-04-28 20:42:45 +02:00
parent e1ba5a4b4b
commit d2d86686a8
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tomb
View File

@ -84,7 +84,7 @@ check_bin() {
# safe dir creation function # safe dir creation function
safe_dir() { safe_dir() {
dir="/tmp/$1.$RANDOM.$RANDOM.$$" dir="/dev/shm/$1.$RANDOM.$RANDOM.$$"
(umask 077 && mkdir "$dir") || echo "-1" (umask 077 && mkdir "$dir") || echo "-1"
echo "$dir" echo "$dir"
} }
@ -377,8 +377,12 @@ create_tomb() {
cryptsetup luksClose tomb.tmp cryptsetup luksClose tomb.tmp
losetup -d ${nstloop} losetup -d ${nstloop}
# set permissions on the tomb
sudo chown $UID:$GID ${tombfile}
sudo chmod go-rwx ${tombfile}
act "done creating $tombname encrypted storage (using Luks dm-crypt AES/SHA256)" act "done creating $tombname encrypted storage (using Luks dm-crypt AES/SHA256)"
notice "Your tomb is ready in ${tombdir}/${tombfile} and secured with key ${tombname}.tomb.key" notice "Your tomb is ready in ${tombdir}/${tombfile} and secured with key ${tombfile}.key"
} }
@ -426,7 +430,8 @@ mount_tomb() {
fi fi
# save date of mount in minutes since 1970 # save date of mount in minutes since 1970
mapdate="expr `date +%s` / 60" mapdate=`date +%s`
mapdate="`expr $mapdate / 60`"
mapper="tomb.${tombname}.${mapdate}.`basename $nstloop`" mapper="tomb.${tombname}.${mapdate}.`basename $nstloop`"
keyname=`basename $tombkey | cut -d. -f1` keyname=`basename $tombkey | cut -d. -f1`
@ -917,7 +922,7 @@ main () {
umount) check_priv ; umount_tomb ${CMD2} ;; umount) check_priv ; umount_tomb ${CMD2} ;;
unmount) check_priv ; umount_tomb ${CMD2} ;; unmount) check_priv ; umount_tomb ${CMD2} ;;
close) check_priv ; umount_tomb ${CMD2} ;; close) check_priv ; umount_tomb ${CMD2} ;;
slam) chack_priv ; SLAM=1; umount_tomb ${CMD2} ;; slam) check_priv ; SLAM=1; umount_tomb ${CMD2} ;;
bury) if [ "$STEGHIDE" = 0 ]; then bury) if [ "$STEGHIDE" = 0 ]; then
error "steghide not installed. Cannot bury your key" error "steghide not installed. Cannot bury your key"
return 1 return 1
@ -931,6 +936,7 @@ main () {
install) check_priv ; install_tomb ;; install) check_priv ; install_tomb ;;
askpass) ask_password $CMD2 ;; askpass) ask_password $CMD2 ;;
status) tomb-status ;; status) tomb-status ;;
mktemp) safe_dir ${CMD2} ;;
*) error "command \"$CMD\" not recognized" *) error "command \"$CMD\" not recognized"
act "try -h for help" act "try -h for help"
return 1 return 1