diff options
-rw-r--r-- | etc/uanytun/client1/config | 3 | ||||
-rw-r--r-- | etc/uanytun/client2/config | 3 | ||||
-rw-r--r-- | etc/uanytun/client3/config | 3 | ||||
-rw-r--r-- | etc/uanytun/p2p-a/config | 3 | ||||
-rw-r--r-- | etc/uanytun/p2p-b/config | 3 | ||||
-rw-r--r-- | openwrt/kamikaze/uanytun/files/uanytun.config | 6 | ||||
-rw-r--r-- | src/options.c | 4 |
7 files changed, 24 insertions, 1 deletions
diff --git a/etc/uanytun/client1/config b/etc/uanytun/client1/config index b6b417d..03b0207 100644 --- a/etc/uanytun/client1/config +++ b/etc/uanytun/client1/config @@ -22,6 +22,9 @@ cipher aes-ctr #auth-algo null auth-algo sha1 +##message auth tag length +#auth-tag-length 10 + ## Passphrase ## this is used to generate the crypto-key and salt ## this should be al least 30 characters diff --git a/etc/uanytun/client2/config b/etc/uanytun/client2/config index 0a62e07..f84bf87 100644 --- a/etc/uanytun/client2/config +++ b/etc/uanytun/client2/config @@ -22,6 +22,9 @@ cipher aes-ctr #auth-algo null auth-algo sha1 +##message auth tag length +#auth-tag-length 10 + ## Passphrase ## this is used to generate the crypto-key and salt ## this should be al least 30 characters diff --git a/etc/uanytun/client3/config b/etc/uanytun/client3/config index e386210..ba6e35c 100644 --- a/etc/uanytun/client3/config +++ b/etc/uanytun/client3/config @@ -22,6 +22,9 @@ cipher aes-ctr #auth-algo null auth-algo sha1 +##message auth tag length +#auth-tag-length 10 + ## Passphrase ## this is used to generate the crypto-key and salt ## this should be al least 30 characters diff --git a/etc/uanytun/p2p-a/config b/etc/uanytun/p2p-a/config index 07eb51b..5523ef3 100644 --- a/etc/uanytun/p2p-a/config +++ b/etc/uanytun/p2p-a/config @@ -22,6 +22,9 @@ cipher aes-ctr #auth-algo null auth-algo sha1 +##message auth tag length +#auth-tag-length 10 + ## Passphrase ## this is used to generate the crypto-key and salt ## this should be al least 30 characters diff --git a/etc/uanytun/p2p-b/config b/etc/uanytun/p2p-b/config index aefcf10..5ffe2c9 100644 --- a/etc/uanytun/p2p-b/config +++ b/etc/uanytun/p2p-b/config @@ -22,6 +22,9 @@ cipher aes-ctr #auth-algo null auth-algo sha1 +##message auth tag length +#auth-tag-length 10 + ## Passphrase ## this is used to generate the crypto-key and salt ## this should be al least 30 characters diff --git a/openwrt/kamikaze/uanytun/files/uanytun.config b/openwrt/kamikaze/uanytun/files/uanytun.config index 423e7a3..199db76 100644 --- a/openwrt/kamikaze/uanytun/files/uanytun.config +++ b/openwrt/kamikaze/uanytun/files/uanytun.config @@ -15,6 +15,7 @@ config "client1" # option cipher 'aes-ctr-256' option auth_algo 'sha1' # option auth_algo 'null' +# option auth_tag_length 10 # option dev 'anytun0' option type 'tun' @@ -27,6 +28,7 @@ config "client1" option window_size 0 option mux 1 + option role 'client' # option kd_prf 'null' # option kd_prf 'aes-ctr' # option kd_prf 'aes-ctr-128' @@ -55,6 +57,7 @@ config "client2" option window_size 0 option mux 2 + option role 'client' option passphrase 'Creating_VPN_Tunnels_With_Anytun_Is_Easy' option log 'syslog:3,anytun-client2,daemon' @@ -75,6 +78,7 @@ config "client3" option window_size 0 option mux 3 + option role 'client' option passphrase 'Creating_VPN_Tunnels_With_Anytun_Is_Easy' option log 'syslog:3,anytun-client3,daemon' @@ -94,6 +98,7 @@ config "p2p-a" option remote_port '4444' option window_size 0 + option role 'alice' option passphrase 'Creating_P2P_VPN_Tunnels_With_Anytun_Is_Easy' option log 'syslog:3,anytun-p2p-a,daemon' @@ -113,6 +118,7 @@ config "p2p-b" option remote_port '4444' option window_size 0 + option role 'bob' option passphrase 'Creating_P2P_VPN_Tunnels_With_Anytun_Is_Easy' option log 'syslog:3,anytun-p2p-b,daemon' diff --git a/src/options.c b/src/options.c index e4112e0..f985fc8 100644 --- a/src/options.c +++ b/src/options.c @@ -320,6 +320,9 @@ void options_parse_post(options_t* opt) } #endif + if(opt->anytun02_compat_) + log_printf(WARNING, "--anytun02-compat is deprecated and very likly to be removed by the next release"); + if(!(opt->dev_name_) && !(opt->dev_type_)) opt->dev_type_ = strdup("tun"); } @@ -443,7 +446,6 @@ void options_print_usage() printf(" [-w|--window-size] <window size> seqence number window size\n"); #ifndef NO_CRYPT printf(" [-k|--kd-prf] <kd-prf type> key derivation pseudo random function\n"); - printf(" [-O|--anytun02-compat] enable compatiblity mode for anytun 0.2.x and prior\n"); #ifndef NO_PASSPHRASE printf(" [-E|--passphrase] <pass phrase> a passprhase to generate master key and salt from\n"); #endif |