Bug fix to not force asymmetric gpg decryption
fwknopd access stanzas can have both Rijndael and GnuPG keys, so this commit fixes a bug where any gpg info would force only gpg decryption attempts even if a Rijndael key is provided in the stanza.
This commit is contained in:
@@ -727,7 +727,6 @@ set_acc_defaults(fko_srv_options_t *opts)
|
||||
*/
|
||||
if(acc->gpg_decrypt_pw != NULL)
|
||||
{
|
||||
acc->encryption_mode = FKO_ENC_MODE_ASYMMETRIC;
|
||||
if(acc->gpg_home_dir == NULL)
|
||||
add_acc_string(&(acc->gpg_home_dir), opts->config[CONF_GPG_HOME_DIR]);
|
||||
}
|
||||
|
||||
@@ -257,7 +257,7 @@ incoming_spa(fko_srv_options_t *opts)
|
||||
else if(enc_type == FKO_ENCRYPTION_GPG)
|
||||
{
|
||||
/* For GPG we create the new context without decrypting on the fly
|
||||
* so we can set some GPG parameters first.
|
||||
* so we can set some GPG parameters first.
|
||||
*/
|
||||
if(acc->gpg_decrypt_pw != NULL)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user