DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

[libfko] Bug fix to not decrypt with GnuGP without FKO_ENC_MODE_ASYMMETRIC

Browse Source 
[libfko] Bug fix to not attempt SPA packet decryption with GnuPG without
an fko object with encryption_mode set to FKO_ENC_MODE_ASYMMETRIC.  This
bug was caught with valgrind validation against the perl FKO extension
together with the set of SPA fuzzing packets in
test/fuzzing/fuzzing_spa_packets.  Note that this bug cannot be
triggered via fwknopd because additional checks are made within fwknopd
itself to force FKO_ENC_MODE_ASYMMETRIC whenever an access.conf stanza
contains GPG key information.  This fix strengthens libfko itself to
independently require that the usage of fko objects without GPG key
information does not result in attempted GPG decryption operations.  Hence
this fix applies mostly to third party usage of libfko - i.e. stock
installations of fwknopd are not affected.  As always, it is recommended to
use HMAC authenticated encryption whenever possible even for GPG modes since
this also provides a work around even for libfko prior to this fix.
This commit is contained in:
Michael Rash 2013-11-25 23:11:01 -05:00
parent 6dd5ab8e35
commit be904769c4
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,7 +1,7 @@
fwknop-2.5.2 (//2013):
- (Radostan Riedel) Added an AppArmor policy that is known to work on
Debian and Ubuntu systems. The policy file is available in
extras/apparmor.
- (Radostan Riedel) Added an AppArmor policy for fwknopd that is known to
work on Debian and Ubuntu systems. The policy file is available at
extras/apparmor/usr.sbin/fwknopd.
- [libfko] Nikolay Kolev reported a build issue with Mac OS X Mavericks
where local fwknop copies of strlcat() and strlcpy() were conflicting
with those that already ship with OS X 10.9. Closes #108 on github.
@ -11,6 +11,15 @@ fwknop-2.5.2 (//2013):
slightly easier to parse by printing each FKO attribute on a single line
(this change affected the printing of the final SPA packet data). The
test suite has been updated to account for this change as well.
- [libfko] Bug fix to not attempt SPA packet decryption with GnuPG without
an fko object with encryption_mode set to FKO_ENC_MODE_ASYMMETRIC. This
bug was caught with valgrind validation against the perl FKO extension
together with the set of SPA fuzzing packets in
test/fuzzing/fuzzing_spa_packets. Note that this bug cannot be
triggered whenever HMAC protections are used, and even if an SPA packet
is sent through GnuPG operations, libgpgme should do the right thing.
However, as always, it is recommended to use HMAC authenticated
encryption whenever possible.
- [test suite] added --gdb-test to allow a previously executed fwknop
or fwknopd command to be sent through gdb with the same command line
args as the test suite used. This is for convenience to rapidly allow

3
lib/fko_encryption.c
View File

@ -605,7 +605,8 @@ fko_decrypt_spa_data(fko_ctx_t ctx, const char * const dec_key, const int key_le
*/
enc_type = fko_encryption_type(ctx->encrypted_msg);
if(enc_type == FKO_ENCRYPTION_GPG)
if(enc_type == FKO_ENCRYPTION_GPG
&& ctx->encryption_mode == FKO_ENC_MODE_ASYMMETRIC)
{
ctx->encryption_type = FKO_ENCRYPTION_GPG;
#if HAVE_LIBGPGME