Project

General

Profile

« Previous | Next » 

Revision 8698f918

Added by Vito Piserchia over 6 years ago

Added tlsauth keydir options to openvpn client and server

View differences:

src/etc/inc/openvpn.inc
499 499
	return $digest;
500 500
}
501 501

  
502
function openvpn_get_keydirlist() {
503
	$keydirs = array(
504
		''  => gettext('Use default direction'),
505
		'0' => gettext('Direction 0'),
506
		'1' => gettext('Direction 1'),
507
		'2' => gettext('No keydir direction'),
508
	);
509
	return $keydirs;
510
}
511

  
502 512
function openvpn_get_engines() {
503 513
	$openssl_engines = array('none' => gettext('No Hardware Crypto Acceleration'));
504 514
	exec("/usr/bin/openssl engine -t -c", $openssl_engine_output);
......
1188 1198
				} else {
1189 1199
					$tls_directive = "tls-auth";
1190 1200
					if ($mode == "server") {
1191
						$tlsopt = 0;
1201
						switch($settings['tlsauth_keydir']){
1202
							case '1':
1203
								$tlsopt = 1;
1204
								break;
1205
							case '2':
1206
								$tlsopt = '';
1207
								break;
1208
							case '':
1209
							case '0':
1210
							default:
1211
								$tlsopt = 0;
1212
								break;
1213
						}
1192 1214
					} else {
1193
						$tlsopt = 1;
1215
						switch($settings['tlsauth_keydir']){
1216
							case '0':
1217
								$tlsopt = 0;
1218
								break;
1219
							case '2':
1220
								$tlsopt = '';
1221
								break;
1222
							case '':
1223
							case '1':
1224
							default:
1225
								$tlsopt = 1;
1226
								break;
1227
						}
1194 1228
					}
1195 1229
				}
1196 1230
				openvpn_add_keyfile($settings['tls'], $conf, $mode_id, $tls_directive, $tlsopt);

Also available in: Unified diff