Disable sending -19, fix parsing -27 of the protocol.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16083 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -867,10 +867,11 @@ _krb5_pk_mk_padata(krb5_context context,
|
|||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
} else {
|
} else {
|
||||||
|
#if 0
|
||||||
ret = pk_mk_padata(context, COMPAT_19, ctx, req_body, nonce, md);
|
ret = pk_mk_padata(context, COMPAT_19, ctx, req_body, nonce, md);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
#endif
|
||||||
ret = pk_mk_padata(context, COMPAT_27, ctx, req_body, nonce, md);
|
ret = pk_mk_padata(context, COMPAT_27, ctx, req_body, nonce, md);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
@@ -1859,10 +1860,13 @@ _krb5_pk_rd_pa_reply(krb5_context context,
|
|||||||
return ret;
|
return ret;
|
||||||
default:
|
default:
|
||||||
free_PA_PK_AS_REP(&rep);
|
free_PA_PK_AS_REP(&rep);
|
||||||
krb5_set_error_string(context, "PKINIT: -25 reply "
|
krb5_set_error_string(context, "PKINIT: -27 reply "
|
||||||
"invalid content type");
|
"invalid content type");
|
||||||
|
ret = EINVAL;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
if (ret == 0)
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Check for PK-INIT -19 */
|
/* Check for PK-INIT -19 */
|
||||||
@@ -1910,7 +1914,7 @@ _krb5_pk_rd_pa_reply(krb5_context context,
|
|||||||
&w2krep,
|
&w2krep,
|
||||||
&size);
|
&size);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
krb5_set_error_string(context, "PKINIT: Failed decoding windows"
|
krb5_set_error_string(context, "PKINIT: Failed decoding windows "
|
||||||
"pkinit reply %d", ret);
|
"pkinit reply %d", ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user