Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-11-29 16:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

KDF key handling cleanup

Browse Source
This commit is contained in:
Jaromil 2014-11-25 03:25:27 +01:00
parent 5dbcabdf26
commit f218c644ab
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tomb
View File

@ -722,13 +722,15 @@ is_valid_key() {
# $1 is a string containing an encrypted key # $1 is a string containing an encrypted key
_tomb_key_recover recover_key() { _tomb_key_recover recover_key() {
local key="$1" # Unique argument is an encrypted key local key="${1}" # Unique argument is an encrypted key
_warning "Attempting key recovery." _warning "Attempting key recovery."
_head="${key[(f)1]}" # take the first line
TOMBKEY="" # Reset global variable TOMBKEY="" # Reset global variable
[[ $key =~ "_KDF_" ]] && TOMBKEY+="`print - $key | $head -n 1`\n" [[ $_head =~ "^_KDF_" ]] && TOMBKEY+="$_head\n"
TOMBKEY+="-----BEGIN PGP MESSAGE-----\n" TOMBKEY+="-----BEGIN PGP MESSAGE-----\n"
TOMBKEY+="$key\n" TOMBKEY+="$key\n"
@ -827,18 +829,24 @@ get_lukskey() {
exhumedkey="" exhumedkey=""
firstline=$(head -n1 <<< $TOMBKEY) firstline="${TOMBKEY[(f)1]}"
# key is KDF encoded # key is KDF encoded
if [[ $firstline =~ '^_KDF_' ]]; then if [[ $firstline =~ '^_KDF_' ]]; then
_verbose "KDF: ::1 kdf::" $(cut -d_ -f 3 <<<$firstline) kdf_hash="${firstline[(ws:_:)2]}"
case `cut -d_ -f 3 <<<$firstline` in _verbose "KDF: ::1 kdf::" "$kdf_hash"
pbkdf2sha1) case "$kdf_hash" in
pbkdf2_param=`cut -d_ -f 4- <<<$firstline | tr '_' ' '` "pbkdf2sha1")
_password=$(tomb-kdb-pbkdf2 ${=pbkdf2_param} 2>/dev/null <<<$_password) kdf_salt="${firstline[(ws:_:)3]}"
kdf_ic="${firstline[(ws:_:)4]}"
kdf_len="${firstline[(ws:_:)5]}"
_verbose "KDF salt: $kdf_salt"
_verbose "KDF ic: $kdf_ic"
_verbose "KDF len: $kdf_len"
_password=$(tomb-kdb-pbkdf2 $kdf_salt $kdf_ic $kdf_len 2>/dev/null <<<$_password)
;; ;;
*) *)
_failure "No suitable program for KDF ::1 program::." $(cut -f 3 <<<$firstline) _failure "No suitable program for KDF ::1 program::." $pbkdf_hash
unset _password unset _password
return 1 return 1
;; ;;