Try both ReplyKey and ReplyKey-Win2k for the Windows case to support
the updated -09 protocol (using asChecksum). Tell KDC we support this by sending KRB5-PADATA-PK-AS-09-BINDING in the pa-data. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16192 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -764,6 +764,10 @@ pk_mk_padata(krb5_context context,
|
||||
ret = krb5_padata_add(context, md, pa_type, buf.data, buf.length);
|
||||
if (ret)
|
||||
free(buf.data);
|
||||
|
||||
if (ret == 0 && compat == COMPAT_WIN2K)
|
||||
krb5_padata_add(context, md, KRB5_PADATA_PK_AS_09_BINDING, NULL, 0);
|
||||
|
||||
out:
|
||||
free_ContentInfo(&content_info);
|
||||
|
||||
@@ -1180,7 +1184,7 @@ _krb5_pk_verify_sign(krb5_context context,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static krb5_error_code
|
||||
static krb5_error_code
|
||||
get_reply_key_win(krb5_context context,
|
||||
const krb5_data *content,
|
||||
unsigned nonce,
|
||||
@@ -1502,7 +1506,9 @@ pk_rd_pa_reply_enckey(krb5_context context,
|
||||
|
||||
switch(type) {
|
||||
case COMPAT_WIN2K:
|
||||
ret = get_reply_key_win(context, &content, nonce, key);
|
||||
ret = get_reply_key(context, &content, req_buffer, key);
|
||||
if (ret != 0)
|
||||
ret = get_reply_key_win(context, &content, nonce, key);
|
||||
break;
|
||||
case COMPAT_IETF:
|
||||
ret = get_reply_key(context, &content, req_buffer, key);
|
||||
|
Reference in New Issue
Block a user