Move DH support from -19 to -27.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16086 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
10
kdc/pkinit.c
10
kdc/pkinit.c
@@ -763,12 +763,11 @@ _kdc_pk_rd_padata(krb5_context context,
|
|||||||
client_params->nonce = ap.pkAuthenticator.nonce;
|
client_params->nonce = ap.pkAuthenticator.nonce;
|
||||||
|
|
||||||
if (ap.clientPublicValue) {
|
if (ap.clientPublicValue) {
|
||||||
ret = get_dh_param(context, ap.clientPublicValue, client_params);
|
krb5_set_error_string(context, "PK-INIT, no support for DH");
|
||||||
if (ret) {
|
ret = KRB5KDC_ERR_PADATA_TYPE_NOSUPP;
|
||||||
free_AuthPack_19(&ap);
|
free_AuthPack_19(&ap);
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
free_AuthPack_19(&ap);
|
free_AuthPack_19(&ap);
|
||||||
} else if (pa->padata_type == KRB5_PADATA_PK_AS_REQ) {
|
} else if (pa->padata_type == KRB5_PADATA_PK_AS_REQ) {
|
||||||
AuthPack ap;
|
AuthPack ap;
|
||||||
@@ -795,11 +794,12 @@ _kdc_pk_rd_padata(krb5_context context,
|
|||||||
client_params->nonce = ap.pkAuthenticator.nonce;
|
client_params->nonce = ap.pkAuthenticator.nonce;
|
||||||
|
|
||||||
if (ap.clientPublicValue) {
|
if (ap.clientPublicValue) {
|
||||||
krb5_set_error_string(context, "PK-INIT, no support for DH");
|
ret = get_dh_param(context, ap.clientPublicValue, client_params);
|
||||||
ret = KRB5KDC_ERR_PADATA_TYPE_NOSUPP;
|
if (ret) {
|
||||||
free_AuthPack(&ap);
|
free_AuthPack(&ap);
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
free_AuthPack(&ap);
|
free_AuthPack(&ap);
|
||||||
} else
|
} else
|
||||||
krb5_abortx(context, "internal pkinit error");
|
krb5_abortx(context, "internal pkinit error");
|
||||||
|
Reference in New Issue
Block a user