Merge remote-tracking branch 'fjoncourt/hmac_support' into hmac_support
authorMichael Rash <mbr@cipherdyne.org>
Mon, 18 Mar 2013 01:34:23 +0000 (21:34 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Mon, 18 Mar 2013 01:34:23 +0000 (21:34 -0400)
commitc7b5611fa4947f4d0dd0086b140e6390d0db6d43
treecd289e7fa1bea0cc5367e0572584a0ad9e763d19
parent7e784df3870373f055a2f0f8d818829501bcb1c0
parentb9046df64de2472fa59a318a99f86b6ef2eaa78e
Merge remote-tracking branch 'fjoncourt/hmac_support' into hmac_support

Significant merge from Franck Joncourt to add the ability to save command line
args to ~/.fwknoprc stanzas.  This merge is in support of #4.

Conflicts:
lib/fko_util.c
lib/fko_util.h
Makefile.am
client/cmd_opts.h
client/config_init.c
client/fwknop.c
client/fwknop_common.h
lib/fko_util.c
lib/fko_util.h
server/utils.c