From 420b334bbac919130c0eb92bf62563927c787f72 Mon Sep 17 00:00:00 2001 From: Assar Westerlund Date: Sun, 29 Jun 1997 08:40:23 +0000 Subject: [PATCH] adapt to krb5 changes git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1935 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/gssapi/accept_sec_context.c | 8 ++++---- lib/gssapi/get_mic.c | 3 ++- lib/gssapi/init_sec_context.c | 8 ++++---- lib/gssapi/krb5/accept_sec_context.c | 8 ++++---- lib/gssapi/krb5/get_mic.c | 3 ++- lib/gssapi/krb5/init_sec_context.c | 8 ++++---- lib/gssapi/krb5/unwrap.c | 3 ++- lib/gssapi/krb5/verify_mic.c | 3 ++- lib/gssapi/krb5/wrap.c | 3 ++- lib/gssapi/unwrap.c | 3 ++- lib/gssapi/verify_mic.c | 3 ++- lib/gssapi/wrap.c | 3 ++- 12 files changed, 32 insertions(+), 24 deletions(-) diff --git a/lib/gssapi/accept_sec_context.c b/lib/gssapi/accept_sec_context.c index c3b81dc4e..5bb3945c6 100644 --- a/lib/gssapi/accept_sec_context.c +++ b/lib/gssapi/accept_sec_context.c @@ -47,11 +47,11 @@ OM_uint32 gss_accept_sec_context int32_t tmp; krb5_auth_con_getflags(gssapi_krb5_context, - &(*context_handle)->auth_context, + (*context_handle)->auth_context, &tmp); tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE; krb5_auth_con_setflags(gssapi_krb5_context, - &(*context_handle)->auth_context, + (*context_handle)->auth_context, tmp); } @@ -75,7 +75,7 @@ OM_uint32 gss_accept_sec_context kret = krb5_copy_principal (gssapi_krb5_context, ticket->enc_part2.client, - &(*context_handle)->source); + (*context_handle)->source); if (kret) { ret = GSS_S_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 || cksum.checksum.length != c2->checksum.length || memcmp(cksum.checksum.data, diff --git a/lib/gssapi/get_mic.c b/lib/gssapi/get_mic.c index 8d9287b85..1ba287f25 100644 --- a/lib/gssapi/get_mic.c +++ b/lib/gssapi/get_mic.c @@ -71,7 +71,8 @@ OM_uint32 gss_get_mic 4); 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, context_handle->auth_context, diff --git a/lib/gssapi/init_sec_context.c b/lib/gssapi/init_sec_context.c index 8e1317384..e53a2fea9 100644 --- a/lib/gssapi/init_sec_context.c +++ b/lib/gssapi/init_sec_context.c @@ -59,11 +59,11 @@ init_auth int32_t tmp; krb5_auth_con_getflags(gssapi_krb5_context, - &(*context_handle)->auth_context, + (*context_handle)->auth_context, &tmp); tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE; krb5_auth_con_setflags(gssapi_krb5_context, - &(*context_handle)->auth_context, + (*context_handle)->auth_context, tmp); } @@ -100,7 +100,7 @@ init_auth kret = krb5_cc_get_principal (gssapi_krb5_context, ccache, - &(*context_handle)->source); + (*context_handle)->source); if (kret) { ret = GSS_S_FAILURE; goto failure; @@ -108,7 +108,7 @@ init_auth kret = krb5_copy_principal (gssapi_krb5_context, target_name, - &(*context_handle)->target); + (*context_handle)->target); if (kret) { ret = GSS_S_FAILURE; goto failure; diff --git a/lib/gssapi/krb5/accept_sec_context.c b/lib/gssapi/krb5/accept_sec_context.c index c3b81dc4e..5bb3945c6 100644 --- a/lib/gssapi/krb5/accept_sec_context.c +++ b/lib/gssapi/krb5/accept_sec_context.c @@ -47,11 +47,11 @@ OM_uint32 gss_accept_sec_context int32_t tmp; krb5_auth_con_getflags(gssapi_krb5_context, - &(*context_handle)->auth_context, + (*context_handle)->auth_context, &tmp); tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE; krb5_auth_con_setflags(gssapi_krb5_context, - &(*context_handle)->auth_context, + (*context_handle)->auth_context, tmp); } @@ -75,7 +75,7 @@ OM_uint32 gss_accept_sec_context kret = krb5_copy_principal (gssapi_krb5_context, ticket->enc_part2.client, - &(*context_handle)->source); + (*context_handle)->source); if (kret) { ret = GSS_S_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 || cksum.checksum.length != c2->checksum.length || memcmp(cksum.checksum.data, diff --git a/lib/gssapi/krb5/get_mic.c b/lib/gssapi/krb5/get_mic.c index 8d9287b85..1ba287f25 100644 --- a/lib/gssapi/krb5/get_mic.c +++ b/lib/gssapi/krb5/get_mic.c @@ -71,7 +71,8 @@ OM_uint32 gss_get_mic 4); 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, context_handle->auth_context, diff --git a/lib/gssapi/krb5/init_sec_context.c b/lib/gssapi/krb5/init_sec_context.c index 8e1317384..e53a2fea9 100644 --- a/lib/gssapi/krb5/init_sec_context.c +++ b/lib/gssapi/krb5/init_sec_context.c @@ -59,11 +59,11 @@ init_auth int32_t tmp; krb5_auth_con_getflags(gssapi_krb5_context, - &(*context_handle)->auth_context, + (*context_handle)->auth_context, &tmp); tmp |= KRB5_AUTH_CONTEXT_DO_SEQUENCE; krb5_auth_con_setflags(gssapi_krb5_context, - &(*context_handle)->auth_context, + (*context_handle)->auth_context, tmp); } @@ -100,7 +100,7 @@ init_auth kret = krb5_cc_get_principal (gssapi_krb5_context, ccache, - &(*context_handle)->source); + (*context_handle)->source); if (kret) { ret = GSS_S_FAILURE; goto failure; @@ -108,7 +108,7 @@ init_auth kret = krb5_copy_principal (gssapi_krb5_context, target_name, - &(*context_handle)->target); + (*context_handle)->target); if (kret) { ret = GSS_S_FAILURE; goto failure; diff --git a/lib/gssapi/krb5/unwrap.c b/lib/gssapi/krb5/unwrap.c index 363397068..20e04241e 100644 --- a/lib/gssapi/krb5/unwrap.c +++ b/lib/gssapi/krb5/unwrap.c @@ -74,7 +74,8 @@ OM_uint32 gss_unwrap p -= 16; 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 (schedule, 0, sizeof(schedule)); diff --git a/lib/gssapi/krb5/verify_mic.c b/lib/gssapi/krb5/verify_mic.c index 5a840eb8c..d4b3f4a5f 100644 --- a/lib/gssapi/krb5/verify_mic.c +++ b/lib/gssapi/krb5/verify_mic.c @@ -73,7 +73,8 @@ OM_uint32 gss_verify_mic p -= 16; 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 (schedule, 0, sizeof(schedule)); diff --git a/lib/gssapi/krb5/wrap.c b/lib/gssapi/krb5/wrap.c index bffc4288e..c0c52b19d 100644 --- a/lib/gssapi/krb5/wrap.c +++ b/lib/gssapi/krb5/wrap.c @@ -89,7 +89,8 @@ OM_uint32 gss_wrap 4); 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, context_handle->auth_context, diff --git a/lib/gssapi/unwrap.c b/lib/gssapi/unwrap.c index 363397068..20e04241e 100644 --- a/lib/gssapi/unwrap.c +++ b/lib/gssapi/unwrap.c @@ -74,7 +74,8 @@ OM_uint32 gss_unwrap p -= 16; 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 (schedule, 0, sizeof(schedule)); diff --git a/lib/gssapi/verify_mic.c b/lib/gssapi/verify_mic.c index 5a840eb8c..d4b3f4a5f 100644 --- a/lib/gssapi/verify_mic.c +++ b/lib/gssapi/verify_mic.c @@ -73,7 +73,8 @@ OM_uint32 gss_verify_mic p -= 16; 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 (schedule, 0, sizeof(schedule)); diff --git a/lib/gssapi/wrap.c b/lib/gssapi/wrap.c index bffc4288e..c0c52b19d 100644 --- a/lib/gssapi/wrap.c +++ b/lib/gssapi/wrap.c @@ -89,7 +89,8 @@ OM_uint32 gss_wrap 4); 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, context_handle->auth_context,