Эх сурвалжийг харах

Merge pull request #309 from moatazelmasry2/openvpn-extend-ciphers

Openvpn extend ciphers
Daiyuu Nobori 8 жил өмнө
parent
commit
2241b9a366

+ 2 - 1
src/Cedar/Interop_OpenVPN.h

@@ -152,7 +152,8 @@
 #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"
+#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"

+ 1 - 1
src/bin/hamcore/openvpn_sample.ovpn

@@ -82,7 +82,7 @@ $TAG_BEFORE_REMOTE$remote $TAG_HOSTNAME$ $TAG_PORT$
 # The supported algorithms are as follows:
 #  cipher: [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
+#          RC2-40-CBC RC2-64-CBC RC2-CBC CAMELLIA-128-CBC CAMELLIA-192-CBC CAMELLIA-256-CBC
 #  auth:   SHA SHA1 SHA256 SHA384 SHA512 MD5 MD4 RMD160
 
 cipher AES-128-CBC