diff options
Diffstat (limited to 'checks/armor.test')
| -rwxr-xr-x | checks/armor.test | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/checks/armor.test b/checks/armor.test index 9fb92925b..cfd235969 100755 --- a/checks/armor.test +++ b/checks/armor.test @@ -739,9 +739,14 @@ wg7Md81a5RI3F2FG8747t9gX # armor filter gpg swalled the CRC line and passed the '-----END...' # line on to the decryption layer. -# Can only perform this test if we have Twofish +# Can only perform this test if we have Twofish. We also can't use it +# if we have SELinux support, because that will fail on secret key +# import. -if $GPG --with-colons --list-config ciphername | grep TWOFISH > /dev/null 2>/dev/null ; then +if test x$enable_selinux_hacks = xyes ; then + echo "SELinux support is enabled: skipping secret key import check" +else + if $GPG --with-colons --list-config ciphername | grep TWOFISH > /dev/null 2>/dev/null ; then i=alpha_seckey info "importing: $i" eval "(IFS=; echo \"\$$i\")" >x @@ -755,4 +760,5 @@ if $GPG --with-colons --list-config ciphername | grep TWOFISH > /dev/null 2>/dev else error "bug#1179 is back in town" fi + fi fi |