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

adapt to krb5 changes

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1935 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-06-29 08:40:23 +00:00
parent d3a861a693
commit 420b334bba
12 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/gssapi/accept_sec_context.c
View File

@@ -47,11 +47,11 @@ OM_uint32 gss_accept_sec_context
int32_t tmp; int32_t tmp;
krb5_auth_con_getflags(gssapi_krb5_context, krb5_auth_con_getflags(gssapi_krb5_context,
&(*context_handle)->auth_context, (*context_handle)->auth_context,
&tmp); &tmp);
tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE; tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE;
krb5_auth_con_setflags(gssapi_krb5_context, krb5_auth_con_setflags(gssapi_krb5_context,
&(*context_handle)->auth_context, (*context_handle)->auth_context,
tmp); tmp);
} }
@@ -75,7 +75,7 @@ OM_uint32 gss_accept_sec_context
kret = krb5_copy_principal (gssapi_krb5_context, kret = krb5_copy_principal (gssapi_krb5_context,
ticket->enc_part2.client, ticket->enc_part2.client,
&(*context_handle)->source); (*context_handle)->source);
if (kret) { if (kret) {
ret = GSS_S_FAILURE; ret = GSS_S_FAILURE;
goto failure; goto failure;
@@ -107,7 +107,7 @@ OM_uint32 gss_accept_sec_context
} }
{ {
Checksum *c2 = &(*context_handle)->auth_context->authenticator->cksum; Checksum *c2 = (*context_handle)->auth_context->authenticator->cksum;
if (cksum.cksumtype != c2->cksumtype || if (cksum.cksumtype != c2->cksumtype ||
cksum.checksum.length != c2->checksum.length || cksum.checksum.length != c2->checksum.length ||
memcmp(cksum.checksum.data, memcmp(cksum.checksum.data,

3
lib/gssapi/get_mic.c
View File

@@ -71,7 +71,8 @@ OM_uint32 gss_get_mic
4); 4);
des_set_key (&key, schedule); des_set_key (&key, schedule);
des_cbc_encrypt (p, p, 8, schedule, p + 16, DES_ENCRYPT); des_cbc_encrypt ((des_cblock *)p, (des_cblock *)p, 8,
schedule, (des_cblock *)(p + 16), DES_ENCRYPT);
krb5_auth_setlocalseqnumber (gssapi_krb5_context, krb5_auth_setlocalseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,

8
lib/gssapi/init_sec_context.c
View File

@@ -59,11 +59,11 @@ init_auth
int32_t tmp; int32_t tmp;
krb5_auth_con_getflags(gssapi_krb5_context, krb5_auth_con_getflags(gssapi_krb5_context,
&(*context_handle)->auth_context, (*context_handle)->auth_context,
&tmp); &tmp);
tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE; tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE;
krb5_auth_con_setflags(gssapi_krb5_context, krb5_auth_con_setflags(gssapi_krb5_context,
&(*context_handle)->auth_context, (*context_handle)->auth_context,
tmp); tmp);
} }
@@ -100,7 +100,7 @@ init_auth
kret = krb5_cc_get_principal (gssapi_krb5_context, kret = krb5_cc_get_principal (gssapi_krb5_context,
ccache, ccache,
&(*context_handle)->source); (*context_handle)->source);
if (kret) { if (kret) {
ret = GSS_S_FAILURE; ret = GSS_S_FAILURE;
goto failure; goto failure;
@@ -108,7 +108,7 @@ init_auth
kret = krb5_copy_principal (gssapi_krb5_context, kret = krb5_copy_principal (gssapi_krb5_context,
target_name, target_name,
&(*context_handle)->target); (*context_handle)->target);
if (kret) { if (kret) {
ret = GSS_S_FAILURE; ret = GSS_S_FAILURE;
goto failure; goto failure;

8
lib/gssapi/krb5/accept_sec_context.c
View File

@@ -47,11 +47,11 @@ OM_uint32 gss_accept_sec_context
int32_t tmp; int32_t tmp;
krb5_auth_con_getflags(gssapi_krb5_context, krb5_auth_con_getflags(gssapi_krb5_context,
&(*context_handle)->auth_context, (*context_handle)->auth_context,
&tmp); &tmp);
tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE; tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE;
krb5_auth_con_setflags(gssapi_krb5_context, krb5_auth_con_setflags(gssapi_krb5_context,
&(*context_handle)->auth_context, (*context_handle)->auth_context,
tmp); tmp);
} }
@@ -75,7 +75,7 @@ OM_uint32 gss_accept_sec_context
kret = krb5_copy_principal (gssapi_krb5_context, kret = krb5_copy_principal (gssapi_krb5_context,
ticket->enc_part2.client, ticket->enc_part2.client,
&(*context_handle)->source); (*context_handle)->source);
if (kret) { if (kret) {
ret = GSS_S_FAILURE; ret = GSS_S_FAILURE;
goto failure; goto failure;
@@ -107,7 +107,7 @@ OM_uint32 gss_accept_sec_context
} }
{ {
Checksum *c2 = &(*context_handle)->auth_context->authenticator->cksum; Checksum *c2 = (*context_handle)->auth_context->authenticator->cksum;
if (cksum.cksumtype != c2->cksumtype || if (cksum.cksumtype != c2->cksumtype ||
cksum.checksum.length != c2->checksum.length || cksum.checksum.length != c2->checksum.length ||
memcmp(cksum.checksum.data, memcmp(cksum.checksum.data,

3
lib/gssapi/krb5/get_mic.c
View File

@@ -71,7 +71,8 @@ OM_uint32 gss_get_mic
4); 4);
des_set_key (&key, schedule); des_set_key (&key, schedule);
des_cbc_encrypt (p, p, 8, schedule, p + 16, DES_ENCRYPT); des_cbc_encrypt ((des_cblock *)p, (des_cblock *)p, 8,
schedule, (des_cblock *)(p + 16), DES_ENCRYPT);
krb5_auth_setlocalseqnumber (gssapi_krb5_context, krb5_auth_setlocalseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,

8
lib/gssapi/krb5/init_sec_context.c
View File

@@ -59,11 +59,11 @@ init_auth
int32_t tmp; int32_t tmp;
krb5_auth_con_getflags(gssapi_krb5_context, krb5_auth_con_getflags(gssapi_krb5_context,
&(*context_handle)->auth_context, (*context_handle)->auth_context,
&tmp); &tmp);
tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE; tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE;
krb5_auth_con_setflags(gssapi_krb5_context, krb5_auth_con_setflags(gssapi_krb5_context,
&(*context_handle)->auth_context, (*context_handle)->auth_context,
tmp); tmp);
} }
@@ -100,7 +100,7 @@ init_auth
kret = krb5_cc_get_principal (gssapi_krb5_context, kret = krb5_cc_get_principal (gssapi_krb5_context,
ccache, ccache,
&(*context_handle)->source); (*context_handle)->source);
if (kret) { if (kret) {
ret = GSS_S_FAILURE; ret = GSS_S_FAILURE;
goto failure; goto failure;
@@ -108,7 +108,7 @@ init_auth
kret = krb5_copy_principal (gssapi_krb5_context, kret = krb5_copy_principal (gssapi_krb5_context,
target_name, target_name,
&(*context_handle)->target); (*context_handle)->target);
if (kret) { if (kret) {
ret = GSS_S_FAILURE; ret = GSS_S_FAILURE;
goto failure; goto failure;

3
lib/gssapi/krb5/unwrap.c
View File

@@ -74,7 +74,8 @@ OM_uint32 gss_unwrap
p -= 16; p -= 16;
des_set_key (&key, schedule); des_set_key (&key, schedule);
des_cbc_encrypt (p, p, 8, schedule, hash, DES_DECRYPT); des_cbc_encrypt ((des_cblock *)p, (des_cblock *)p, 8,
schedule, (des_cblock *)hash, DES_DECRYPT);
memset (key, 0, sizeof(key)); memset (key, 0, sizeof(key));
memset (schedule, 0, sizeof(schedule)); memset (schedule, 0, sizeof(schedule));

3
lib/gssapi/krb5/verify_mic.c
View File

@@ -73,7 +73,8 @@ OM_uint32 gss_verify_mic
p -= 16; p -= 16;
des_set_key (&key, schedule); des_set_key (&key, schedule);
des_cbc_encrypt (p, p, 8, schedule, hash, DES_DECRYPT); des_cbc_encrypt ((des_cblock *)p, (des_cblock *)p, 8,
schedule, (des_cblock *)hash, DES_DECRYPT);
memset (key, 0, sizeof(key)); memset (key, 0, sizeof(key));
memset (schedule, 0, sizeof(schedule)); memset (schedule, 0, sizeof(schedule));

3
lib/gssapi/krb5/wrap.c
View File

@@ -89,7 +89,8 @@ OM_uint32 gss_wrap
4); 4);
des_set_key (&key, schedule); des_set_key (&key, schedule);
des_cbc_encrypt (p, p, 8, schedule, p + 16, DES_ENCRYPT); des_cbc_encrypt ((des_cblock *)p, (des_cblock *)p, 8,
schedule, (des_cblock *)(p + 16), DES_ENCRYPT);
krb5_auth_setlocalseqnumber (gssapi_krb5_context, krb5_auth_setlocalseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,

3
lib/gssapi/unwrap.c
View File

@@ -74,7 +74,8 @@ OM_uint32 gss_unwrap
p -= 16; p -= 16;
des_set_key (&key, schedule); des_set_key (&key, schedule);
des_cbc_encrypt (p, p, 8, schedule, hash, DES_DECRYPT); des_cbc_encrypt ((des_cblock *)p, (des_cblock *)p, 8,
schedule, (des_cblock *)hash, DES_DECRYPT);
memset (key, 0, sizeof(key)); memset (key, 0, sizeof(key));
memset (schedule, 0, sizeof(schedule)); memset (schedule, 0, sizeof(schedule));

3
lib/gssapi/verify_mic.c
View File

@@ -73,7 +73,8 @@ OM_uint32 gss_verify_mic
p -= 16; p -= 16;
des_set_key (&key, schedule); des_set_key (&key, schedule);
des_cbc_encrypt (p, p, 8, schedule, hash, DES_DECRYPT); des_cbc_encrypt ((des_cblock *)p, (des_cblock *)p, 8,
schedule, (des_cblock *)hash, DES_DECRYPT);
memset (key, 0, sizeof(key)); memset (key, 0, sizeof(key));
memset (schedule, 0, sizeof(schedule)); memset (schedule, 0, sizeof(schedule));

3
lib/gssapi/wrap.c
View File

@@ -89,7 +89,8 @@ OM_uint32 gss_wrap
4); 4);
des_set_key (&key, schedule); des_set_key (&key, schedule);
des_cbc_encrypt (p, p, 8, schedule, p + 16, DES_ENCRYPT); des_cbc_encrypt ((des_cblock *)p, (des_cblock *)p, 8,
schedule, (des_cblock *)(p + 16), DES_ENCRYPT);
krb5_auth_setlocalseqnumber (gssapi_krb5_context, krb5_auth_setlocalseqnumber (gssapi_krb5_context,
context_handle->auth_context, context_handle->auth_context,