Project

General

Profile

« Previous | Next » 

Revision 3adc4134

Added by Jim Pingle over 4 years ago

Fix display of OpenVPN data cipher when NCP is disabled. Issue #10919

View differences:

src/etc/inc/openvpn.inc
2244 2244
	return false;
2245 2245
}
2246 2246

  
2247
function openvpn_build_data_cipher_list($data_ciphers = 'AES-256-GCM,AES-128-GCM,CHACHA20-POLY1305', $fallback_cipher = 'AES-256-GBC') {
2247
function openvpn_build_data_cipher_list($data_ciphers = 'AES-256-GCM,AES-128-GCM,CHACHA20-POLY1305', $fallback_cipher = 'AES-256-GBC', $ncp_enabled = true) {
2248 2248
	/* If the data_ciphers list is empty, populate it with the fallback cipher. */
2249
	if (empty($data_ciphers)) {
2249
	if (empty($data_ciphers) || !$ncp_enabled) {
2250 2250
		$data_ciphers = $fallback_cipher;
2251 2251
	}
2252 2252
	/* Add the fallback cipher to the data ciphers list if it isn't already present */

Also available in: Unified diff