kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(crypt-gpg): shellcheck for modules.d/91crypt-gpg

master
Harald Hoyer 2021-03-26 10:29:23 +01:00 committed by Harald Hoyer
parent eb0d3fb9c1
commit b130927514
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
modules.d/91crypt-gpg/.shchkdir Normal file
View File

9
modules.d/91crypt-gpg/crypt-gpg-lib.sh
View File

@ -29,8 +29,10 @@ gpg_decrypt() {
# program needed with GnuPG < 2.1), making for uncomplicated # program needed with GnuPG < 2.1), making for uncomplicated
# integration with the existing codebase. # integration with the existing codebase.
local useSmartcard="0" local useSmartcard="0"
local gpgMajorVersion="$(gpg --version | sed -n 1p | sed -n -r -e 's|.* ([0-9]*).*|\1|p')" local gpgMajorVersion
local gpgMinorVersion="$(gpg --version | sed -n 1p | sed -n -r -e 's|.* [0-9]*\.([0-9]*).*|\1|p')" local gpgMinorVersion
gpgMajorVersion="$(gpg --version | sed -n 1p | sed -n -r -e 's|.* ([0-9]*).*|\1|p')"
gpgMinorVersion="$(gpg --version | sed -n 1p | sed -n -r -e 's|.* [0-9]*\.([0-9]*).*|\1|p')"


if [ "${gpgMajorVersion}" -ge 2 ] && [ "${gpgMinorVersion}" -ge 1 ] \ if [ "${gpgMajorVersion}" -ge 2 ] && [ "${gpgMinorVersion}" -ge 1 ] \
&& [ -f /root/crypt-public-key.gpg ] && getargbool 1 rd.luks.smartcard; then && [ -f /root/crypt-public-key.gpg ] && getargbool 1 rd.luks.smartcard; then
@ -38,7 +40,8 @@ gpg_decrypt() {
echo "allow-loopback-pinentry" >> "$gpghome/gpg-agent.conf" echo "allow-loopback-pinentry" >> "$gpghome/gpg-agent.conf"
GNUPGHOME="$gpghome" gpg-agent --quiet --daemon GNUPGHOME="$gpghome" gpg-agent --quiet --daemon
GNUPGHOME="$gpghome" gpg --quiet --no-tty --import < /root/crypt-public-key.gpg GNUPGHOME="$gpghome" gpg --quiet --no-tty --import < /root/crypt-public-key.gpg
local smartcardSerialNumber="$(GNUPGHOME=$gpghome gpg --no-tty --card-status \ local smartcardSerialNumber
smartcardSerialNumber="$(GNUPGHOME=$gpghome gpg --no-tty --card-status \
| sed -n -r -e 's|Serial number.*: ([0-9]*)|\1|p' | tr -d '\n')" | sed -n -r -e 's|Serial number.*: ([0-9]*)|\1|p' | tr -d '\n')"
if [ -n "${smartcardSerialNumber}" ]; then if [ -n "${smartcardSerialNumber}" ]; then
inputPrompt="PIN (OpenPGP card ${smartcardSerialNumber})" inputPrompt="PIN (OpenPGP card ${smartcardSerialNumber})"

7
modules.d/91crypt-gpg/module-setup.sh
View File

@ -40,8 +40,11 @@ sc_public_key() {


# CCID Smartcard support requires GnuPG >= 2.1 with scdaemon and libusb # CCID Smartcard support requires GnuPG >= 2.1 with scdaemon and libusb
sc_supported() { sc_supported() {
local gpgMajor="$(gpg --version | sed -n 1p | sed -n -r -e 's|.* ([0-9]*).*|\1|p')" local gpgMajor
local gpgMinor="$(gpg --version | sed -n 1p | sed -n -r -e 's|.* [0-9]*\.([0-9]*).*|\1|p')" local gpgMinor
gpgMajor="$(gpg --version | sed -n 1p | sed -n -r -e 's|.* ([0-9]*).*|\1|p')"
gpgMinor="$(gpg --version | sed -n 1p | sed -n -r -e 's|.* [0-9]*\.([0-9]*).*|\1|p')"

if [[ ${gpgMajor} -gt 2 || ${gpgMajor} -eq 2 && ${gpgMinor} -ge 1 ]] \ if [[ ${gpgMajor} -gt 2 || ${gpgMajor} -eq 2 && ${gpgMinor} -ge 1 ]] \
&& require_binaries gpg-agent \ && require_binaries gpg-agent \
&& require_binaries gpg-connect-agent \ && require_binaries gpg-connect-agent \