Merge branch '3.2' into 3.3dev

This commit is contained in:
Dirk Wetter
2025-06-23 20:31:40 +02:00
3 changed files with 1069 additions and 1014 deletions

File diff suppressed because it is too large Load Diff

View File

@ -516,3 +516,4 @@ ZUT/mttkLEw2mKYNgUO2uTvO8BNltUD2FNzCpFq5TTE= subject=C=JP, O=SECOM Trust Systems
zwnuZ5fhfFhTML7kCk2/oJaZFFxGxTrFppvmOeuJImY= SAPO Class 2 Root CA, emailAddress=pkiadmin@trustcentre.co.za
zwtHSs6Eafq6QC8C7r354XANnL6L5OQ0hAe2ndMZbpQ= ComSign Secured CA, O=ComSign, C=IL
ZZyzaKxWmYvQevLK/F+5P455R0rMwqbPGsnyGS0TY2A= Autoridad de Certificacion Raiz del Estado Venezolano, C=VE, L=Caracas, ST=Distrito Capital, O=Sistema Nacional de Certificacion Electronica, OU=Superintendencia de Servicios de Certificacion Electronica, emailAddress=acraiz@suscerte.gob.ve

View File

@ -7814,7 +7814,11 @@ determine_trust() {
out "$code"
fi
fileout "${jsonID}${json_postfix}" "CRITICAL" "failed $code. $addtl_warning"
set_grade_cap "T" "Issues with the chain of trust $code"
if [[ "$code" =~ "chain incomplete" ]]; then
set_grade_cap "B" "Issues with chain of trust $code"
else
set_grade_cap "T" "Issues with chain of trust $code"
fi
else
# alt least one ok and other(s) not ==> display the culprit store(s)
if "$some_ok"; then
@ -7834,7 +7838,11 @@ determine_trust() {
if ! [[ ${certificate_file[i]} =~ Java ]]; then
# Exemption for Java AND rating, as this store doesn't seem to be as complete.
# We won't penalize this but we still need to raise a red flag. See #1648
set_grade_cap "T" "Issues with chain of trust $code"
if [[ "$code" =~ "chain incomplete" ]]; then
set_grade_cap "B" "Issues with chain of trust $code"
else
set_grade_cap "T" "Issues with chain of trust $code"
fi
fi
fi
done