1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-10 03:30:39 +03:00

Merge branch 'develop'

This commit is contained in:
Gregory Norton 2014-12-31 11:21:33 -06:00
commit b227a57b44
2 changed files with 5 additions and 1 deletions

4
.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
bin/*
tmp/*
src/bin/BuiltHamcoreFiles/*
Makefile

View File

@ -233,7 +233,7 @@ static COUNTER *getip_thread_counter = NULL;
static UINT max_getip_thread = 0;
static char *cipher_list = "RC4-MD5 RC4-SHA AES128-SHA AES256-SHA DES-CBC-SHA DES-CBC3-SHA DHE-RSA-AES128-SHA DHE-RSA-AES256-SHA";
static char *cipher_list = "TLSv1+HIGH:!SSLv2:RC4+MEDIUM:!aNULL:!eNULL:!3DES:@STRENGTH";
static LIST *ip_clients = NULL;
static LIST *local_mac_list = NULL;