Merge branch '2.9dev' into fix_client_sim_sslv2

This commit is contained in:
David Cooper 2017-07-26 09:03:31 -04:00
commit f5da066c05
1 changed files with 5 additions and 1 deletions

View File

@ -1689,7 +1689,11 @@ run_hpkp() {
fi
# print key=value pair with awk, then strip non-numbers, to be improved with proper parsing of key-value with awk
if "$HAS_SED_E"; then
hpkp_age_sec=$(awk -F= '/max-age/{max_age=$2; print max_age}' $TMPFILE | sed -E 's/[^[:digit:]]//g')
else
hpkp_age_sec=$(awk -F= '/max-age/{max_age=$2; print max_age}' $TMPFILE | sed -r 's/[^[:digit:]]//g')
fi
hpkp_age_days=$((hpkp_age_sec / 86400))
if [[ $hpkp_age_sec -ge $HPKP_MIN ]]; then
pr_done_good "$hpkp_age_days days" ; out "=$hpkp_age_sec s"