From: Michael Rash <mbr@cipherdyne.org>
Date: Sat, 23 Jun 2012 19:13:03 +0000 (-0400)
Subject: Bug fix to not force asymmetric gpg decryption
X-Git-Tag: fwknop-2.5-pre1~273
X-Git-Url: http://www.cipherdyne.com/cgi-bin/gitweb.cgi?p=fwknop.git;a=commitdiff_plain;h=adbc6a8f39e43bed7adc29949ed3c56d06cbefb0

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.
---

diff --git a/server/access.c b/server/access.c
index 67ceb3e..14eaa73 100644
--- a/server/access.c
+++ b/server/access.c
@@ -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]);
         }
diff --git a/server/incoming_spa.c b/server/incoming_spa.c
index 922b120..2383219 100644
--- a/server/incoming_spa.c
+++ b/server/incoming_spa.c
@@ -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)
             {