Merge branch 'hmac_support' of github.com:mrash/fwknop into hmac_support
authorMichael Rash <mbr@cipherdyne.org>
Sun, 10 Mar 2013 18:32:07 +0000 (14:32 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Sun, 10 Mar 2013 18:32:07 +0000 (14:32 -0400)
commit7821e83dfc818b69ffe8ad867d9de42729ccd308
treee8a573330c5711697c20f68bc2d6f357a0df7193
parent22dde8eb351fb2ad01e0f6d532c787a19e1e44ae
parent6fa3be393c02dfd9725690a84900f519bfa7659f
Merge branch 'hmac_support' of github.com:mrash/fwknop into hmac_support

Conflicts:
client/fwknop.c
lib/fko_hmac.c
client/fwknop.c
lib/fko.h
lib/fko_funcs.c
lib/fko_hmac.c