From 0d096961b7a60b57947e3568a7d9ff78459c436a Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Thu, 2 Aug 2018 16:18:41 +0200 Subject: [PATCH] Interop_OpenVPN: remove lists of supported encryption and hash algorithms They are not required as OvsGetCipher() checks if the cipher is available and fallbacks to the default one in case it's not. --- src/Cedar/Interop_OpenVPN.c | 4 ++-- src/Cedar/Interop_OpenVPN.h | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Cedar/Interop_OpenVPN.c b/src/Cedar/Interop_OpenVPN.c index 9ebc1c33..284dfa9c 100644 --- a/src/Cedar/Interop_OpenVPN.c +++ b/src/Cedar/Interop_OpenVPN.c @@ -953,7 +953,7 @@ CIPHER *OvsGetCipher(char *name) { CIPHER *c = NULL; - if (IsEmptyStr(name) == false && IsStrInStrTokenList(OPENVPN_CIPHER_LIST, name, NULL, false)) + if (IsEmptyStr(name) == false) { c = NewCipher(name); } @@ -971,7 +971,7 @@ MD *OvsGetMd(char *name) { MD *m = NULL; - if (IsEmptyStr(name) == false && IsStrInStrTokenList(OPENVPN_MD_LIST, name, NULL, false)) + if (IsEmptyStr(name) == false) { m = NewMd(name); } diff --git a/src/Cedar/Interop_OpenVPN.h b/src/Cedar/Interop_OpenVPN.h index c31d3d24..6fdb007c 100644 --- a/src/Cedar/Interop_OpenVPN.h +++ b/src/Cedar/Interop_OpenVPN.h @@ -151,12 +151,6 @@ #define OPENVPN_IPC_POSTFIX_L2 "OPENVPN_L2" #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 #define OPENVPN_MTU_LINK 1514 // Ethernet MTU #define OPENVPN_MTU_TUN 1500 // Tun MTU