fixed in Testing server preferences --> Negotiated cipher the empty TMPfile which led to an ugly error

fixed in Session Resumption  for tickets if no extension=no resumption: there was 1x LF too much
This commit is contained in:
Dirk 2017-04-24 19:18:39 +02:00
parent 7a99549e80
commit 8ea8513529
1 changed files with 1 additions and 8 deletions

View File

@ -4246,7 +4246,6 @@ read_dhbits_from_file() {
curve="$what_dh" curve="$what_dh"
what_dh="ECDH" what_dh="ECDH"
fi fi
if [[ -z "$2" ]]; then if [[ -z "$2" ]]; then
if [[ -n "$curve" ]]; then if [[ -n "$curve" ]]; then
debugme echo ">$HAS_DH_BITS|$what_dh($curve)|$bits<" debugme echo ">$HAS_DH_BITS|$what_dh($curve)|$bits<"
@ -4254,7 +4253,6 @@ read_dhbits_from_file() {
debugme echo ">$HAS_DH_BITS|$what_dh|$bits<" debugme echo ">$HAS_DH_BITS|$what_dh|$bits<"
fi fi
fi fi
[[ -n "$what_dh" ]] && HAS_DH_BITS=true # FIX 190 [[ -n "$what_dh" ]] && HAS_DH_BITS=true # FIX 190
if [[ -z "$what_dh" ]] && ! "$HAS_DH_BITS"; then if [[ -z "$what_dh" ]] && ! "$HAS_DH_BITS"; then
if [[ "$2" == "string" ]]; then if [[ "$2" == "string" ]]; then
@ -4264,12 +4262,10 @@ read_dhbits_from_file() {
fi fi
return 0 return 0
fi fi
if [[ "$2" == "quiet" ]]; then if [[ "$2" == "quiet" ]]; then
tm_out "$bits" tm_out "$bits"
return 0 return 0
fi fi
[[ -z "$2" ]] && [[ -n "$bits" ]] && out ", " [[ -z "$2" ]] && [[ -n "$bits" ]] && out ", "
if [[ $what_dh == "DH" ]] || [[ $what_dh == "EDH" ]]; then if [[ $what_dh == "DH" ]] || [[ $what_dh == "EDH" ]]; then
add="bit DH" add="bit DH"
@ -4289,9 +4285,6 @@ read_dhbits_from_file() {
pr_ecdh_quality "$bits" "$bits $add" pr_ecdh_quality "$bits" "$bits $add"
fi fi
fi fi
tmpfile_handle $FUNCNAME.log $tmpfile
return 0 return 0
} }
@ -6258,7 +6251,7 @@ run_server_defaults() {
else else
SESS_RESUMPTION[2]="ticket=no" SESS_RESUMPTION[2]="ticket=no"
outln "Ticket: no extension=no resumption, " out "Ticket: no extension=no resumption, "
fileout "session_resumption_ticket" "INFO" "No TLS session ticket extension, no resumption possible (assumed)" fileout "session_resumption_ticket" "INFO" "No TLS session ticket extension, no resumption possible (assumed)"
fi fi