Skip to content

Add option to specify OpenSSL digest type #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mandoonandy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add option to specify OpenSSL digest type #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ace42f
Merge pull request #1 from clinta/master
mandoonandy Apr 30, 2020
9d4d0b9
Add option to specify openssl key digest
mandoonandy Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions unlockgeli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ unlockgeli_start()
eval key=\${unlockgeli_${_g}_key}
eval key_identityfile=\${unlockgeli_${_g}_key_identityfile}
eval key_enc_pw=\${unlockgeli_${_g}_key_enc_pw}
eval key_digest=\${unlockgeli_${_g}_key_digest:+"-md "\${unlockgeli_${_g}_key_digest}}
eval passphrase=\${unlockgeli_${_g}_passphrase}
eval passphrase_identityfile=\${unlockgeli_${_g}_passphrase_identityfile}
eval passphrase_enc_pw=\${unlockgeli_${_g}_passphrase_enc_pw}
Expand All @@ -37,7 +38,7 @@ unlockgeli_start()
if [ -n "${key_enc_pw}" ]; then
echo "Decrypting keyfile"
mv $keytempfile ${keytempfile}.aes
openssl enc -aes-256-cbc -a -salt -d -in ${keytempfile}.aes -out $keytempfile -k "${key_enc_pw}"
openssl enc -aes-256-cbc -a -salt -d -in ${keytempfile}.aes -out $keytempfile -k "${key_enc_pw}" ${key_digest}
if [ "$?" -ne "0" ]; then
warn "Unable to decrypt identity file ${key}"
fi
Expand All @@ -52,7 +53,7 @@ unlockgeli_start()
if [ -n "${passphrase_enc_pw}" ]; then
echo "Decrypting passphrase file"
mv $pwtempfile ${pwtempfile}.aes
openssl enc -aes-256-cbc -a -salt -d -in ${pwtempfile}.aes -out $pwtempfile -k "${passphrase_enc_pw}"
openssl enc -aes-256-cbc -a -salt -d -in ${pwtempfile}.aes -out $pwtempfile -k "${passphrase_enc_pw}" ${key_digest}
if [ "$?" -ne "0" ]; then
warn "Unable to decrypt passphrase file ${passphrase}"
fi
Expand Down