compat.sh refectoring: regroup argument setting
This commit is contained in:
Manuel Pégourié-Gonnard
parent
e2ce2112ac
commit
d941a796be
@ -84,23 +84,49 @@ filter()
|
|||||||
echo "$NEW_LIST"
|
echo "$NEW_LIST"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setup_arguments()
|
||||||
|
{
|
||||||
|
if [ "X$VERIFY" = "XYES" ];
|
||||||
|
then
|
||||||
|
P_SERVER_BASE="ca_file=data_files/test-ca_cat12.crt auth_mode=required"
|
||||||
|
P_CLIENT_BASE="ca_file=data_files/test-ca_cat12.crt"
|
||||||
|
O_SERVER_BASE="-CAfile data_files/test-ca_cat12.crt -Verify 10"
|
||||||
|
O_CLIENT_BASE="-CAfile data_files/test-ca_cat12.crt"
|
||||||
|
else
|
||||||
|
P_SERVER_BASE=""
|
||||||
|
P_CLIENT_BASE=""
|
||||||
|
O_SERVER_BASE=""
|
||||||
|
O_CLIENT_BASE=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
case $TYPE in
|
||||||
|
"ECDSA")
|
||||||
|
P_SERVER_ARGS="$P_SERVER_BASE crt_file=data_files/server5.crt key_file=data_files/server5.key"
|
||||||
|
P_CLIENT_ARGS="$P_CLIENT_BASE crt_file=data_files/server6.crt key_file=data_files/server6.key"
|
||||||
|
O_SERVER_ARGS="$O_SERVER_BASE -cert data_files/server5.crt -key data_files/server5.key"
|
||||||
|
O_CLIENT_ARGS="$O_CLIENT_BASE -cert data_files/server6.crt -key data_files/server6.key"
|
||||||
|
;;
|
||||||
|
|
||||||
|
"RSA")
|
||||||
|
P_SERVER_ARGS="$P_SERVER_BASE crt_file=data_files/server1.crt key_file=data_files/server1.key"
|
||||||
|
P_CLIENT_ARGS="$P_CLIENT_BASE crt_file=data_files/server2.crt key_file=data_files/server2.key"
|
||||||
|
O_SERVER_ARGS="$O_SERVER_BASE -cert data_files/server1.crt -key data_files/server1.key"
|
||||||
|
O_CLIENT_ARGS="$O_CLIENT_BASE -cert data_files/server2.crt -key data_files/server2.key"
|
||||||
|
;;
|
||||||
|
|
||||||
|
"PSK")
|
||||||
|
P_SERVER_ARGS="$P_SERVER_BASE psk=6162636465666768696a6b6c6d6e6f70"
|
||||||
|
P_CLIENT_ARGS="$P_CLIENT_BASE psk=6162636465666768696a6b6c6d6e6f70"
|
||||||
|
# openssl s_server won't start without certificates...
|
||||||
|
O_SERVER_ARGS="$O_SERVER_BASE -psk 6162636465666768696a6b6c6d6e6f70 -cert data_files/server1.crt -key data_files/server1.key"
|
||||||
|
O_CLIENT_ARGS="$O_CLIENT_BASE -psk 6162636465666768696a6b6c6d6e6f70"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
for VERIFY in $VERIFIES;
|
for VERIFY in $VERIFIES;
|
||||||
do
|
do
|
||||||
|
|
||||||
if [ "X$VERIFY" = "XYES" ];
|
|
||||||
then
|
|
||||||
P_SERVER_BASE="ca_file=data_files/test-ca_cat12.crt auth_mode=required"
|
|
||||||
P_CLIENT_BASE="ca_file=data_files/test-ca_cat12.crt"
|
|
||||||
O_SERVER_BASE="-CAfile data_files/test-ca_cat12.crt -Verify 10"
|
|
||||||
O_CLIENT_BASE="-CAfile data_files/test-ca_cat12.crt"
|
|
||||||
else
|
|
||||||
P_SERVER_BASE=""
|
|
||||||
P_CLIENT_BASE=""
|
|
||||||
O_SERVER_BASE=""
|
|
||||||
O_CLIENT_BASE=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
for MODE in $MODES;
|
for MODE in $MODES;
|
||||||
do
|
do
|
||||||
|
|
||||||
@ -120,6 +146,8 @@ echo "-----------"
|
|||||||
for TYPE in $TYPES;
|
for TYPE in $TYPES;
|
||||||
do
|
do
|
||||||
|
|
||||||
|
setup_arguments
|
||||||
|
|
||||||
P_CIPHERS=""
|
P_CIPHERS=""
|
||||||
O_CIPHERS=""
|
O_CIPHERS=""
|
||||||
|
|
||||||
@ -127,11 +155,6 @@ case $TYPE in
|
|||||||
|
|
||||||
"ECDSA")
|
"ECDSA")
|
||||||
|
|
||||||
P_SERVER_ARGS="$P_SERVER_BASE crt_file=data_files/server5.crt key_file=data_files/server5.key"
|
|
||||||
P_CLIENT_ARGS="$P_CLIENT_BASE crt_file=data_files/server6.crt key_file=data_files/server6.key"
|
|
||||||
O_SERVER_ARGS="$O_SERVER_BASE -cert data_files/server5.crt -key data_files/server5.key"
|
|
||||||
O_CLIENT_ARGS="$O_CLIENT_BASE -cert data_files/server6.crt -key data_files/server6.key"
|
|
||||||
|
|
||||||
if [ "$MODE" != "ssl3" ];
|
if [ "$MODE" != "ssl3" ];
|
||||||
then
|
then
|
||||||
P_CIPHERS="$P_CIPHERS \
|
P_CIPHERS="$P_CIPHERS \
|
||||||
@ -190,11 +213,6 @@ case $TYPE in
|
|||||||
|
|
||||||
"RSA")
|
"RSA")
|
||||||
|
|
||||||
P_SERVER_ARGS="$P_SERVER_BASE crt_file=data_files/server1.crt key_file=data_files/server1.key"
|
|
||||||
P_CLIENT_ARGS="$P_CLIENT_BASE crt_file=data_files/server2.crt key_file=data_files/server2.key"
|
|
||||||
O_SERVER_ARGS="$O_SERVER_BASE -cert data_files/server1.crt -key data_files/server1.key"
|
|
||||||
O_CLIENT_ARGS="$O_CLIENT_BASE -cert data_files/server2.crt -key data_files/server2.key"
|
|
||||||
|
|
||||||
P_CIPHERS="$P_CIPHERS \
|
P_CIPHERS="$P_CIPHERS \
|
||||||
TLS-DHE-RSA-WITH-AES-128-CBC-SHA \
|
TLS-DHE-RSA-WITH-AES-128-CBC-SHA \
|
||||||
TLS-DHE-RSA-WITH-AES-256-CBC-SHA \
|
TLS-DHE-RSA-WITH-AES-256-CBC-SHA \
|
||||||
@ -291,12 +309,6 @@ case $TYPE in
|
|||||||
|
|
||||||
"PSK")
|
"PSK")
|
||||||
|
|
||||||
P_SERVER_ARGS="$P_SERVER_BASE psk=6162636465666768696a6b6c6d6e6f70"
|
|
||||||
P_CLIENT_ARGS="$P_CLIENT_BASE psk=6162636465666768696a6b6c6d6e6f70"
|
|
||||||
# openssl s_server won't start without certificates...
|
|
||||||
O_SERVER_ARGS="$O_SERVER_BASE -psk 6162636465666768696a6b6c6d6e6f70 -cert data_files/server1.crt -key data_files/server1.key"
|
|
||||||
O_CLIENT_ARGS="$O_CLIENT_BASE -psk 6162636465666768696a6b6c6d6e6f70"
|
|
||||||
|
|
||||||
P_CIPHERS="$P_CIPHERS \
|
P_CIPHERS="$P_CIPHERS \
|
||||||
TLS-PSK-WITH-RC4-128-SHA \
|
TLS-PSK-WITH-RC4-128-SHA \
|
||||||
TLS-PSK-WITH-3DES-EDE-CBC-SHA \
|
TLS-PSK-WITH-3DES-EDE-CBC-SHA \
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user