Merge branch 'master' into remove_sockread
This commit is contained in:
commit
3dc8754a0e
|
@ -3714,6 +3714,7 @@ verify_retcode_helper() {
|
||||||
|
|
||||||
case $retcode in
|
case $retcode in
|
||||||
# codes from ./doc/apps/verify.pod | verify(1ssl)
|
# codes from ./doc/apps/verify.pod | verify(1ssl)
|
||||||
|
26) out "(unsupported certificate purpose)" ;; # X509_V_ERR_INVALID_PURPOSE
|
||||||
24) out "(certificate unreadable)" ;; # X509_V_ERR_INVALID_CA
|
24) out "(certificate unreadable)" ;; # X509_V_ERR_INVALID_CA
|
||||||
23) out "(certificate revoked)" ;; # X509_V_ERR_CERT_REVOKED
|
23) out "(certificate revoked)" ;; # X509_V_ERR_CERT_REVOKED
|
||||||
21) out "(chain incomplete, only 1 cert provided)" ;; # X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE
|
21) out "(chain incomplete, only 1 cert provided)" ;; # X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE
|
||||||
|
@ -3796,8 +3797,8 @@ determine_trust() {
|
||||||
if ! $some_ok; then
|
if ! $some_ok; then
|
||||||
# all failed (we assume with the same issue), we're displaying the reason
|
# all failed (we assume with the same issue), we're displaying the reason
|
||||||
out " "
|
out " "
|
||||||
verify_retcode_helper "${verify_retcode[2]}"
|
verify_retcode_helper "${verify_retcode[1]}"
|
||||||
fileout "${json_prefix}chain_of_trust" "NOT ok" "All certificate trust checks failed: $(verify_retcode_helper "${verify_retcode[2]}"). $addtl_warning"
|
fileout "${json_prefix}chain_of_trust" "NOT ok" "All certificate trust checks failed: $(verify_retcode_helper "${verify_retcode[1]}"). $addtl_warning"
|
||||||
else
|
else
|
||||||
# is one ok and the others not ==> display the culprit store
|
# is one ok and the others not ==> display the culprit store
|
||||||
if $some_ok ; then
|
if $some_ok ; then
|
||||||
|
|
Loading…
Reference in New Issue