206 Commits

Author SHA1 Message Date
Franck Joncourt
bb90a8bf75 Fixed gcc warnings on openbsd. - mrash/fwknop#60 2013-05-14 22:08:44 +02:00
Franck Joncourt
9dbb62ae1e Merge remote-tracking branch 'upstream/master' 2013-05-13 16:30:27 +02:00
Michael Rash
c555a35489 [client] set ctx=NULL after fko_destroy() calls 2013-05-12 20:54:04 -04:00
Franck Joncourt
160c21d6b6 Rewrite enc_mode_inttostr() and enc_mode_strtoint().
Make sure both functions works the same way and refer to the same
encryption mode string.

Updated the fwknop usage message to display the encryption mode.
2013-05-12 16:52:52 +02:00
Michael Rash
add518016c [client] removed unnecessary array NULL check found by Coverity 2013-05-09 22:10:38 -04:00
Michael Rash
8c09d38941 various sizeof() usage and type bug fixes found by Coverity 2013-05-09 21:17:27 -04:00
Michael Rash
9f9bbcbcdd fixed several resource leak conditions found by Coverity 2013-05-09 17:15:58 -04:00
Michael Rash
8d980ae686 remove dead code caught by Coverity 2013-05-07 23:02:49 -04:00
Michael Rash
e1c6f04ef9 [client] fix missing 'break' in switch statement (discovered by Coverity) 2013-05-07 21:43:38 -04:00
Franck Joncourt
a9a143a85d Merge remote-tracking branch 'upstream/master' 2013-05-06 11:52:35 +02:00
Franck Joncourt
b3cbf1ecfa Replaced printf() by log_msg(). 2013-05-06 10:02:02 +02:00
Michael Rash
eb143db9a7 [client] added --get-hmac-key to mirror --get-key, closes #68 2013-05-05 21:54:07 -04:00
Michael Rash
83493a424c Merge branch 'master' of github.com:mrash/fwknop 2013-05-05 21:01:26 -04:00
Michael Rash
314cc3eb23 Merge remote-tracking branch 'origin/win32_fixes'
This fixes issue #69 thanks to Damien.
2013-05-05 20:59:04 -04:00
Damien S. Stuart
0363a2099a Regenerated the client and server manpage .in files from the asciidoc sources 2013-05-05 20:44:47 -04:00
Damien Stuart
c0c0941d55 Tweaked WIN32 conditional for using inet_ntoa instead of inet_ntop to apply only to versions below Vista (WINVER <= 0x0600) 2013-05-05 19:02:48 -04:00
Damien Stuart
b84415c33c Use inet_aton on Windows (Older windows versions do not have enet_ntop). 2013-05-05 16:37:18 -04:00
Franck Joncourt
327257ef5f Fixed command line arguments (key-base64-rijndael and key-base64-hmac).
The cmd_opts structure containing the command line args does not follow the
documentation. This update fix it.
2013-05-05 22:03:21 +02:00
Franck Joncourt
17a105fd8a Added GPG_SIGNER and GPG_RECIPIENT to the list of important variables. 2013-05-05 21:43:31 +02:00
Franck Joncourt
b8145f6d7f Added --force-stanza command line arg to avoid prompting the user. 2013-05-05 21:13:26 +02:00
Damien Stuart
15d9c6197b Fixes to get hmac_support and 2.5 changes working for the Windows lib and client builds. 2013-05-05 13:20:20 -04:00
Michael Rash
3c3283992c (Franck Joncourt) patch to address sprintf() warnings for issue #60 2013-05-04 14:16:06 -04:00
Franck Joncourt
9d8d1de60d Ask the user whether he wants to overwrite a variable in the updated rc file or not. 2013-05-04 17:02:02 +02:00
Franck Joncourt
f217506234 Fixed names of function for better understanding. 2013-05-04 15:33:03 +02:00
Franck Joncourt
84768dda6f Continued implementing a way to not overwrite KEY.. variables with --save-rc-stanza
mrash/fwknop#67
2013-05-03 13:49:32 +02:00
Franck Joncourt
c71ce885be First attempt to not ovewrite some configuration variables with --save-rc-stanza.
At this time it only does not overwrite the KEY and HMAC variable without asking the user
what he wants to do.
2013-05-02 23:58:28 +02:00
Franck Joncourt
fca497f0d8 New tests for rc file processing (SPA_SOURCE_PORT, FW_TIMEOUT).
Added spa source port variable to dump_transmit_options() and renamed port
to destination port.
2013-05-01 15:29:17 +02:00
Franck Joncourt
209c0f16da Protocol string is set has const char in fko_protocol_t. 2013-05-01 14:33:35 +02:00
Franck Joncourt
d93648cf99 Moved/Created proto_intostr() and proto_strtoint() to utils.c.
This allows to update dump_transmit_options() to use the log module to dump data.
2013-04-30 22:22:03 +02:00
Franck Joncourt
10a4e1f675 Updated the TParam typedef to conform to the fko_cli_options_t typedef. 2013-04-30 15:37:08 +02:00
Franck Joncourt
2110790a30 Added new rc file processing tests for the SPA_SERVER_PORT. 2013-04-30 13:54:58 +02:00
Michael Rash
90175250e5 [client] add USE_HMAC handling to parse_rc_param() 2013-04-29 22:14:39 -04:00
Michael Rash
df5066447d Started on --save-rc-stanza tests, client bug fix for HMAC verification in --test mode 2013-04-29 21:43:21 -04:00
Franck Joncourt
36202d8c66 Merge remote-tracking branch 'upstream/master' 2013-04-29 22:21:18 +02:00
Franck Joncourt
7a719389ca Integrated the log module in the whol client source code.
perror() is also replaced by log_msg()
2013-04-29 22:18:29 +02:00
Michael Rash
b719c06769 [client] ensure to set HMAC mode by default only when an HMAC key is used 2013-04-28 21:51:16 -04:00
Michael Rash
dd05975217 Merge remote-tracking branch 'fjoncourt/master'
This merges changes from Franck Joncourt for issues #55 (log module for fwknop)
and #64 (hostname resolution not working for -P icmp spoofing).
2013-04-27 22:26:38 -04:00
Michael Rash
12a6e9e93a Convert most strlcat() calls to use destination bound from sizeof()
This commit helps to ensure correctness of strlcat() calls in support of fixing
issue #2.
2013-04-27 20:41:12 -04:00
Franck Joncourt
b04de687ce Fixed hostname resolution while spoof ip is used.
mrash/fwknop#64
2013-04-27 23:31:40 +02:00
Franck Joncourt
6063679c6d Continue implementing the log_msg module. 2013-04-27 22:19:40 +02:00
Michael Rash
b3f55bf1ab Convert most strlcpy() calls to use destination bound from sizeof()
This commit helps to ensure correctness of strlcpy() calls in support of fixing
issue #2.
2013-04-27 15:08:11 -04:00
Franck Joncourt
2396193e06 Replaced all references to *fprintf(stderr,* by log_msg() in config_init.c 2013-04-26 17:16:05 +02:00
Franck Joncourt
65d0517a9c Inverted log level enumeration 2013-04-26 16:18:08 +02:00
Franck Joncourt
bb70a9752f Ajout du module log_msg pour le client 2013-04-26 14:08:25 +02:00
Franck Joncourt
bf889f7b6e Used args enumeration for both the update_rc() and add_rc_param().
Updated fwknop client to refer to the fwknop args enumeration rather
than the config variable names directly. This should make easier to
handle future changes of the variable name.

New function to validate a string matches a YES pattern in the configuration
file : is_yes_str().

The parse_rc_param() only returns at the end of the function, unless a fatal
error has been encountered.
2013-04-25 23:03:02 +02:00
Michael Rash
f0036f7f22 [client] set HMAC mode whenever any HMAC option is given, add --key-hmac arg 2013-04-20 11:12:04 -04:00
Michael Rash
87fc50bb31 Merge remote-tracking branch 'fjoncourt/hmac_support' into hmac_support
This commit from Franck Joncourt closes #43
2013-04-12 21:16:20 -04:00
Franck Joncourt
fbd38d805b Added some else statements and their comments. 2013-04-12 14:48:26 +02:00
Michael Rash
c112cb4811 [test suite] get hmac iptables duplicated and sha512 long key tests to pass 2013-04-10 23:31:58 -04:00
Franck Joncourt
fd767a1f47 Resolve ip address in all of tha nat modes (mrash/fwknop#43). 2013-04-10 16:06:06 +02:00