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

Patch from Shi Hosoda to add back windows XP SP2 compat that we have

Browse Source 
manged to break. This patch make it possible to use Samba4 with
Windows XP SP2, way cool!

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23861 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2008-09-22 06:32:28 +00:00
parent 29a746efd7
commit fd676a5005
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kdc/pkinit.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003 - 2006 Kungliga Tekniska Högskolan * Copyright (c) 2003 - 2008 Kungliga Tekniska Högskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -676,7 +676,7 @@ pk_mk_pa_reply_enckey(krb5_context context,
krb5_keyblock *reply_key, krb5_keyblock *reply_key,
ContentInfo *content_info) ContentInfo *content_info)
{ {
const heim_oid *envelopedAlg = NULL, *sdAlg = NULL; const heim_oid *envelopedAlg = NULL, *sdAlg = NULL, *evAlg = NULL;
krb5_error_code ret; krb5_error_code ret;
krb5_data buf, signed_data; krb5_data buf, signed_data;
size_t size; size_t size;
@@ -699,9 +699,14 @@ pk_mk_pa_reply_enckey(krb5_context context,
{ {
do_win2k = 1; do_win2k = 1;
} }
sdAlg = oid_id_pkcs7_data();
evAlg = oid_id_pkcs7_data();
envelopedAlg = oid_id_rsadsi_des_ede3_cbc();
break; break;
} }
case PKINIT_27: case PKINIT_27:
sdAlg = oid_id_pkrkeydata();
evAlg = oid_id_pkcs7_signedData();
break; break;
default: default:
krb5_abortx(context, "internal pkinit error"); krb5_abortx(context, "internal pkinit error");
@@ -711,9 +716,6 @@ pk_mk_pa_reply_enckey(krb5_context context,
ReplyKeyPack_Win2k kp; ReplyKeyPack_Win2k kp;
memset(&kp, 0, sizeof(kp)); memset(&kp, 0, sizeof(kp));
envelopedAlg = oid_id_rsadsi_des_ede3_cbc();
sdAlg = oid_id_pkcs7_data();
ret = copy_EncryptionKey(reply_key, &kp.replyKey); ret = copy_EncryptionKey(reply_key, &kp.replyKey);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_string(context);
@@ -730,8 +732,6 @@ pk_mk_pa_reply_enckey(krb5_context context,
ReplyKeyPack kp; ReplyKeyPack kp;
memset(&kp, 0, sizeof(kp)); memset(&kp, 0, sizeof(kp));
sdAlg = oid_id_pkrkeydata();
ret = copy_EncryptionKey(reply_key, &kp.replyKey); ret = copy_EncryptionKey(reply_key, &kp.replyKey);
if (ret) { if (ret) {
krb5_clear_error_string(context); krb5_clear_error_string(context);
@@ -820,7 +820,7 @@ pk_mk_pa_reply_enckey(krb5_context context,
client_params->cert, client_params->cert,
signed_data.data, signed_data.length, signed_data.data, signed_data.length,
envelopedAlg, envelopedAlg,
oid_id_pkcs7_signedData(), &buf); evAlg, &buf);
if (ret) if (ret)
goto out; goto out;