DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Merge branch 'hmac_support' of github.com:mrash/fwknop into hmac_support

Browse Source
This commit is contained in:
Damien Stuart
2013-03-02 17:08:55 -05:00
parent 6ecf81b16e 839cc41603
commit c1baa7e12f
6 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CREDITS
+1 -1
View File
@@ -94,7 +94,7 @@ Vlad Glagolev
Sean Greven
- Created a port of fwknop for FreeBSD:
http://portsmon.freebsd.org/portoverview.py?category=security&portname=fwknop
http://portsmon.freebsd.org/portoverview.py?category=security&portname=fwknop
Michael T. Dean
- Reported the Rijndael key truncation issue for user-supplied keys
Makefile.am
+3
View File
@@ -178,6 +178,9 @@ EXTRA_DIST = \
test/conf/tcp_pcap_filter_fwknopd.conf \
test/conf/tcp_server_fwknopd.conf \
test/conf/spa_replay.pcap \
test/fko-wrapper/Makefile \
test/fko-wrapper/fko_wrapper.c \
test/fko-wrapper/run_valgrind.sh \
test/fuzzing/patches/enable_perl_fko_bogus_packets.patch \
test/fuzzing/patches/encoding_append_b64_modified_byte_eq.patch \
test/fuzzing/patches/encoding_append_b64_modified_byte.patch \
server/fw_util_ipf.c
-9
View File
@@ -121,9 +121,6 @@ process_spa_request(const fko_srv_options_t *opts, const acc_stanza_t *acc, spa_
acc_port_list_t *port_list = NULL;
acc_port_list_t *ple;
unsigned int fst_proto;
unsigned int fst_port;
int res = 0;
time_t now;
unsigned int exp_ts;
@@ -136,12 +133,6 @@ process_spa_request(const fko_srv_options_t *opts, const acc_stanza_t *acc, spa_
*/
ple = port_list;
/* Remember the first proto/port combo in case we need them
* for NAT access requests.
*/
fst_proto = ple->proto;
fst_port = ple->port;
/* Set our expire time value.
*/
time(&now);
server/fw_util_ipfw.c
-9
View File
@@ -478,9 +478,6 @@ process_spa_request(const fko_srv_options_t * const opts,
acc_port_list_t *port_list = NULL;
acc_port_list_t *ple;
unsigned int fst_proto;
unsigned int fst_port;
int res = 0;
time_t now;
unsigned int exp_ts;
@@ -493,12 +490,6 @@ process_spa_request(const fko_srv_options_t * const opts,
*/
ple = port_list;
/* Remember the first proto/port combo in case we need them
* for NAT access requests.
*/
fst_proto = ple->proto;
fst_port = ple->port;
/* Set our expire time value.
*/
time(&now);
server/fw_util_pf.c
-9
View File
@@ -202,9 +202,6 @@ process_spa_request(const fko_srv_options_t * const opts,
acc_port_list_t *port_list = NULL;
acc_port_list_t *ple;
unsigned int fst_proto;
unsigned int fst_port;
int res = 0;
time_t now;
unsigned int exp_ts;
@@ -217,12 +214,6 @@ process_spa_request(const fko_srv_options_t * const opts,
*/
ple = port_list;
/* Remember the first proto/port combo in case we need them
* for NAT access requests.
*/
fst_proto = ple->proto;
fst_port = ple->port;
/* Set our expire time value.
*/
time(&now);
test/fko-wrapper/fko_wrapper.c
+5
View File
@@ -65,6 +65,11 @@ int main(void) {
fko_set_spa_encryption_type(ctx, FKO_ENCRYPTION_RIJNDAEL));
}
for (i=0; i<FCN_CALLS; i++) {
printf("fko_set_spa_encryption_mode(FKO_ENC_MODE_CBC): %d\n",
fko_set_spa_encryption_mode(ctx, FKO_ENC_MODE_CBC));
}
if (ENABLE_GPG_TESTS) {
for (i=0; i<FCN_CALLS; i++) {
printf("fko_set_spa_encryption_type(FKO_ENCRYPTION_GPG): %d\n",