install/openvpn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explizit set cipher, default to 'cipher BF-CBC'.

Browse Source
This commit is contained in:
Christoph 2018-08-23 16:54:32 +02:00
parent 959b28cf2f
commit 851d476bfd
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_key-pass.sh
View File

@ -520,9 +520,15 @@ cat << EOF >> "$_client_conf_file" 2> $log_file
EOF EOF
if [[ -n "$SERVER_CIPHER" ]]; then if [[ -n "$SERVER_CIPHER" ]]; then
if [[ "${SERVER_CIPHER,,}" = "none" ]]; then
cat <<EOF >> "$_client_conf_file" 2>> "$log_file"
cipher BF-CBC
EOF
else
cat <<EOF >> "$_client_conf_file" 2>> "$log_file" cat <<EOF >> "$_client_conf_file" 2>> "$log_file"
cipher $SERVER_CIPHER cipher $SERVER_CIPHER
EOF EOF
fi
else else
cat <<EOF >> "$_client_conf_file" 2>> "$log_file" cat <<EOF >> "$_client_conf_file" 2>> "$log_file"
cipher BF-CBC cipher BF-CBC

1
create_key_config.sh
View File

@ -180,6 +180,7 @@ fi
[[ "${SERVER_CIPHER,,}" = "none" ]] && SERVER_CIPHER="BF-CBC" [[ "${SERVER_CIPHER,,}" = "none" ]] && SERVER_CIPHER="BF-CBC"
[[ "${SERVER_CIPHER,,}" = "" ]] && SERVER_CIPHER="BF-CBC"
if [[ -z "$LZO_COMPRESSION" ]]; then if [[ -z "$LZO_COMPRESSION" ]]; then
LZO_COMPRESSION=true LZO_COMPRESSION=true
elif $LZO_COMPRESSION ; then elif $LZO_COMPRESSION ; then

13
install_openvpn.sh
View File

@ -181,7 +181,7 @@ DEFAULT_KEY_EMAIL='argus@oopen.de'
DEFAULT_KEY_ORG='o.open' DEFAULT_KEY_ORG='o.open'
DEFAULT_KEY_OU="Network Services" DEFAULT_KEY_OU="Network Services"
DEFAULT_SERVER_CIPHER="None" DEFAULT_SERVER_CIPHER="BF-CBC"
#DEFAULT_SERVER_CIPHER="AES-256-CBC" #DEFAULT_SERVER_CIPHER="AES-256-CBC"
@ -498,7 +498,7 @@ if [[ "X$SERVER_CIPHER" = "X" ]]; then
SERVER_CIPHER="$DEFAULT_SERVER_CIPHER" SERVER_CIPHER="$DEFAULT_SERVER_CIPHER"
fi fi
if [[ "$(trim ${SERVER_CIPHER,,})" = none ]]; then if [[ "$(trim ${SERVER_CIPHER,,})" = none ]]; then
SERVER_CIPHER="" SERVER_CIPHER="$DEFAULT_SERVER_CIPHER"
fi fi
echo "" echo ""
@ -856,13 +856,20 @@ EOF
fi fi
if [[ -n "$SERVER_CIPHER" ]] ; then if [[ -n "$SERVER_CIPHER" ]] ; then
if [[ "${SERVER_CIPHER,,}" = "none" ]]; then
cat <<EOF >> "$_client_conf_file" 2>> "$log_file"
cipher BF-CBC
EOF
else
cat << EOF >> $_openvpn_name_conf_file 2> $log_file cat << EOF >> $_openvpn_name_conf_file 2> $log_file
SERVER_CIPHER="$SERVER_CIPHER" SERVER_CIPHER="$SERVER_CIPHER"
EOF EOF
fi
else else
cat << EOF >> $_openvpn_name_conf_file 2> $log_file cat << EOF >> $_openvpn_name_conf_file 2> $log_file
SERVER_CIPHER="none" SERVER_CIPHER="$DEFAULT_SERVER_CIPHER"
EOF EOF
fi fi