Merge d91ba0feab into ebe2a22bb8
This commit is contained in:
commit
f2063b0bc9
1 changed files with 16 additions and 8 deletions
|
|
@ -439,8 +439,9 @@ else
|
||||||
elif [[ "$CERT_TYPE" = '2' ]]; then
|
elif [[ "$CERT_TYPE" = '2' ]]; then
|
||||||
echo " 1) ECDHE-RSA-AES-256-GCM-SHA384 (recommended)"
|
echo " 1) ECDHE-RSA-AES-256-GCM-SHA384 (recommended)"
|
||||||
echo " 2) ECDHE-RSA-AES-128-GCM-SHA256"
|
echo " 2) ECDHE-RSA-AES-128-GCM-SHA256"
|
||||||
while [[ $CC_ENC != "1" && $CC_ENC != "2" ]]; do
|
echo " 3) DHE-RSA-AES-128-GCM-SHA256"
|
||||||
read -p "Control channel cipher [1-2]: " -e -i 1 CC_ENC
|
while [[ $CC_ENC != "1" && $CC_ENC != "2" && $CC_ENC != "3" ]]; do
|
||||||
|
read -p "Control channel cipher [1-3]: " -e -i 1 CC_ENC
|
||||||
done
|
done
|
||||||
case $CC_ENC in
|
case $CC_ENC in
|
||||||
1)
|
1)
|
||||||
|
|
@ -449,6 +450,9 @@ else
|
||||||
2)
|
2)
|
||||||
CC_ENC="TLS-ECDHE-RSA-WITH-AES-128-GCM-SHA256"
|
CC_ENC="TLS-ECDHE-RSA-WITH-AES-128-GCM-SHA256"
|
||||||
;;
|
;;
|
||||||
|
3)
|
||||||
|
CC_ENC="TLS-DHE-RSA-WITH-AES-128-GCM-SHA256"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
echo ""
|
echo ""
|
||||||
|
|
@ -467,20 +471,24 @@ else
|
||||||
echo "Choose which message digest algorithm you want to use for the data channel packets"
|
echo "Choose which message digest algorithm you want to use for the data channel packets"
|
||||||
echo "and the tls-auth/tls-crypt control channel packets:"
|
echo "and the tls-auth/tls-crypt control channel packets:"
|
||||||
fi
|
fi
|
||||||
echo " 1) SHA-256"
|
echo " 1) SHA-224"
|
||||||
echo " 2) SHA-384 (recommended)"
|
echo " 2) SHA-256"
|
||||||
echo " 3) SHA-512"
|
echo " 3) SHA-384 (recommended)"
|
||||||
while [[ $HMAC_AUTH != "1" && $HMAC_AUTH != "2" && $HMAC_AUTH != "3" ]]; do
|
echo " 4) SHA-512"
|
||||||
|
while [[ $HMAC_AUTH != "1" && $HMAC_AUTH != "2" && $HMAC_AUTH != "3" && $HMAC_AUTH != "4" ]]; do
|
||||||
read -p "HMAC authentication algorithm [1-3]: " -e -i 2 HMAC_AUTH
|
read -p "HMAC authentication algorithm [1-3]: " -e -i 2 HMAC_AUTH
|
||||||
done
|
done
|
||||||
case $HMAC_AUTH in
|
case $HMAC_AUTH in
|
||||||
1)
|
1)
|
||||||
HMAC_AUTH="SHA256"
|
HMAC_AUTH="SHA224"
|
||||||
;;
|
;;
|
||||||
2)
|
2)
|
||||||
HMAC_AUTH="SHA384"
|
HMAC_AUTH="SHA256"
|
||||||
;;
|
;;
|
||||||
3)
|
3)
|
||||||
|
HMAC_AUTH="SHA384"
|
||||||
|
;;
|
||||||
|
4)
|
||||||
HMAC_AUTH="SHA512"
|
HMAC_AUTH="SHA512"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue