oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(pk_verify_host): set errorstrings in a sensable way

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18061 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-09-09 13:39:24 +00:00
parent 5675de7426
commit 0fbe98fc9c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/krb5/pkinit.c
View File

@@ -841,7 +841,9 @@ pk_verify_host(krb5_context context,
oid_id_pkinit_san(), oid_id_pkinit_san(),
&list); &list);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_set_error_string(context, "Failed to find the PK-INIT "
"subjectAltName in the KDC certificate");
return ret; return ret;
} }
@@ -853,7 +855,9 @@ pk_verify_host(krb5_context context,
&r, &r,
NULL); NULL);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_set_error_string(context, "Failed to decode the PK-INIT "
"subjectAltName in the KDC certificate");
break; break;
} }
@@ -864,7 +868,7 @@ pk_verify_host(krb5_context context,
{ {
krb5_set_error_string(context, "KDC have wrong realm name in " krb5_set_error_string(context, "KDC have wrong realm name in "
"the certificate"); "the certificate");
ret = EINVAL; ret = KRB5_KDC_ERR_INVALID_CERTIFICATE;
} }
free_KRB5PrincipalName(&r); free_KRB5PrincipalName(&r);
@@ -883,7 +887,8 @@ pk_verify_host(krb5_context context,
hi->ai->ai_addr, hi->ai->ai_addrlen); hi->ai->ai_addr, hi->ai->ai_addrlen);
if (ret) if (ret)
krb5_set_error_string(context, "Address mismatch in the KDC certificate"); krb5_set_error_string(context, "Address mismatch in "
"the KDC certificate");
} }
return ret; return ret;
} }
@@ -972,7 +977,6 @@ pk_rd_pa_reply_enckey(krb5_context context,
/* make sure that it is the kdc's certificate */ /* make sure that it is the kdc's certificate */
ret = pk_verify_host(context, realm, hi, ctx, host); ret = pk_verify_host(context, realm, hi, ctx, host);
if (ret) { if (ret) {
krb5_set_error_string(context, "PKINIT: failed verify host: %d", ret);
goto out; goto out;
} }