AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00
Code Releases Activity

Merge PR #600: Interop_OpenVPN: remove lists of supported encryption and hash algorithms

Browse Source
This commit is contained in:
Davide Beatrici 2018-08-02 19:28:51 +02:00 committed by GitHub
commit dd5b84e28f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Cedar/Interop_OpenVPN.c
View File

@ -953,7 +953,7 @@ CIPHER *OvsGetCipher(char *name)
{ {
CIPHER *c = NULL; CIPHER *c = NULL;
if (IsEmptyStr(name) == false && IsStrInStrTokenList(OPENVPN_CIPHER_LIST, name, NULL, false)) if (IsEmptyStr(name) == false)
{ {
c = NewCipher(name); c = NewCipher(name);
} }
@ -971,7 +971,7 @@ MD *OvsGetMd(char *name)
{ {
MD *m = NULL; MD *m = NULL;
if (IsEmptyStr(name) == false && IsStrInStrTokenList(OPENVPN_MD_LIST, name, NULL, false)) if (IsEmptyStr(name) == false)
{ {
m = NewMd(name); m = NewMd(name);
} }

6
src/Cedar/Interop_OpenVPN.h
View File

@ -151,12 +151,6 @@
#define OPENVPN_IPC_POSTFIX_L2 "OPENVPN_L2" #define OPENVPN_IPC_POSTFIX_L2 "OPENVPN_L2"
#define OPENVPN_IPC_POSTFIX_L3 "OPENVPN_L3" #define OPENVPN_IPC_POSTFIX_L3 "OPENVPN_L3"
// List of supported encryption algorithms
#define OPENVPN_CIPHER_LIST "[NULL-CIPHER] NULL AES-128-CBC AES-192-CBC AES-256-CBC BF-CBC CAST-CBC CAST5-CBC DES-CBC DES-EDE-CBC DES-EDE3-CBC DESX-CBC RC2-40-CBC RC2-64-CBC RC2-CBC CAMELLIA-128-CBC CAMELLIA-192-CBC CAMELLIA-256-CBC"
// List of the supported hash algorithm
#define OPENVPN_MD_LIST "SHA SHA1 SHA256 SHA384 SHA512 MD5 MD4 RMD160"
// MTU // MTU
#define OPENVPN_MTU_LINK 1514 // Ethernet MTU #define OPENVPN_MTU_LINK 1514 // Ethernet MTU
#define OPENVPN_MTU_TUN 1500 // Tun MTU #define OPENVPN_MTU_TUN 1500 // Tun MTU

39
src/Mayaqua/Str.c
View File

@ -579,45 +579,6 @@ bool InStrList(char *target_str, char *tokens, char *splitter, bool case_sensiti
return ret; return ret;
} }
// Confirm whether the specified string is in the token list
bool IsStrInStrTokenList(char *str_list, char *str, char *split_chars, bool case_sensitive)
{
TOKEN_LIST *t;
bool ret = false;
UINT i;
// Validate arguments
if (str_list == NULL || str == NULL)
{
return false;
}
t = ParseTokenWithoutNullStr(str_list, split_chars);
if (t != NULL)
{
for (i = 0;i < t->NumTokens;i++)
{
if ((case_sensitive == false) && (StrCmpi(t->Token[i], str) == 0))
{
ret = true;
}
if ((case_sensitive) && (StrCmp(t->Token[i], str) == 0))
{
ret = true;
}
if (ret)
{
break;
}
}
FreeToken(t);
}
return ret;
}
// Cut out the token from string (Ignore blanks between delimiters) // Cut out the token from string (Ignore blanks between delimiters)
TOKEN_LIST *ParseTokenWithoutNullStr(char *str, char *split_chars) TOKEN_LIST *ParseTokenWithoutNullStr(char *str, char *split_chars)
{ {

1
src/Mayaqua/Str.h
View File

@ -244,7 +244,6 @@ void ToHex64(char *str, UINT64 value);
UINT HexToInt(char *str); UINT HexToInt(char *str);
UINT64 HexToInt64(char *str); UINT64 HexToInt64(char *str);
UINT SearchAsciiInBinary(void *data, UINT size, char *str, bool case_sensitive); UINT SearchAsciiInBinary(void *data, UINT size, char *str, bool case_sensitive);
bool IsStrInStrTokenList(char *str_list, char *str, char *split_chars, bool case_sensitive);
void IntListToStr(char *str, UINT str_size, LIST *o, char *separate_str); void IntListToStr(char *str, UINT str_size, LIST *o, char *separate_str);
LIST *StrToIntList(char *str, bool sorted); LIST *StrToIntList(char *str, bool sorted);
void NormalizeIntListStr(char *dst, UINT dst_size, char *src, bool sorted, char *separate_str); void NormalizeIntListStr(char *dst, UINT dst_size, char *src, bool sorted, char *separate_str);