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:
Michael Rash
2012-06-23 15:13:03 -04:00
parent c6a2680be2
commit adbc6a8f39
2 changed files with 1 additions and 2 deletions
-1
View File
@@ -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]);
}
+1 -1
View File
@@ -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)
{